summaryrefslogtreecommitdiffstats
path: root/ubuntu/maverick/applications/digikam
diff options
context:
space:
mode:
Diffstat (limited to 'ubuntu/maverick/applications/digikam')
-rw-r--r--ubuntu/maverick/applications/digikam/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--ubuntu/maverick/applications/digikam/debian/control2
-rw-r--r--ubuntu/maverick/applications/digikam/debian/patches/series (renamed from ubuntu/maverick/applications/digikam/debian/patches/.gitignore)0
-rwxr-xr-xubuntu/maverick/applications/digikam/debian/rules2
4 files changed, 4 insertions, 2 deletions
diff --git a/ubuntu/maverick/applications/digikam/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/digikam/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/applications/digikam/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/digikam/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/ubuntu/maverick/applications/digikam/debian/control b/ubuntu/maverick/applications/digikam/debian/control
index e851cfee2..4713c9d42 100644
--- a/ubuntu/maverick/applications/digikam/debian/control
+++ b/ubuntu/maverick/applications/digikam/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <[email protected]>
XSBC-Original-Maintainer: Debian KDE Extras Team <[email protected]>
Uploaders: Achim Bohnet <[email protected]>, Mark Purcell <[email protected]>, Fathi Boudra <[email protected]>
-Build-Depends: cdbs, debhelper (>= 5), tdelibs14-trinity-dev,
+Build-Depends: cdbs, debhelper (>= 5), quilt, tdelibs14-trinity-dev,
libtiff-dev, libgphoto2-6-dev | libgphoto2-2-dev, libkipi0-trinity-dev,
libsqlite3-dev, liblcms1-dev, libkexiv2-3-trinity-dev (>= 0.1.6),
libjasper-dev, libpng12-dev | libpng-dev, libexiv2-dev,
diff --git a/ubuntu/maverick/applications/digikam/debian/patches/.gitignore b/ubuntu/maverick/applications/digikam/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/digikam/debian/patches/.gitignore
+++ b/ubuntu/maverick/applications/digikam/debian/patches/series
diff --git a/ubuntu/maverick/applications/digikam/debian/rules b/ubuntu/maverick/applications/digikam/debian/rules
index 76fa321bc..cc9992ad3 100755
--- a/ubuntu/maverick/applications/digikam/debian/rules
+++ b/ubuntu/maverick/applications/digikam/debian/rules
@@ -1,7 +1,7 @@
#!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.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
include debian/cdbs/debian-qt-kde.mk
-include /usr/share/gnome-pkg-tools/1/rules/sf-get-source.mk