summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2012-07-18 02:29:01 +0200
committerSlávek Banko <slavek.banko@axis.cz>2012-07-18 02:29:01 +0200
commite8fb249f6b17979bd845ab766be9b8531d7a2a3d (patch)
treee1496efb1d0b411c5bd6e7fdbec060576a584baa
parent23a13cc537d3db41aaa2b003f57c3c0a204df59a (diff)
downloadtde-packaging-e8fb249f6b17979bd845ab766be9b8531d7a2a3d.tar.gz
tde-packaging-e8fb249f6b17979bd845ab766be9b8531d7a2a3d.zip
Removed former way of managing patches for kchmviewer on Debian and Ubuntu
-rw-r--r--debian/lenny/applications/kchmviewer/debian/control2
-rwxr-xr-xdebian/lenny/applications/kchmviewer/debian/rules18
-rw-r--r--debian/squeeze/applications/kchmviewer/debian/control2
-rwxr-xr-xdebian/squeeze/applications/kchmviewer/debian/rules18
-rw-r--r--ubuntu/maverick/applications/kchmviewer/debian/control2
-rwxr-xr-xubuntu/maverick/applications/kchmviewer/debian/rules18
6 files changed, 15 insertions, 45 deletions
diff --git a/debian/lenny/applications/kchmviewer/debian/control b/debian/lenny/applications/kchmviewer/debian/control
index dfb229d24..7e5b19c42 100644
--- a/debian/lenny/applications/kchmviewer/debian/control
+++ b/debian/lenny/applications/kchmviewer/debian/control
@@ -3,7 +3,7 @@ Section: tde
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Jose Luis Tallon <jltallon@adv-solutions.net>
-Build-Depends: debhelper (>= 5.0.0), tdelibs4-trinity-dev, libchm-dev, dpatch, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5.0.0), quilt, tdelibs4-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 72c3fd5bb..a496effa9 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 dfb229d24..7e5b19c42 100644
--- a/debian/squeeze/applications/kchmviewer/debian/control
+++ b/debian/squeeze/applications/kchmviewer/debian/control
@@ -3,7 +3,7 @@ Section: tde
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Jose Luis Tallon <jltallon@adv-solutions.net>
-Build-Depends: debhelper (>= 5.0.0), tdelibs4-trinity-dev, libchm-dev, dpatch, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5.0.0), quilt, tdelibs4-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 72c3fd5bb..a496effa9 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 dfb229d24..7e5b19c42 100644
--- a/ubuntu/maverick/applications/kchmviewer/debian/control
+++ b/ubuntu/maverick/applications/kchmviewer/debian/control
@@ -3,7 +3,7 @@ Section: tde
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Jose Luis Tallon <jltallon@adv-solutions.net>
-Build-Depends: debhelper (>= 5.0.0), tdelibs4-trinity-dev, libchm-dev, dpatch, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5.0.0), quilt, tdelibs4-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 72c3fd5bb..a496effa9 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