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> | 2013-09-15 20:29:47 +0200 |
| commit | f24915471ea396c53670df51b2affc4af74373bf (patch) | |
| tree | 04e25e027d641ad6b82ba5828ae9a9c72924b1f1 /ubuntu/raring/applications/kiosktool/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/kiosktool/debian')
4 files changed, 6 insertions, 2 deletions
diff --git a/ubuntu/raring/applications/kiosktool/debian/cdbs/debian-qt-kde.mk b/ubuntu/raring/applications/kiosktool/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/ubuntu/raring/applications/kiosktool/debian/cdbs/debian-qt-kde.mk +++ b/ubuntu/raring/applications/kiosktool/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/kiosktool/debian/control b/ubuntu/raring/applications/kiosktool/debian/control index 322d2b3b4..6779d88ff 100644 --- a/ubuntu/raring/applications/kiosktool/debian/control +++ b/ubuntu/raring/applications/kiosktool/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> XSBC-Original-Maintainer: Pedro Jurado Maqueda <melenas@kdehispano.org> -Build-Depends: debhelper (>= 4.1.0), cdbs, tdelibs14-trinity-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>= 4.1.0), quilt, cdbs, tdelibs14-trinity-dev, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: kiosktool-trinity diff --git a/ubuntu/raring/applications/kiosktool/debian/patches/series b/ubuntu/raring/applications/kiosktool/debian/patches/series new file mode 100644 index 000000000..f33e94505 --- /dev/null +++ b/ubuntu/raring/applications/kiosktool/debian/patches/series @@ -0,0 +1,2 @@ +kubuntu_02_kmenu.diff +kubuntu_03_sudo_support.diff diff --git a/ubuntu/raring/applications/kiosktool/debian/rules b/ubuntu/raring/applications/kiosktool/debian/rules index 507e5a458..7e010577d 100755 --- a/ubuntu/raring/applications/kiosktool/debian/rules +++ b/ubuntu/raring/applications/kiosktool/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 debian/cdbs/kde.mk DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde |