diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2013-09-15 20:29:47 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2017-07-18 00:23:09 +0200 |
| commit | f025c10ab2c705f3b86669b3dae1817c0cdd6d1d (patch) | |
| tree | e9ca489d65a931d999e375719a0ddd5d670b77f6 /debian/squeeze/applications/digikam | |
| parent | 17ce56f2601667a7515bbe21b4754cdb51f0d650 (diff) | |
| download | tde-packaging-f025c10ab2c705f3b86669b3dae1817c0cdd6d1d.tar.gz tde-packaging-f025c10ab2c705f3b86669b3dae1817c0cdd6d1d.zip | |
Switch patch system from simple to quilt on Debian and Ubuntu
(cherry picked from commit f24915471ea396c53670df51b2affc4af74373bf)
Diffstat (limited to 'debian/squeeze/applications/digikam')
| -rw-r--r-- | debian/squeeze/applications/digikam/debian/cdbs/debian-qt-kde.mk | 2 | ||||
| -rw-r--r-- | debian/squeeze/applications/digikam/debian/patches/series (renamed from debian/squeeze/applications/digikam/debian/patches/.gitignore) | 0 | ||||
| -rwxr-xr-x | debian/squeeze/applications/digikam/debian/rules | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/debian/squeeze/applications/digikam/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/digikam/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/debian/squeeze/applications/digikam/debian/cdbs/debian-qt-kde.mk +++ b/debian/squeeze/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/debian/squeeze/applications/digikam/debian/patches/.gitignore b/debian/squeeze/applications/digikam/debian/patches/series index e69de29bb..e69de29bb 100644 --- a/debian/squeeze/applications/digikam/debian/patches/.gitignore +++ b/debian/squeeze/applications/digikam/debian/patches/series diff --git a/debian/squeeze/applications/digikam/debian/rules b/debian/squeeze/applications/digikam/debian/rules index 046053e54..2d85649a6 100755 --- a/debian/squeeze/applications/digikam/debian/rules +++ b/debian/squeeze/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 |