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/lenny/kdevelop/debian | |
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/lenny/kdevelop/debian')
-rw-r--r-- | debian/lenny/kdevelop/debian/cdbs/debian-qt-kde.mk | 2 | ||||
-rw-r--r-- | debian/lenny/kdevelop/debian/control | 2 | ||||
-rw-r--r-- | debian/lenny/kdevelop/debian/patches/series | 3 | ||||
-rwxr-xr-x | debian/lenny/kdevelop/debian/rules | 2 |
4 files changed, 7 insertions, 2 deletions
diff --git a/debian/lenny/kdevelop/debian/cdbs/debian-qt-kde.mk b/debian/lenny/kdevelop/debian/cdbs/debian-qt-kde.mk index f8b76cb04..4a9d74d88 100644 --- a/debian/lenny/kdevelop/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/kdevelop/debian/cdbs/debian-qt-kde.mk @@ -20,7 +20,9 @@ endif 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/kdevelop/debian/control b/debian/lenny/kdevelop/debian/control index 0a60be945..280afc505 100644 --- a/debian/lenny/kdevelop/debian/control +++ b/debian/lenny/kdevelop/debian/control @@ -3,7 +3,7 @@ Section: kde Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> XSBC-Original-Maintainer: Jeremy Lainé <jeremy.laine@m4x.org> -Build-Depends: cdbs (>= 0.4.38), debhelper (>= 5), cmake, kdelibs4-trinity-dev (>= 4:3.5.10), gettext, kdelibs4-trinity-doc, libtqtinterface-doc, flex, python, libcvsservice-trinity-dev (>= 4:3.5.10), groff-base, libsvn-dev, libaprutil1-dev, libdb-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs (>= 0.4.38), debhelper (>= 5), quilt, cmake, kdelibs4-trinity-dev (>= 4:3.5.10), gettext, kdelibs4-trinity-doc, libtqtinterface-doc, flex, python, libcvsservice-trinity-dev (>= 4:3.5.10), groff-base, libsvn-dev, libaprutil1-dev, libdb-dev, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: kdevelop-trinity diff --git a/debian/lenny/kdevelop/debian/patches/series b/debian/lenny/kdevelop/debian/patches/series new file mode 100644 index 000000000..6b3ddc8ec --- /dev/null +++ b/debian/lenny/kdevelop/debian/patches/series @@ -0,0 +1,3 @@ +common/04_am_maintainer_mode.diff +common/06_disable_no_undefined.diff +common/kubuntu_01_kdepot.diff diff --git a/debian/lenny/kdevelop/debian/rules b/debian/lenny/kdevelop/debian/rules index 99667d1b3..cfaa4a957 100755 --- a/debian/lenny/kdevelop/debian/rules +++ b/debian/lenny/kdevelop/debian/rules @@ -7,7 +7,7 @@ makebuilddir:: include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.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 |