summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2012-08-01 23:04:55 +0200
committerSlávek Banko <slavek.banko@axis.cz>2012-08-01 23:04:55 +0200
commitea17f4d8a64f5dd9e3484984cd23e8a3646d28bf (patch)
tree71261f5ddf32de8366ced796ff4a1459af18d23f
parent3ad3efb69e09292dfed8730dda9724350850fe8a (diff)
downloadtde-packaging-ea17f4d8a64f5dd9e3484984cd23e8a3646d28bf.tar.gz
tde-packaging-ea17f4d8a64f5dd9e3484984cd23e8a3646d28bf.zip
Removed former way of managing patches for tde-style-lipstik on Debian and Ubuntu
-rw-r--r--debian/lenny/applications/tde-style-lipstik/debian/control2
-rwxr-xr-xdebian/lenny/applications/tde-style-lipstik/debian/rules12
-rw-r--r--debian/squeeze/applications/tde-style-lipstik/debian/control2
-rwxr-xr-xdebian/squeeze/applications/tde-style-lipstik/debian/rules12
-rw-r--r--ubuntu/maverick/applications/tde-style-lipstik/debian/control2
-rwxr-xr-xubuntu/maverick/applications/tde-style-lipstik/debian/rules12
6 files changed, 9 insertions, 33 deletions
diff --git a/debian/lenny/applications/tde-style-lipstik/debian/control b/debian/lenny/applications/tde-style-lipstik/debian/control
index 540fbebf2..0b5857188 100644
--- a/debian/lenny/applications/tde-style-lipstik/debian/control
+++ b/debian/lenny/applications/tde-style-lipstik/debian/control
@@ -2,7 +2,7 @@ Source: tde-style-lipstik-trinity
Section: tde
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>= 4.0.0), tdelibs4-trinity-dev (>= 4:3.2), dpatch, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 4.0.0), quilt, tdelibs4-trinity-dev (>= 4:3.2), automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Package: tde-style-lipstik-trinity
diff --git a/debian/lenny/applications/tde-style-lipstik/debian/rules b/debian/lenny/applications/tde-style-lipstik/debian/rules
index b20ff9228..f24b21716 100755
--- a/debian/lenny/applications/tde-style-lipstik/debian/rules
+++ b/debian/lenny/applications/tde-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/tde-style-lipstik/debian/control b/debian/squeeze/applications/tde-style-lipstik/debian/control
index 540fbebf2..0b5857188 100644
--- a/debian/squeeze/applications/tde-style-lipstik/debian/control
+++ b/debian/squeeze/applications/tde-style-lipstik/debian/control
@@ -2,7 +2,7 @@ Source: tde-style-lipstik-trinity
Section: tde
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>= 4.0.0), tdelibs4-trinity-dev (>= 4:3.2), dpatch, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 4.0.0), quilt, tdelibs4-trinity-dev (>= 4:3.2), automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Package: tde-style-lipstik-trinity
diff --git a/debian/squeeze/applications/tde-style-lipstik/debian/rules b/debian/squeeze/applications/tde-style-lipstik/debian/rules
index b20ff9228..f24b21716 100755
--- a/debian/squeeze/applications/tde-style-lipstik/debian/rules
+++ b/debian/squeeze/applications/tde-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/tde-style-lipstik/debian/control b/ubuntu/maverick/applications/tde-style-lipstik/debian/control
index 540fbebf2..0b5857188 100644
--- a/ubuntu/maverick/applications/tde-style-lipstik/debian/control
+++ b/ubuntu/maverick/applications/tde-style-lipstik/debian/control
@@ -2,7 +2,7 @@ Source: tde-style-lipstik-trinity
Section: tde
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>= 4.0.0), tdelibs4-trinity-dev (>= 4:3.2), dpatch, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 4.0.0), quilt, tdelibs4-trinity-dev (>= 4:3.2), automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Package: tde-style-lipstik-trinity
diff --git a/ubuntu/maverick/applications/tde-style-lipstik/debian/rules b/ubuntu/maverick/applications/tde-style-lipstik/debian/rules
index b20ff9228..f24b21716 100755
--- a/ubuntu/maverick/applications/tde-style-lipstik/debian/rules
+++ b/ubuntu/maverick/applications/tde-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