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/rosegarden | |
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/rosegarden')
-rw-r--r-- | debian/squeeze/applications/rosegarden/debian/cdbs/debian-qt-kde.mk | 2 | ||||
-rw-r--r-- | debian/squeeze/applications/rosegarden/debian/control | 2 | ||||
-rw-r--r-- | debian/squeeze/applications/rosegarden/debian/patches/series (renamed from debian/squeeze/applications/rosegarden/debian/patches/.gitignore) | 0 | ||||
-rwxr-xr-x | debian/squeeze/applications/rosegarden/debian/rules | 2 |
4 files changed, 4 insertions, 2 deletions
diff --git a/debian/squeeze/applications/rosegarden/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/rosegarden/debian/cdbs/debian-qt-kde.mk index 856fa4932..1d366e492 100644 --- a/debian/squeeze/applications/rosegarden/debian/cdbs/debian-qt-kde.mk +++ b/debian/squeeze/applications/rosegarden/debian/cdbs/debian-qt-kde.mk @@ -15,7 +15,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/rosegarden/debian/control b/debian/squeeze/applications/rosegarden/debian/control index b62c06adc..bfa8fbc1f 100644 --- a/debian/squeeze/applications/rosegarden/debian/control +++ b/debian/squeeze/applications/rosegarden/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> XSBC-Original-Maintainer: Debian Multimedia Team <debian-multimedia@lists.debian.org> Uploaders: Mike O'Connor <stew@debian.org>, Free Ekanayaka <freee@debian.org> -Build-Depends: debhelper (>> 5.0.0), cdbs, quilt, cmake, kdelibs4-trinity-dev, libasound2-dev (>= 1.0.0), libjack-dev, ladspa-sdk, liblrdf0-dev, liblircclient-dev, dssi-dev (>= 0.4 ), liblo-dev, libxft-dev, libfftw3-dev +Build-Depends: debhelper (>> 5.0.0), quilt, cdbs, cmake, kdelibs4-trinity-dev, libasound2-dev (>= 1.0.0), libjack-dev, ladspa-sdk, liblrdf0-dev, liblircclient-dev, dssi-dev (>= 0.4 ), liblo-dev, libxft-dev, libfftw3-dev Standards-Version: 3.8.4 Homepage: http://www.rosegardenmusic.com/ diff --git a/debian/squeeze/applications/rosegarden/debian/patches/.gitignore b/debian/squeeze/applications/rosegarden/debian/patches/series index e69de29bb..e69de29bb 100644 --- a/debian/squeeze/applications/rosegarden/debian/patches/.gitignore +++ b/debian/squeeze/applications/rosegarden/debian/patches/series diff --git a/debian/squeeze/applications/rosegarden/debian/rules b/debian/squeeze/applications/rosegarden/debian/rules index d554585f6..03a24f92b 100755 --- a/debian/squeeze/applications/rosegarden/debian/rules +++ b/debian/squeeze/applications/rosegarden/debian/rules @@ -11,7 +11,7 @@ export LD_LIBRARY_PATH include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.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 |