diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2012-07-18 02:29:01 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2012-07-23 23:19:38 +0200 |
| commit | c0d955d9ca3e1cacacfc36ea0a2b0fc7612c8448 (patch) | |
| tree | 5be296d8242f26325ac06d48453a6b97fd7be581 /ubuntu/maverick | |
| parent | f6b3e533cf37fb0446b64cc6f0656ab744de500f (diff) | |
| download | tde-packaging-c0d955d9ca3e1cacacfc36ea0a2b0fc7612c8448.tar.gz tde-packaging-c0d955d9ca3e1cacacfc36ea0a2b0fc7612c8448.zip | |
Removed former way of managing patches for kchmviewer on Debian and Ubuntu
(cherry picked from commit e8fb249f6b17979bd845ab766be9b8531d7a2a3d)
Diffstat (limited to 'ubuntu/maverick')
| -rw-r--r-- | ubuntu/maverick/applications/kchmviewer/debian/control | 2 | ||||
| -rwxr-xr-x | ubuntu/maverick/applications/kchmviewer/debian/rules | 18 |
2 files changed, 5 insertions, 15 deletions
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 |