summaryrefslogtreecommitdiffstats
path: root/debian/lenny/libraries
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2013-09-15 20:29:47 +0200
committerSlávek Banko <slavek.banko@axis.cz>2013-09-15 20:29:47 +0200
commitf24915471ea396c53670df51b2affc4af74373bf (patch)
tree04e25e027d641ad6b82ba5828ae9a9c72924b1f1 /debian/lenny/libraries
parent1c7a831407fea1378682db5c21b06e792343be06 (diff)
downloadtde-packaging-f24915471ea396c53670df51b2affc4af74373bf.tar.gz
tde-packaging-f24915471ea396c53670df51b2affc4af74373bf.zip
Switch patch system from simple to quilt on Debian and Ubuntu
Diffstat (limited to 'debian/lenny/libraries')
-rw-r--r--debian/lenny/libraries/kipi-plugins/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/lenny/libraries/libkdcraw/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/lenny/libraries/libkexiv2/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/lenny/libraries/libkipi/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/lenny/libraries/libkipi/debian/control2
-rw-r--r--debian/lenny/libraries/libkipi/debian/patches/series (renamed from debian/lenny/libraries/libkipi/debian/patches/.gitignore)0
-rwxr-xr-xdebian/lenny/libraries/libkipi/debian/rules2
-rw-r--r--debian/lenny/libraries/libtdeldap/debian/control2
-rw-r--r--debian/lenny/libraries/libtdeldap/debian/patches/series0
-rwxr-xr-xdebian/lenny/libraries/libtdeldap/debian/rules2
10 files changed, 12 insertions, 4 deletions
diff --git a/debian/lenny/libraries/kipi-plugins/debian/cdbs/debian-qt-kde.mk b/debian/lenny/libraries/kipi-plugins/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/lenny/libraries/kipi-plugins/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/libraries/kipi-plugins/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
include debian/cdbs/uploaders.mk
+ifndef _cdbs_rules_patchsys_quilt
DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
DEB_KDE_ENABLE_FINAL := yes
DEB_INSTALL_DOCS_ALL :=
diff --git a/debian/lenny/libraries/libkdcraw/debian/cdbs/debian-qt-kde.mk b/debian/lenny/libraries/libkdcraw/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/lenny/libraries/libkdcraw/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/libraries/libkdcraw/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
include debian/cdbs/uploaders.mk
+ifndef _cdbs_rules_patchsys_quilt
DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
DEB_KDE_ENABLE_FINAL := yes
DEB_INSTALL_DOCS_ALL :=
diff --git a/debian/lenny/libraries/libkexiv2/debian/cdbs/debian-qt-kde.mk b/debian/lenny/libraries/libkexiv2/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/lenny/libraries/libkexiv2/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/libraries/libkexiv2/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
include debian/cdbs/uploaders.mk
+ifndef _cdbs_rules_patchsys_quilt
DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
DEB_KDE_ENABLE_FINAL := yes
DEB_INSTALL_DOCS_ALL :=
diff --git a/debian/lenny/libraries/libkipi/debian/cdbs/debian-qt-kde.mk b/debian/lenny/libraries/libkipi/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/lenny/libraries/libkipi/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/libraries/libkipi/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
include debian/cdbs/uploaders.mk
+ifndef _cdbs_rules_patchsys_quilt
DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
DEB_KDE_ENABLE_FINAL := yes
DEB_INSTALL_DOCS_ALL :=
diff --git a/debian/lenny/libraries/libkipi/debian/control b/debian/lenny/libraries/libkipi/debian/control
index 0a2924914..4a5c8d057 100644
--- a/debian/lenny/libraries/libkipi/debian/control
+++ b/debian/lenny/libraries/libkipi/debian/control
@@ -3,7 +3,7 @@ Section: libs
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Uploaders: Achim Bohnet <ach@mpe.mpg.de>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>> 4.1), libexif-dev, tdelibs14-trinity-dev (>= 4:3.4.3-2), automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>> 4.1), quilt, libexif-dev, tdelibs14-trinity-dev (>= 4:3.4.3-2), automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Package: libkipi0-trinity-dev
diff --git a/debian/lenny/libraries/libkipi/debian/patches/.gitignore b/debian/lenny/libraries/libkipi/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/lenny/libraries/libkipi/debian/patches/.gitignore
+++ b/debian/lenny/libraries/libkipi/debian/patches/series
diff --git a/debian/lenny/libraries/libkipi/debian/rules b/debian/lenny/libraries/libkipi/debian/rules
index c95fe1343..9835b9048 100755
--- a/debian/lenny/libraries/libkipi/debian/rules
+++ b/debian/lenny/libraries/libkipi/debian/rules
@@ -2,7 +2,7 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include debian/cdbs/debian-qt-kde.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/rules/utils.mk
DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
diff --git a/debian/lenny/libraries/libtdeldap/debian/control b/debian/lenny/libraries/libtdeldap/debian/control
index 78bbffbc8..0f20c21ab 100644
--- a/debian/lenny/libraries/libtdeldap/debian/control
+++ b/debian/lenny/libraries/libtdeldap/debian/control
@@ -2,7 +2,7 @@ Source: libtdeldap-trinity
Section: tde
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>= 5), cdbs, tdelibs14-trinity-dev, libldap2-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5), quilt, cdbs, tdelibs14-trinity-dev, libldap2-dev, automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Package: libtdeldap-trinity
diff --git a/debian/lenny/libraries/libtdeldap/debian/patches/series b/debian/lenny/libraries/libtdeldap/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/debian/lenny/libraries/libtdeldap/debian/patches/series
diff --git a/debian/lenny/libraries/libtdeldap/debian/rules b/debian/lenny/libraries/libtdeldap/debian/rules
index 9bed17b05..e4abe53af 100755
--- a/debian/lenny/libraries/libtdeldap/debian/rules
+++ b/debian/lenny/libraries/libtdeldap/debian/rules
@@ -1,6 +1,6 @@
#!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/class/autotools.mk
include /usr/share/cdbs/1/rules/debhelper.mk