Removed former way of managing patches for kchmviewer on Debian and Ubuntu

(cherry picked from commit e8fb249f6b17979bd845ab766be9b8531d7a2a3d)

6 files changed, 15 insertions, 45 deletions

diff --git a/debian/lenny/applications/kchmviewer/debian/control b/debian/lenny/applications/kchmviewer/debian/control
index 933c2f9d7..f0559f289 100644
--- a/debian/lenny/applications/kchmviewer/debian/control
+++ b/debian/lenny/applications/kchmviewer/debian/control
@@ -3,7 +3,7 @@ Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Jose Luis Tallon <jltallon@adv-solutions.net>
-Build-Depends: debhelper (>= 5.0.0), kdelibs4-trinity-dev, libchm-dev, dpatch, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5.0.0), quilt, kdelibs4-trinity-dev, libchm-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 Homepage: http://www.kchmviewer.net/
 
diff --git a/debian/lenny/applications/kchmviewer/debian/rules b/debian/lenny/applications/kchmviewer/debian/rules
index 0466e25ea..50e14fe4d 100755
--- a/debian/lenny/applications/kchmviewer/debian/rules
+++ b/debian/lenny/applications/kchmviewer/debian/rules
@@ -42,11 +42,10 @@ endif
 
 -include debian/debiandirs
 
-build: patch debian/build-kde
+build: debian/build-kde
 
-patch: patch-stamp
-patch-stamp:
-	dpatch apply-all
+debian/build-kde:
+	dh_testdir
 	! [ -f /usr/share/libtool/ltmain.sh ] || \
 	cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
 	! [ -f /usr/share/libtool/config/ltmain.sh ] || \
@@ -54,15 +53,6 @@ patch-stamp:
 	cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
 	
 	make -f admin/Makefile.common cvs
-	touch debian/stamp-bootstrap
-	touch patch-stamp
-
-unpatch:
-	dpatch deapply-all
-	$(RM) -rf patch-stamp debian/patched
-
-debian/build-kde:
-	dh_testdir
 #	automake
 #	autoconf
 	test -e config.sub -a -L config.sub || \
@@ -74,7 +64,7 @@ debian/build-kde:
 	$(MAKE) -C build-kde
 	touch debian/build-kde
 
-clean: unpatch
+clean:
 	dh_testdir
 	dh_testroot
 	$(RM) -f build-stamp 
diff --git a/debian/squeeze/applications/kchmviewer/debian/control b/debian/squeeze/applications/kchmviewer/debian/control
index 933c2f9d7..f0559f289 100644
--- a/debian/squeeze/applications/kchmviewer/debian/control
+++ b/debian/squeeze/applications/kchmviewer/debian/control
@@ -3,7 +3,7 @@ Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Jose Luis Tallon <jltallon@adv-solutions.net>
-Build-Depends: debhelper (>= 5.0.0), kdelibs4-trinity-dev, libchm-dev, dpatch, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5.0.0), quilt, kdelibs4-trinity-dev, libchm-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 Homepage: http://www.kchmviewer.net/
 
diff --git a/debian/squeeze/applications/kchmviewer/debian/rules b/debian/squeeze/applications/kchmviewer/debian/rules
index 0466e25ea..50e14fe4d 100755
--- a/debian/squeeze/applications/kchmviewer/debian/rules
+++ b/debian/squeeze/applications/kchmviewer/debian/rules
@@ -42,11 +42,10 @@ endif
 
 -include debian/debiandirs
 
-build: patch debian/build-kde
+build: debian/build-kde
 
-patch: patch-stamp
-patch-stamp:
-	dpatch apply-all
+debian/build-kde:
+	dh_testdir
 	! [ -f /usr/share/libtool/ltmain.sh ] || \
 	cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
 	! [ -f /usr/share/libtool/config/ltmain.sh ] || \
@@ -54,15 +53,6 @@ patch-stamp:
 	cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
 	
 	make -f admin/Makefile.common cvs
-	touch debian/stamp-bootstrap
-	touch patch-stamp
-
-unpatch:
-	dpatch deapply-all
-	$(RM) -rf patch-stamp debian/patched
-
-debian/build-kde:
-	dh_testdir
 #	automake
 #	autoconf
 	test -e config.sub -a -L config.sub || \
@@ -74,7 +64,7 @@ debian/build-kde:
 	$(MAKE) -C build-kde
 	touch debian/build-kde
 
-clean: unpatch
+clean:
 	dh_testdir
 	dh_testroot
 	$(RM) -f build-stamp 
diff --git a/ubuntu/maverick/applications/kchmviewer/debian/control b/ubuntu/maverick/applications/kchmviewer/debian/control
index ff16d4903..dc57de4b6 100644
--- a/ubuntu/maverick/applications/kchmviewer/debian/control
+++ b/ubuntu/maverick/applications/kchmviewer/debian/control
@@ -3,7 +3,7 @@ Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Jose Luis Tallon <jltallon@adv-solutions.net>
-Build-Depends: debhelper (>= 5.0.0), kdelibs4-trinity-dev, libchm-dev, dpatch, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5.0.0), quilt, kdelibs4-trinity-dev, libchm-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 Homepage: http://www.kchmviewer.net/
 
diff --git a/ubuntu/maverick/applications/kchmviewer/debian/rules b/ubuntu/maverick/applications/kchmviewer/debian/rules
index 0466e25ea..50e14fe4d 100755
--- a/ubuntu/maverick/applications/kchmviewer/debian/rules
+++ b/ubuntu/maverick/applications/kchmviewer/debian/rules
@@ -42,11 +42,10 @@ endif
 
 -include debian/debiandirs
 
-build: patch debian/build-kde
+build: debian/build-kde
 
-patch: patch-stamp
-patch-stamp:
-	dpatch apply-all
+debian/build-kde:
+	dh_testdir
 	! [ -f /usr/share/libtool/ltmain.sh ] || \
 	cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
 	! [ -f /usr/share/libtool/config/ltmain.sh ] || \
@@ -54,15 +53,6 @@ patch-stamp:
 	cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
 	
 	make -f admin/Makefile.common cvs
-	touch debian/stamp-bootstrap
-	touch patch-stamp
-
-unpatch:
-	dpatch deapply-all
-	$(RM) -rf patch-stamp debian/patched
-
-debian/build-kde:
-	dh_testdir
 #	automake
 #	autoconf
 	test -e config.sub -a -L config.sub || \
@@ -74,7 +64,7 @@ debian/build-kde:
 	$(MAKE) -C build-kde
 	touch debian/build-kde
 
-clean: unpatch
+clean:
 	dh_testdir
 	dh_testroot
 	$(RM) -f build-stamp