diff options
| author | Slávek Banko <[email protected]> | 2013-09-15 20:29:47 +0200 |
|---|---|---|
| committer | Slávek Banko <[email protected]> | 2013-09-15 20:29:47 +0200 |
| commit | f24915471ea396c53670df51b2affc4af74373bf (patch) | |
| tree | 04e25e027d641ad6b82ba5828ae9a9c72924b1f1 /ubuntu/raring/applications/keep/debian | |
| parent | 1c7a831407fea1378682db5c21b06e792343be06 (diff) | |
| download | tde-packaging-f24915471ea396c53670df51b2affc4af74373bf.tar.gz tde-packaging-f24915471ea396c53670df51b2affc4af74373bf.zip | |
Switch patch system from simple to quilt on Debian and Ubuntu
Diffstat (limited to 'ubuntu/raring/applications/keep/debian')
4 files changed, 5 insertions, 2 deletions
diff --git a/ubuntu/raring/applications/keep/debian/cdbs/debian-qt-kde.mk b/ubuntu/raring/applications/keep/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/ubuntu/raring/applications/keep/debian/cdbs/debian-qt-kde.mk +++ b/ubuntu/raring/applications/keep/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/raring/applications/keep/debian/control b/ubuntu/raring/applications/keep/debian/control index ee2e6676f..1e411624f 100644 --- a/ubuntu/raring/applications/keep/debian/control +++ b/ubuntu/raring/applications/keep/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Timothy Pearson <[email protected]> XSBC-Original-Maintainer: Debian KDE Extras Team <[email protected]> Uploaders: Fathi Boudra <[email protected]>, Mark Purcell <[email protected]> -Build-Depends: cdbs, debhelper (>= 5), tdelibs14-trinity-dev, docbook2x, docbook-xml, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs, debhelper (>= 5), quilt, tdelibs14-trinity-dev, docbook2x, docbook-xml, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: keep-trinity diff --git a/ubuntu/raring/applications/keep/debian/patches/series b/ubuntu/raring/applications/keep/debian/patches/series new file mode 100644 index 000000000..9ccf4a125 --- /dev/null +++ b/ubuntu/raring/applications/keep/debian/patches/series @@ -0,0 +1 @@ +kubuntu_01_kdepot.diff diff --git a/ubuntu/raring/applications/keep/debian/rules b/ubuntu/raring/applications/keep/debian/rules index c08262790..ae055a958 100755 --- a/ubuntu/raring/applications/keep/debian/rules +++ b/ubuntu/raring/applications/keep/debian/rules @@ -2,7 +2,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/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 |