diff options
6 files changed, 9 insertions, 33 deletions
diff --git a/debian/lenny/applications/kde-style-lipstik/debian/control b/debian/lenny/applications/kde-style-lipstik/debian/control index 223626346..e7b7d4a1b 100644 --- a/debian/lenny/applications/kde-style-lipstik/debian/control +++ b/debian/lenny/applications/kde-style-lipstik/debian/control @@ -2,7 +2,7 @@ Source: kde-style-lipstik-trinity Section: kde Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> -Build-Depends: debhelper (>= 4.0.0), kdelibs4-trinity-dev (>= 4:3.2), dpatch, automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>= 4.0.0), quilt, kdelibs4-trinity-dev (>= 4:3.2), automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: kde-style-lipstik-trinity diff --git a/debian/lenny/applications/kde-style-lipstik/debian/rules b/debian/lenny/applications/kde-style-lipstik/debian/rules index 0f4c518e5..e535bbd80 100755 --- a/debian/lenny/applications/kde-style-lipstik/debian/rules +++ b/debian/lenny/applications/kde-style-lipstik/debian/rules @@ -51,8 +51,7 @@ build-stamp: config.status touch build-stamp -clean: clean-patched unpatch -clean-patched: +clean: dh_testdir dh_testroot rm -f build-stamp @@ -70,10 +69,7 @@ endif dh_clean -patch: patch-stamp -patch-stamp: - dpatch apply-all - #dpatch call-all -a=pkg-info > patch-stamp +patch: ! [ -f /usr/share/libtool/ltmain.sh ] || \ cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh ! [ -f /usr/share/libtool/config/ltmain.sh ] || \ @@ -83,10 +79,6 @@ patch-stamp: make -f admin/Makefile.common cvs touch debian/stamp-bootstrap -unpatch: - dpatch deapply-all - rm -rf patch-stamp debian/patched - install: build dh_testdir dh_testroot diff --git a/debian/squeeze/applications/kde-style-lipstik/debian/control b/debian/squeeze/applications/kde-style-lipstik/debian/control index 223626346..e7b7d4a1b 100644 --- a/debian/squeeze/applications/kde-style-lipstik/debian/control +++ b/debian/squeeze/applications/kde-style-lipstik/debian/control @@ -2,7 +2,7 @@ Source: kde-style-lipstik-trinity Section: kde Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> -Build-Depends: debhelper (>= 4.0.0), kdelibs4-trinity-dev (>= 4:3.2), dpatch, automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>= 4.0.0), quilt, kdelibs4-trinity-dev (>= 4:3.2), automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: kde-style-lipstik-trinity diff --git a/debian/squeeze/applications/kde-style-lipstik/debian/rules b/debian/squeeze/applications/kde-style-lipstik/debian/rules index 0f4c518e5..e535bbd80 100755 --- a/debian/squeeze/applications/kde-style-lipstik/debian/rules +++ b/debian/squeeze/applications/kde-style-lipstik/debian/rules @@ -51,8 +51,7 @@ build-stamp: config.status touch build-stamp -clean: clean-patched unpatch -clean-patched: +clean: dh_testdir dh_testroot rm -f build-stamp @@ -70,10 +69,7 @@ endif dh_clean -patch: patch-stamp -patch-stamp: - dpatch apply-all - #dpatch call-all -a=pkg-info > patch-stamp +patch: ! [ -f /usr/share/libtool/ltmain.sh ] || \ cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh ! [ -f /usr/share/libtool/config/ltmain.sh ] || \ @@ -83,10 +79,6 @@ patch-stamp: make -f admin/Makefile.common cvs touch debian/stamp-bootstrap -unpatch: - dpatch deapply-all - rm -rf patch-stamp debian/patched - install: build dh_testdir dh_testroot diff --git a/ubuntu/maverick/applications/kde-style-lipstik/debian/control b/ubuntu/maverick/applications/kde-style-lipstik/debian/control index 9067e5a15..60a1c444a 100644 --- a/ubuntu/maverick/applications/kde-style-lipstik/debian/control +++ b/ubuntu/maverick/applications/kde-style-lipstik/debian/control @@ -2,7 +2,7 @@ Source: kde-style-lipstik-trinity Section: kde Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> -Build-Depends: debhelper (>= 4.0.0), kdelibs4-trinity-dev (>= 4:3.2), dpatch, automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>= 4.0.0), quilt, kdelibs4-trinity-dev (>= 4:3.2), automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: kde-style-lipstik-trinity diff --git a/ubuntu/maverick/applications/kde-style-lipstik/debian/rules b/ubuntu/maverick/applications/kde-style-lipstik/debian/rules index 0f4c518e5..e535bbd80 100755 --- a/ubuntu/maverick/applications/kde-style-lipstik/debian/rules +++ b/ubuntu/maverick/applications/kde-style-lipstik/debian/rules @@ -51,8 +51,7 @@ build-stamp: config.status touch build-stamp -clean: clean-patched unpatch -clean-patched: +clean: dh_testdir dh_testroot rm -f build-stamp @@ -70,10 +69,7 @@ endif dh_clean -patch: patch-stamp -patch-stamp: - dpatch apply-all - #dpatch call-all -a=pkg-info > patch-stamp +patch: ! [ -f /usr/share/libtool/ltmain.sh ] || \ cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh ! [ -f /usr/share/libtool/config/ltmain.sh ] || \ @@ -83,10 +79,6 @@ patch-stamp: make -f admin/Makefile.common cvs touch debian/stamp-bootstrap -unpatch: - dpatch deapply-all - rm -rf patch-stamp debian/patched - install: build dh_testdir dh_testroot |