diff options
363 files changed, 4176 insertions, 693 deletions
diff --git a/debian/_base/applications/abakus/debian/control b/debian/_base/applications/abakus/debian/control index f17a559b6..cab949377 100644 --- a/debian/_base/applications/abakus/debian/control +++ b/debian/_base/applications/abakus/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Steffen Joeris <steffen.joeris@skolelinux.de> -Build-Depends: autotools-dev, debhelper (>= 9~), quilt, cdbs (>= 0.4.0), cmake, imagemagick, tdelibs14-trinity-dev, chrpath, bison, flex +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, imagemagick, bison, flex Standards-Version: 3.8.4 Package: abakus-trinity diff --git a/debian/_base/applications/abakus/debian/rules b/debian/_base/applications/abakus/debian/rules index a9d88368b..3c72c1e14 100755 --- a/debian/_base/applications/abakus/debian/rules +++ b/debian/_base/applications/abakus/debian/rules @@ -39,7 +39,6 @@ common-build-arch:: debian/abakus.xpm common-install-arch:: install -D -m 644 debian/abakus.xpm debian/abakus-trinity/opt/trinity/share/pixmaps/abakus.xpm - chrpath -d debian/abakus-trinity/opt/trinity/bin/abakus dh_icons -pabakus-trinity binary-install/abakus-trinity:: diff --git a/debian/_base/applications/amarok/debian/control b/debian/_base/applications/amarok/debian/control index 758ea5c23..1855304fc 100644 --- a/debian/_base/applications/amarok/debian/control +++ b/debian/_base/applications/amarok/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Modestas Vainius <modestas@vainius.eu> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, bzip2, +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, bzip2, tdelibs14-trinity-dev, tdebase-trinity-dev, libakode-dev, libxine2-dev | libxine-dev, libdbus-tqt-1-dev, libtag1-dev, libsqlite3-dev, diff --git a/debian/_base/applications/basket/debian/control b/debian/_base/applications/basket/debian/control index 1e0ac4403..f8cff82df 100644 --- a/debian/_base/applications/basket/debian/control +++ b/debian/_base/applications/basket/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Sune Vuorela <debian@pusling.com> -Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, tdelibs14-trinity-dev, tdepim-trinity-dev, libgpgme11-dev | libgpgme-dev (>= 1.0~) +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, tdepim-trinity-dev, libgpgme11-dev | libgpgme-dev (>= 1.0~) Standards-Version: 3.8.4 Package: basket-trinity diff --git a/debian/_base/applications/codeine/debian/control b/debian/_base/applications/codeine/debian/control index 541184a6d..baa0ce54c 100644 --- a/debian/_base/applications/codeine/debian/control +++ b/debian/_base/applications/codeine/debian/control @@ -2,7 +2,7 @@ Source: codeine-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, tdelibs-trinity-dev, libxine2-dev | libxine-dev, libxtst-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs-trinity-dev, libxine2-dev | libxine-dev, libxtst-dev Standards-Version: 3.7.3 Homepage: http://codeine.sourceforge.net/ diff --git a/debian/_base/applications/compizconfig-backend-tdeconfig/debian/control b/debian/_base/applications/compizconfig-backend-tdeconfig/debian/control index e82f2b085..f2ee0ba0f 100644 --- a/debian/_base/applications/compizconfig-backend-tdeconfig/debian/control +++ b/debian/_base/applications/compizconfig-backend-tdeconfig/debian/control @@ -2,7 +2,7 @@ Source: compizconfig-backend-tdeconfig-trinity Section: libs Priority: extra Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, compiz-trinity-dev, pkg-config, tdelibs14-trinity-dev, libcompizconfig0-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, compiz-trinity-dev, pkg-config, tdelibs14-trinity-dev, libcompizconfig0-trinity-dev Standards-Version: 3.8.4 Package: compizconfig-backend-tdeconfig-trinity diff --git a/debian/_base/applications/dolphin/debian/control b/debian/_base/applications/dolphin/debian/control index 995bd3138..b5d84d568 100644 --- a/debian/_base/applications/dolphin/debian/control +++ b/debian/_base/applications/dolphin/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Anthony Mercatante <tonio@ubuntu.com> -Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, tdelibs14-trinity-dev, libkonq4-trinity-dev, tdebase-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, libkonq4-trinity-dev, tdebase-trinity-dev Standards-Version: 3.8.4 Package: dolphin-trinity diff --git a/debian/_base/applications/filelight/debian/control b/debian/_base/applications/filelight/debian/control index dedb5f8fd..5afca2d62 100644 --- a/debian/_base/applications/filelight/debian/control +++ b/debian/_base/applications/filelight/debian/control @@ -5,7 +5,7 @@ Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org> Uploaders: Ral Snchez Siles <rasasi78@gmail.com> Standards-Version: 3.8.4 -Build-Depends: debhelper (>= 9~), cdbs, cmake, tdelibs14-trinity-dev, xutils, chrpath, quilt (>= 0.40), libltdl-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, xutils Homepage: http://www.methylblue.com/filelight/ Package: filelight-trinity diff --git a/debian/_base/applications/gtk-qt-engine/debian/control b/debian/_base/applications/gtk-qt-engine/debian/control index 7dcc95bc1..f60a3d3a4 100644 --- a/debian/_base/applications/gtk-qt-engine/debian/control +++ b/debian/_base/applications/gtk-qt-engine/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Bastian Venthur <venthur@debian.org> -Build-Depends: debhelper (>= 9~), quilt, cdbs, tdelibs14-trinity-dev, libgtk2.0-dev, cmake, libgtk2.0-dev (>= 2.10.1) +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, libgtk2.0-dev (>= 2.10.1) Standards-Version: 3.8.4 Package: gtk-qt-engine-trinity diff --git a/debian/_base/applications/gwenview-i18n/debian/control b/debian/_base/applications/gwenview-i18n/debian/control index 2f7c72b53..0890faaaa 100644 --- a/debian/_base/applications/gwenview-i18n/debian/control +++ b/debian/_base/applications/gwenview-i18n/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> Build-Depends-Indep: tdelibs14-trinity-dev -Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build Standards-Version: 3.8.0 Homepage: http://gwenview.sourceforge.net diff --git a/debian/_base/applications/k3b-i18n/debian/control b/debian/_base/applications/k3b-i18n/debian/control index 81fb1a805..7cc131110 100644 --- a/debian/_base/applications/k3b-i18n/debian/control +++ b/debian/_base/applications/k3b-i18n/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> Uploaders: Francois Marier <francois@debian.org>, Fathi Boudra <fabo@debian.org> -Build-Depends: debhelper (>= 9~), cdbs, quilt, cmake +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build Build-Depends-Indep: tdelibs14-trinity-dev Standards-Version: 3.8.3 diff --git a/debian/_base/applications/k3b/debian/control b/debian/_base/applications/k3b/debian/control index 37c0cf19b..3998ff241 100644 --- a/debian/_base/applications/k3b/debian/control +++ b/debian/_base/applications/k3b/debian/control @@ -5,8 +5,8 @@ Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org> Uploaders: Francois Marier <francois@debian.org>, Fathi Boudra <fabo@debian.org> Build-Depends: - debhelper (>= 9~), quilt, cdbs (>= 0.4.52ubuntu18), cmake, chrpath, - tdelibs14-trinity-dev (>= 3.5.0), libdbus-tqt-1-dev, + cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, + tdelibs14-trinity-dev, libdbus-tqt-1-dev, libdvdread-dev, libasound2-dev, lame, libmp3lame-dev, libflac++-dev (>= 1.1.2), flac, libpopt-dev, libmpcdec-dev, libtag1-dev (>= 1.4-3), libmad0-dev, libavformat-dev, libavcodec-dev, libvorbis-dev, libsamplerate0-dev, libsndfile1-dev diff --git a/debian/_base/applications/kaffeine-mozilla/debian/control b/debian/_base/applications/kaffeine-mozilla/debian/control index ef1c25095..72510cc3d 100644 --- a/debian/_base/applications/kaffeine-mozilla/debian/control +++ b/debian/_base/applications/kaffeine-mozilla/debian/control @@ -3,7 +3,7 @@ Section: web Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> Uploaders: Riku Voipio <riku.voipio@iki.fi> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, pkg-config, libxaw7-dev, libnspr4-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, pkg-config, libxaw7-dev, libnspr4-dev Standards-Version: 3.8.4 Package: kaffeine-mozilla-trinity diff --git a/debian/_base/applications/kaffeine/debian/control b/debian/_base/applications/kaffeine/debian/control index 74a91f341..2ef81809a 100644 --- a/debian/_base/applications/kaffeine/debian/control +++ b/debian/_base/applications/kaffeine/debian/control @@ -5,7 +5,7 @@ Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org> Uploaders: Riku Voipio <riku.voipio@iki.fi>, Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, tdelibs14-trinity-dev, +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, libcdparanoia0-dev, libogg-dev, libxine2-dev | libxine-dev (>= 1.1.7), libxcb1-dev, libxtst-dev, libgstreamer1.0-dev | libgstreamer0.10-dev, libgstreamer-plugins-base1.0-dev | libgstreamer-plugins-base0.10-dev, diff --git a/debian/_base/applications/kasablanca/debian/control b/debian/_base/applications/kasablanca/debian/control index 45ad09182..04aa9de09 100644 --- a/debian/_base/applications/kasablanca/debian/control +++ b/debian/_base/applications/kasablanca/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, tdelibs14-trinity-dev, libssl-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, libssl-dev Standards-Version: 3.8.3 Package: kasablanca-trinity diff --git a/debian/_base/applications/katapult/debian/control b/debian/_base/applications/katapult/debian/control index 3f601cc83..cb747c9b2 100644 --- a/debian/_base/applications/katapult/debian/control +++ b/debian/_base/applications/katapult/debian/control @@ -2,7 +2,7 @@ Source: katapult-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: cdbs (>= 0.4.46ubuntu5), debhelper (>= 9~), quilt, cmake, tdelibs14-trinity-dev, libxi-dev, sharutils +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, libxi-dev Standards-Version: 3.8.4 Package: katapult-trinity diff --git a/debian/_base/applications/kbarcode/debian/control b/debian/_base/applications/kbarcode/debian/control index 470dab7ae..37c314239 100644 --- a/debian/_base/applications/kbarcode/debian/control +++ b/debian/_base/applications/kbarcode/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.4 Package: kbarcode-trinity diff --git a/debian/_base/applications/kbfx/debian/control b/debian/_base/applications/kbfx/debian/control index 5109a6c5d..c63bdfa1c 100644 --- a/debian/_base/applications/kbfx/debian/control +++ b/debian/_base/applications/kbfx/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.4 Package: kbfx-trinity diff --git a/debian/_base/applications/kbibtex/debian/control b/debian/_base/applications/kbibtex/debian/control index 56c0d7f2e..bc7d8af56 100644 --- a/debian/_base/applications/kbibtex/debian/control +++ b/debian/_base/applications/kbibtex/debian/control @@ -2,7 +2,7 @@ Source: kbibtex-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, tdelibs14-trinity-dev (>= 3.3.2), libxslt1-dev, libyaz-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev (>= 3.3.2), libxslt1-dev, libyaz-dev Standards-Version: 3.9.0 Homepage: http://www.unix-ag.uni-kl.de/~fischer/kbibtex Vcs-Browser: http://git.debian.org/?p=pkg-exppsy/kbibtex.git diff --git a/debian/_base/applications/kbiff/debian/control b/debian/_base/applications/kbiff/debian/control index 15753cf08..bef326207 100644 --- a/debian/_base/applications/kbiff/debian/control +++ b/debian/_base/applications/kbiff/debian/control @@ -2,7 +2,7 @@ Source: kbiff-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, tdelibs14-trinity-dev (>= 4:3.4.2) +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev (>= 4:3.4.2) Standards-Version: 3.9.1 Package: kbiff-trinity diff --git a/debian/_base/applications/kbookreader/debian/control b/debian/_base/applications/kbookreader/debian/control index 3fe24e75a..62bb0ee13 100644 --- a/debian/_base/applications/kbookreader/debian/control +++ b/debian/_base/applications/kbookreader/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Anthony Mercatante <tonio@ubuntu.com> -Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.4 Homepage: http://k9copy.sourceforge.net/ diff --git a/debian/_base/applications/kchmviewer/debian/control b/debian/_base/applications/kchmviewer/debian/control index 3b88de628..767175be0 100644 --- a/debian/_base/applications/kchmviewer/debian/control +++ b/debian/_base/applications/kchmviewer/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Jose Luis Tallon <jltallon@adv-solutions.net> -Build-Depends: debhelper (>= 9~), cdbs, quilt, cmake, tdelibs14-trinity-dev, libchm-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, libchm-dev Standards-Version: 3.8.4 Homepage: http://www.kchmviewer.net/ diff --git a/debian/_base/applications/kcmautostart/debian/control b/debian/_base/applications/kcmautostart/debian/control index 5449f2002..b1ae1750c 100644 --- a/debian/_base/applications/kcmautostart/debian/control +++ b/debian/_base/applications/kcmautostart/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Raphaël Pinson <raphink@raphink.net> -Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.4 Package: kcontrol-autostart-trinity diff --git a/debian/_base/applications/kcmldap/debian/control b/debian/_base/applications/kcmldap/debian/control index badcdac78..0654ea684 100644 --- a/debian/_base/applications/kcmldap/debian/control +++ b/debian/_base/applications/kcmldap/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Raphaël Pinson <raphink@raphink.net> -Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, tdelibs14-trinity-dev, libtdeldap-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, libtdeldap-trinity-dev Standards-Version: 3.8.4 Package: kcontrol-ldap-bonding-trinity diff --git a/debian/_base/applications/kcmldapcontroller/debian/control b/debian/_base/applications/kcmldapcontroller/debian/control index 61d8b6a0b..596ab76b8 100644 --- a/debian/_base/applications/kcmldapcontroller/debian/control +++ b/debian/_base/applications/kcmldapcontroller/debian/control @@ -2,7 +2,7 @@ Source: kcontrol-ldap-controller-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, tdelibs14-trinity-dev, libldap2-dev, slapi-dev | slapd, libtdeldap-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, libldap2-dev, slapi-dev | slapd, libtdeldap-trinity-dev Standards-Version: 3.8.4 Package: kcontrol-ldap-controller-trinity diff --git a/debian/_base/applications/kcmldapmanager/debian/control b/debian/_base/applications/kcmldapmanager/debian/control index 2ced21c69..c07c7932e 100644 --- a/debian/_base/applications/kcmldapmanager/debian/control +++ b/debian/_base/applications/kcmldapmanager/debian/control @@ -2,7 +2,7 @@ Source: kcontrol-ldap-manager-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: debhelper (>= 9~), cdbs, quilt, cmake, tdelibs14-trinity-dev, libldap2-dev, libtdeldap-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, libldap2-dev, libtdeldap-trinity-dev Standards-Version: 3.8.4 Package: kcontrol-ldap-manager-trinity diff --git a/debian/_base/applications/kcpuload/debian/control b/debian/_base/applications/kcpuload/debian/control index e25013fba..43c399d67 100644 --- a/debian/_base/applications/kcpuload/debian/control +++ b/debian/_base/applications/kcpuload/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Helen Faulkner <helen@debian.org> -Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.4 Package: kcpuload-trinity diff --git a/debian/_base/applications/kdbg/debian/control b/debian/_base/applications/kdbg/debian/control index 4911d1bb4..8c3f65078 100644 --- a/debian/_base/applications/kdbg/debian/control +++ b/debian/_base/applications/kdbg/debian/control @@ -2,7 +2,7 @@ Source: kdbg-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.4 Homepage: http://www.kdbg.org/ diff --git a/debian/_base/applications/kdbusnotification/debian/control b/debian/_base/applications/kdbusnotification/debian/control index 6f5faf327..126d0fe27 100644 --- a/debian/_base/applications/kdbusnotification/debian/control +++ b/debian/_base/applications/kdbusnotification/debian/control @@ -2,7 +2,7 @@ Source: kdbusnotification-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, tdelibs14-trinity-dev, libdbus-glib-1-dev, libgtk2.0-dev, libglib2.0-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, libdbus-glib-1-dev, libgtk2.0-dev, libglib2.0-dev Standards-Version: 3.8.4 Package: kdbusnotification-trinity diff --git a/debian/_base/applications/kdiff3/debian/control b/debian/_base/applications/kdiff3/debian/control index 0ba05454d..442866033 100644 --- a/debian/_base/applications/kdiff3/debian/control +++ b/debian/_base/applications/kdiff3/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Eike Sauer <eike@debian.org> -Build-Depends: debhelper (>= 9~), cdbs, quilt, cmake, tdelibs14-trinity-dev, libkonq4-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, libkonq4-trinity-dev Standards-Version: 3.8.4 Package: kdiff3-trinity diff --git a/debian/_base/applications/kdirstat/debian/control b/debian/_base/applications/kdirstat/debian/control index a8dd011cd..eeb86eba9 100644 --- a/debian/_base/applications/kdirstat/debian/control +++ b/debian/_base/applications/kdirstat/debian/control @@ -2,7 +2,7 @@ Source: kdirstat-trinity Section: misc Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: cdbs (>= 0.4.41), debhelper (>= 9~), quilt, cmake, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.4 Homepage: http://kdirstat.sourceforge.net/ diff --git a/debian/_base/applications/kdpkg/debian/control b/debian/_base/applications/kdpkg/debian/control index 2b19f5788..b2070f858 100644 --- a/debian/_base/applications/kdpkg/debian/control +++ b/debian/_base/applications/kdpkg/debian/control @@ -3,7 +3,7 @@ Section: admin Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Alexander Kopf <kopf-alexander@gmx.de> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.4 Package: kdpkg-trinity diff --git a/debian/_base/applications/keep/debian/control b/debian/_base/applications/keep/debian/control index aa10572b3..d88510fe6 100644 --- a/debian/_base/applications/keep/debian/control +++ b/debian/_base/applications/keep/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org> Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.4 Package: keep-trinity diff --git a/debian/_base/applications/kerberostray/debian/control b/debian/_base/applications/kerberostray/debian/control index f966a8640..c8f45fe82 100644 --- a/debian/_base/applications/kerberostray/debian/control +++ b/debian/_base/applications/kerberostray/debian/control @@ -2,7 +2,7 @@ Source: kerberostray-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, tdelibs14-trinity-dev, libtdeldap-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, libtdeldap-trinity-dev Standards-Version: 3.8.4 Package: kerberostray-trinity diff --git a/debian/_base/applications/keximdb/debian/control b/debian/_base/applications/keximdb/debian/control index 517f7246b..d15eaafce 100644 --- a/debian/_base/applications/keximdb/debian/control +++ b/debian/_base/applications/keximdb/debian/control @@ -2,7 +2,7 @@ Source: keximdb-trinity Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Martin Ellis <martin.ellis@kdemail.net> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, koffice-trinity-dev, libglib2.0-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, koffice-trinity-dev, libglib2.0-dev Standards-Version: 3.7.2 Section: tde diff --git a/debian/_base/applications/kgtk-qt3/debian/control b/debian/_base/applications/kgtk-qt3/debian/control index f0a66450f..1c9b78a03 100644 --- a/debian/_base/applications/kgtk-qt3/debian/control +++ b/debian/_base/applications/kgtk-qt3/debian/control @@ -2,7 +2,7 @@ Source: kgtk-qt3-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: debhelper (>= 9~), quilt, cdbs, tdelibs14-trinity-dev, libgtk2.0-dev, libtqtinterface-dev, cmake +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, libgtk2.0-dev Standards-Version: 3.8.4 Homepage: http://trinity.pearsoncomputing.net diff --git a/debian/_base/applications/kima/debian/control b/debian/_base/applications/kima/debian/control index c6ddb431d..76fafda42 100644 --- a/debian/_base/applications/kima/debian/control +++ b/debian/_base/applications/kima/debian/control @@ -2,7 +2,7 @@ Source: kima-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, tdelibs14-trinity-dev, +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, libxnvctrl-dev [amd64 i386] | nvidia-settings [amd64 i386] Standards-Version: 3.8.4 diff --git a/debian/_base/applications/kiosktool/debian/control b/debian/_base/applications/kiosktool/debian/control index 1c59f816f..ddc5f4ba5 100644 --- a/debian/_base/applications/kiosktool/debian/control +++ b/debian/_base/applications/kiosktool/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Pedro Jurado Maqueda <melenas@kdehispano.org> -Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.4 Package: kiosktool-trinity diff --git a/debian/_base/applications/kkbswitch/debian/control b/debian/_base/applications/kkbswitch/debian/control index 28a4cc194..a0e196369 100644 --- a/debian/_base/applications/kkbswitch/debian/control +++ b/debian/_base/applications/kkbswitch/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Hebrew Packaging Team <debian-hebrew-package@lists.alioth.debian.org> Uploaders: Baruch Even <baruch@debian.org>, Lior Kaplan <kaplan@debian.org>, Shachar Shemesh <shachar@debian.org> -Build-Depends: debhelper (>= 9~), cdbs, cmake, tdelibs14-trinity-dev, libxkbfile-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, libxkbfile-dev Standards-Version: 3.7.3 Homepage: http://kkbswitch.sourceforge.net/ diff --git a/debian/_base/applications/klamav/debian/control b/debian/_base/applications/klamav/debian/control index e3354e939..103e62699 100644 --- a/debian/_base/applications/klamav/debian/control +++ b/debian/_base/applications/klamav/debian/control @@ -3,7 +3,7 @@ Section: admin Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Scott Kitterman <scott@kitterman.com> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, tdelibs14-trinity-dev, libclamav-dev (>= 0.102~) +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, libclamav-dev (>= 0.102~) Standards-Version: 3.8.4 Package: klamav-trinity diff --git a/debian/_base/applications/klcddimmer/debian/control b/debian/_base/applications/klcddimmer/debian/control index 0cb16fca1..ed79ba1b7 100644 --- a/debian/_base/applications/klcddimmer/debian/control +++ b/debian/_base/applications/klcddimmer/debian/control @@ -2,7 +2,7 @@ Source: klcddimmer-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: debhelper (>= 9~), cdbs, cmake, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.7.3 Homepage: http://klcddimeer.sourceforge.net/ diff --git a/debian/_base/applications/kmplayer/debian/control b/debian/_base/applications/kmplayer/debian/control index e5176a380..6022442c4 100644 --- a/debian/_base/applications/kmplayer/debian/control +++ b/debian/_base/applications/kmplayer/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org> Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, tdelibs14-trinity-dev, +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, libnspr4-dev, libcairo2-dev, libdbus-1-dev, libdbus-glib-1-dev, libdbus-tqt-1-dev, libgstreamer-plugins-base1.0-dev | libgstreamer-plugins-base0.10-dev, libgtk2.0-dev, libxine2-dev | libxine-dev, libxv-dev, libxtst-dev, diff --git a/debian/_base/applications/knemo/debian/control b/debian/_base/applications/knemo/debian/control index 62a9bf1d7..d2c9c7f62 100644 --- a/debian/_base/applications/knemo/debian/control +++ b/debian/_base/applications/knemo/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> Uploaders: Achim Bohnet <ach@mpe.mpg.de>, Mark Purcell <msp@debian.org> -Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, tdelibs14-trinity-dev, net-tools, wireless-tools, libiw-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, net-tools, wireless-tools, libiw-dev Standards-Version: 3.8.4 Package: knemo-trinity diff --git a/debian/_base/applications/knetload/debian/control b/debian/_base/applications/knetload/debian/control index e48a2c5f7..cda7a5622 100644 --- a/debian/_base/applications/knetload/debian/control +++ b/debian/_base/applications/knetload/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Helen Faulkner <helen@debian.org> -Build-Depends: debhelper (>= 9~), cdbs, quilt, cmake, tdelibs14-trinity-dev (>= 4:3.4.2), libltdl-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev (>= 4:3.4.2) Standards-Version: 3.8.4 Package: knetload-trinity diff --git a/debian/_base/applications/knetstats/debian/control b/debian/_base/applications/knetstats/debian/control index e2155be65..caf046d11 100644 --- a/debian/_base/applications/knetstats/debian/control +++ b/debian/_base/applications/knetstats/debian/control @@ -2,7 +2,7 @@ Source: knetstats-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.4 Homepage: http://knetstats.sourceforge.net/ diff --git a/debian/_base/applications/knights/debian/control b/debian/_base/applications/knights/debian/control index 482f9a4fd..ebe2e9179 100644 --- a/debian/_base/applications/knights/debian/control +++ b/debian/_base/applications/knights/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Jose Carlos Medeiros <debian@psabs.com.br> Uploaders: Ola Lundqvist <opal@debian.org> -Build-Depends: debhelper (>= 9~), cdbs, quilt, cmake, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.4 Homepage: http://knights.sourceforge.net/ diff --git a/debian/_base/applications/knmap/debian/control b/debian/_base/applications/knmap/debian/control index e5d52fd61..98d098c0e 100644 --- a/debian/_base/applications/knmap/debian/control +++ b/debian/_base/applications/knmap/debian/control @@ -2,7 +2,7 @@ Source: knmap-trinity Section: tde Priority: extra Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: debhelper (>= 9~), cdbs, quilt, cmake, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.2 Package: knmap-trinity diff --git a/debian/_base/applications/knowit/debian/control b/debian/_base/applications/knowit/debian/control index 70373288d..ae90f2552 100644 --- a/debian/_base/applications/knowit/debian/control +++ b/debian/_base/applications/knowit/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Lorenzo Villani <arbiter@arbiterlab.net> -Build-Depends: debhelper (>= 9~), cdbs, quilt, cmake, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.4 Homepage: http://knowit.sourceforge.net/ diff --git a/debian/_base/applications/knutclient/debian/control b/debian/_base/applications/knutclient/debian/control index 3cc45153c..3c2328ad7 100644 --- a/debian/_base/applications/knutclient/debian/control +++ b/debian/_base/applications/knutclient/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Arnaud Quette <aquette@debian.org> Standards-Version: 3.8.4 -Build-Depends: debhelper (>= 9~), cdbs, cmake, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev Homepage: http://www.knut.noveradsl.cz/knutclient/ Package: knutclient-trinity diff --git a/debian/_base/applications/kompose/debian/control b/debian/_base/applications/kompose/debian/control index f7d5561d9..3e3b2b4c7 100644 --- a/debian/_base/applications/kompose/debian/control +++ b/debian/_base/applications/kompose/debian/control @@ -3,7 +3,7 @@ Section: admin Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Ana Beatriz Guerrero Lopez <ana@debian.org>, Sune Vuorela <debian@pusling.com> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, tdelibs14-trinity-dev, libimlib2-dev, libx11-dev, libxdamage-dev, libxcomposite-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, libimlib2-dev, libx11-dev, libxdamage-dev, libxcomposite-dev Standards-Version: 3.8.4 Package: kompose-trinity diff --git a/debian/_base/applications/konversation/debian/control b/debian/_base/applications/konversation/debian/control index 856756d92..5a3effa01 100644 --- a/debian/_base/applications/konversation/debian/control +++ b/debian/_base/applications/konversation/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org> Uploaders: Modestas Vainius <modestas@vainius.eu> -Build-Depends: debhelper (>= 9~), cdbs (>= 0.4.27-3), cmake, tdelibs14-trinity-dev, xsltproc, docbook-xsl, docbook-xml, libxi-dev, quilt (>= 0.40), automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, xsltproc, docbook-xsl, docbook-xml, libxi-dev Standards-Version: 3.8.4 DM-Upload-Allowed: yes Homepage: http://konversation.kde.org/ diff --git a/debian/_base/applications/kooldock/debian/control b/debian/_base/applications/kooldock/debian/control index c0140b881..d60507d8c 100644 --- a/debian/_base/applications/kooldock/debian/control +++ b/debian/_base/applications/kooldock/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, tdelibs-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs-trinity-dev Standards-Version: 3.8.0 Homepage: http://sourceforge.net/projects/kooldock/ diff --git a/debian/_base/applications/kpicosim/debian/control b/debian/_base/applications/kpicosim/debian/control index e76a5e080..7649bf086 100644 --- a/debian/_base/applications/kpicosim/debian/control +++ b/debian/_base/applications/kpicosim/debian/control @@ -2,7 +2,7 @@ Source: kpicosim-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: debhelper (>= 9~), cdbs, quilt, cmake, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.4 Package: kpicosim-trinity diff --git a/debian/_base/applications/kpilot/debian/control b/debian/_base/applications/kpilot/debian/control index 1a1b95e4f..78845dcca 100644 --- a/debian/_base/applications/kpilot/debian/control +++ b/debian/_base/applications/kpilot/debian/control @@ -2,7 +2,7 @@ Source: kpilot-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, tdepim-trinity-dev, libpisock-dev Standards-Version: 3.8.4 diff --git a/debian/_base/applications/kplayer/debian/control b/debian/_base/applications/kplayer/debian/control index a2a0b1e2e..37d7ccc8b 100644 --- a/debian/_base/applications/kplayer/debian/control +++ b/debian/_base/applications/kplayer/debian/control @@ -2,7 +2,7 @@ Source: kplayer-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, tdelibs-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs-trinity-dev Standards-Version: 3.8.4 Homepage: http://kplayer.sourceforge.net/ #Vcs-Git: git://anonscm.debian.org/collab-maint/kplayer-trinity.git diff --git a/debian/_base/applications/kpowersave/debian/control b/debian/_base/applications/kpowersave/debian/control index 6dab8d1bc..d9b2d10b0 100644 --- a/debian/_base/applications/kpowersave/debian/control +++ b/debian/_base/applications/kpowersave/debian/control @@ -3,8 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Michael Biebl <biebl@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, tdelibs14-trinity-dev, libxss-dev, libxtst-dev, libhal-dev (>= 0.5.6), libdbus-1-dev (>= 0.6), libdbus-tqt-1-dev, cmake, automake, autoconf, libtool, libltdl-dev -Build-Conflicts: autoconf2.13 +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, libxss-dev, libxtst-dev, libhal-dev (>= 0.5.6), libdbus-1-dev (>= 0.6), libdbus-tqt-1-dev Standards-Version: 3.8.4 Homepage: http://sourceforge.net/projects/powersave/ diff --git a/debian/_base/applications/krename/debian/control b/debian/_base/applications/krename/debian/control index 6e85b36a0..f7d7100b4 100644 --- a/debian/_base/applications/krename/debian/control +++ b/debian/_base/applications/krename/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> Uploaders: Richard A. Johnson <nixternal@ubuntu.com> -Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, tdelibs14-trinity-dev, patchutils, libx11-dev, libxext-dev, libxpm-dev, x-dev | x11proto-core-dev | libx11-dev, perl +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, libx11-dev, libxext-dev, libxpm-dev, x-dev | x11proto-core-dev | libx11-dev, perl Standards-Version: 3.8.4 Package: krename-trinity diff --git a/debian/_base/applications/kscope/debian/control b/debian/_base/applications/kscope/debian/control index 22760d2f9..0d5f15013 100644 --- a/debian/_base/applications/kscope/debian/control +++ b/debian/_base/applications/kscope/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org> Uploaders: Fathi Boudra <fabo@debian.org>, Mark Purcell <msp@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, bison, flex, tdebase-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, bison, flex, tdebase-trinity-dev Standards-Version: 3.8.0 Homepage: http://kscope.sourceforge.net Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/kde-extras/kscope/?op=log diff --git a/debian/_base/applications/ksensors/debian/control b/debian/_base/applications/ksensors/debian/control index f420734ae..c9632b830 100644 --- a/debian/_base/applications/ksensors/debian/control +++ b/debian/_base/applications/ksensors/debian/control @@ -2,7 +2,7 @@ Source: ksensors-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, libsensors4-dev, tdelibs14-trinity-dev, imagemagick +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, libsensors4-dev, tdelibs14-trinity-dev, imagemagick Build-Conflicts: autoconf2.13 Standards-Version: 3.8.3 diff --git a/debian/_base/applications/kshowmail/debian/control b/debian/_base/applications/kshowmail/debian/control index 018efd73d..1d50f3c7e 100644 --- a/debian/_base/applications/kshowmail/debian/control +++ b/debian/_base/applications/kshowmail/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: extra Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Lionel Le Folgoc <mrpouit@ubuntu.com> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, tdelibs14-trinity-dev, libmimelib1-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, libmimelib1-trinity-dev Standards-Version: 3.7.2 Package: kshowmail-trinity diff --git a/debian/_base/applications/kshutdown/debian/control b/debian/_base/applications/kshutdown/debian/control index bfa2a42cf..e0b5dc5b2 100644 --- a/debian/_base/applications/kshutdown/debian/control +++ b/debian/_base/applications/kshutdown/debian/control @@ -2,7 +2,7 @@ Source: kshutdown-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 9~), quilt, cmake, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.1 Package: kshutdown-trinity diff --git a/debian/_base/applications/ksplash-engine-moodin/debian/control b/debian/_base/applications/ksplash-engine-moodin/debian/control index 8e5b54e0b..fdf9345e3 100644 --- a/debian/_base/applications/ksplash-engine-moodin/debian/control +++ b/debian/_base/applications/ksplash-engine-moodin/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org> Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org> -Build-Depends: debhelper (>= 9~), cdbs, quilt, cmake, tdebase-trinity-dev, ksplash-trinity +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdebase-trinity-dev, ksplash-trinity Standards-Version: 3.8.4 Package: ksplash-engine-moodin-trinity diff --git a/debian/_base/applications/kstreamripper/debian/control b/debian/_base/applications/kstreamripper/debian/control index f4c5b03cf..9c39fdd49 100644 --- a/debian/_base/applications/kstreamripper/debian/control +++ b/debian/_base/applications/kstreamripper/debian/control @@ -2,7 +2,7 @@ Source: kstreamripper-trinity Section: sound Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: debhelper (>= 9~), cdbs, tdelibs14-trinity-dev, cmake, quilt +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.4 Package: kstreamripper-trinity diff --git a/debian/_base/applications/ksystemlog/debian/control b/debian/_base/applications/ksystemlog/debian/control index ffb560739..c8ac49242 100644 --- a/debian/_base/applications/ksystemlog/debian/control +++ b/debian/_base/applications/ksystemlog/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org> Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.4 Package: ksystemlog-trinity diff --git a/debian/_base/applications/ktechlab/debian/control b/debian/_base/applications/ktechlab/debian/control index 0f90cc6c6..be2a78d39 100644 --- a/debian/_base/applications/ktechlab/debian/control +++ b/debian/_base/applications/ktechlab/debian/control @@ -2,7 +2,7 @@ Source: ktechlab-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: debhelper (>= 9~), cdbs, quilt, cmake, imagemagick, tdelibs14-trinity-dev, gpsim-dev (>= 0.21.11-2) +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, imagemagick, tdelibs14-trinity-dev, gpsim-dev (>= 0.21.11-2) Standards-Version: 3.8.4 Package: ktechlab-trinity diff --git a/debian/_base/applications/kvkbd/debian/control b/debian/_base/applications/kvkbd/debian/control index 904ec2311..c7bc15c9d 100644 --- a/debian/_base/applications/kvkbd/debian/control +++ b/debian/_base/applications/kvkbd/debian/control @@ -2,7 +2,7 @@ Source: kvkbd-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, libxtst-dev, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, libxtst-dev, tdelibs14-trinity-dev Standards-Version: 3.8.4 Homepage: http://pan4os.info/main/index.php diff --git a/debian/_base/applications/kvpnc/debian/control b/debian/_base/applications/kvpnc/debian/control index fdb9307ca..4691d3023 100644 --- a/debian/_base/applications/kvpnc/debian/control +++ b/debian/_base/applications/kvpnc/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> Uploaders: Fathi Boudra <fabo@debian.org>, Mark Purcell <msp@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, tdelibs14-trinity-dev, libgcrypt-dev | libgcrypt20-dev | libgcrypt11-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, libgcrypt-dev | libgcrypt20-dev | libgcrypt11-dev Standards-Version: 3.8.4 Package: kvpnc-trinity diff --git a/debian/_base/applications/kxmleditor/debian/control b/debian/_base/applications/kxmleditor/debian/control index 7f3dba27b..677794e1f 100644 --- a/debian/_base/applications/kxmleditor/debian/control +++ b/debian/_base/applications/kxmleditor/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> X-Original-Maintainer: Jose Luis Tallon <jltallon@adv-solutions.net> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, tdelibs-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs-trinity-dev Standards-Version: 3.8.0 Package: kxmleditor-trinity diff --git a/debian/_base/applications/mathemagics/debian/control b/debian/_base/applications/mathemagics/debian/control index caf5c29ce..fc71842cd 100644 --- a/debian/_base/applications/mathemagics/debian/control +++ b/debian/_base/applications/mathemagics/debian/control @@ -2,7 +2,7 @@ Source: mathemagics-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.4 Package: mathemagics-trinity diff --git a/debian/_base/applications/mplayerthumbs/debian/control b/debian/_base/applications/mplayerthumbs/debian/control index 2bb5235a1..de67af535 100644 --- a/debian/_base/applications/mplayerthumbs/debian/control +++ b/debian/_base/applications/mplayerthumbs/debian/control @@ -2,7 +2,7 @@ Source: mplayerthumbs-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.2 Package: mplayerthumbs-trinity diff --git a/debian/_base/applications/potracegui/debian/control b/debian/_base/applications/potracegui/debian/control index 22fc28e81..ccfe5c65d 100644 --- a/debian/_base/applications/potracegui/debian/control +++ b/debian/_base/applications/potracegui/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Christoph Wegscheider <christoph.wegscheider@wegi.net> Uploaders: Bartosz Fenski <fenio@debian.org> -Build-Depends: debhelper (>= 9~), cdbs, quilt, cmake, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.4 Package: potracegui-trinity diff --git a/debian/_base/applications/rosegarden/debian/control b/debian/_base/applications/rosegarden/debian/control index 6ff45b976..88697c97f 100644 --- a/debian/_base/applications/rosegarden/debian/control +++ b/debian/_base/applications/rosegarden/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> 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 (>= 9~), quilt, cdbs, cmake, tdelibs14-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: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-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/_base/applications/smartcardauth/debian/control b/debian/_base/applications/smartcardauth/debian/control index cda1d7f49..ea8dfe54f 100644 --- a/debian/_base/applications/smartcardauth/debian/control +++ b/debian/_base/applications/smartcardauth/debian/control @@ -2,7 +2,7 @@ Source: smartcardauth Section: tde Priority: extra Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: debhelper (>= 9~), cdbs, quilt, cmake, pkg-config, libpkcs11-helper1-dev, libgnutls-dev | libgnutls28-dev | libgnutls30-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, pkg-config, libpkcs11-helper1-dev, libgnutls-dev | libgnutls28-dev | libgnutls30-dev Standards-Version: 3.8.4 Package: smartcardauth diff --git a/debian/_base/applications/tastymenu/debian/control b/debian/_base/applications/tastymenu/debian/control index 6970559d5..4f8994ed2 100644 --- a/debian/_base/applications/tastymenu/debian/control +++ b/debian/_base/applications/tastymenu/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> X-Original-Maintainer: Marco Martin <notmart@gmail.com> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, tdelibs-trinity-dev, libxau-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs-trinity-dev, libxau-dev Standards-Version: 3.8.0 Package: tastymenu-trinity diff --git a/debian/_base/applications/tde-style-baghira/debian/control b/debian/_base/applications/tde-style-baghira/debian/control index cc009d9c6..4650b8a47 100644 --- a/debian/_base/applications/tde-style-baghira/debian/control +++ b/debian/_base/applications/tde-style-baghira/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> X-Original-Maintainer: Jose Luis Tallon <jltallon@adv-solutions.net> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, tdebase-trinity-dev, libxtst-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdebase-trinity-dev, libxtst-dev Standards-Version: 3.8.0 Package: tde-style-baghira-trinity diff --git a/debian/_base/applications/tde-style-domino/debian/control b/debian/_base/applications/tde-style-domino/debian/control index bc2218167..b37d5bce2 100644 --- a/debian/_base/applications/tde-style-domino/debian/control +++ b/debian/_base/applications/tde-style-domino/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> X-Original-Maintainer: Jonathan Patrick Davies <jpatrick@kubuntu.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, tdebase-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdebase-trinity-dev Standards-Version: 3.7.3 Homepage: http://kde-look.org/content/show.php?content=42804 diff --git a/debian/_base/applications/tde-style-ia-ora/debian/control b/debian/_base/applications/tde-style-ia-ora/debian/control index bff9e29f7..30dc4c4be 100644 --- a/debian/_base/applications/tde-style-ia-ora/debian/control +++ b/debian/_base/applications/tde-style-ia-ora/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> X-Original-Maintainer: Jose Luis Tallon <jltallon@adv-solutions.net> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, tdebase-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdebase-trinity-dev Standards-Version: 3.8.0 Package: tde-style-ia-ora-trinity diff --git a/debian/_base/applications/tde-style-lipstik/debian/control b/debian/_base/applications/tde-style-lipstik/debian/control index c4952e524..86738adb0 100644 --- a/debian/_base/applications/tde-style-lipstik/debian/control +++ b/debian/_base/applications/tde-style-lipstik/debian/control @@ -2,7 +2,7 @@ Source: tde-style-lipstik-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: debhelper (>= 9~), cdbs, quilt, cmake, tdelibs14-trinity-dev (>= 4:3.2) +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.4 Package: tde-style-lipstik-trinity diff --git a/debian/_base/applications/tde-style-qtcurve/debian/control b/debian/_base/applications/tde-style-qtcurve/debian/control index 5fb4629ad..ce79c003a 100644 --- a/debian/_base/applications/tde-style-qtcurve/debian/control +++ b/debian/_base/applications/tde-style-qtcurve/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Bastian Venthur <venthur@debian.org> -Build-Depends: debhelper (>= 9~), quilt, tdelibs14-trinity-dev, cmake, cdbs +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.4 Package: tde-style-qtcurve-trinity diff --git a/debian/_base/applications/tde-systemsettings/debian/control b/debian/_base/applications/tde-systemsettings/debian/control index 40edd019f..c64b0da8c 100644 --- a/debian/_base/applications/tde-systemsettings/debian/control +++ b/debian/_base/applications/tde-systemsettings/debian/control @@ -2,7 +2,7 @@ Source: tde-systemsettings-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.4 Package: tde-systemsettings-trinity diff --git a/debian/_base/applications/tdedocker/debian/control b/debian/_base/applications/tdedocker/debian/control index cfd3dfa11..865e17dca 100644 --- a/debian/_base/applications/tdedocker/debian/control +++ b/debian/_base/applications/tdedocker/debian/control @@ -2,7 +2,7 @@ Source: tdedocker-trinity Section: x11 Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, tdelibs-trinity-dev, libxpm-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs-trinity-dev, libxpm-dev Standards-Version: 3.7.2 Package: tdedocker-trinity diff --git a/debian/_base/applications/tdeio-apt/debian/control b/debian/_base/applications/tdeio-apt/debian/control index 47d0012bf..fc19f0e5c 100644 --- a/debian/_base/applications/tdeio-apt/debian/control +++ b/debian/_base/applications/tdeio-apt/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Emmanuel Bouthenot <kolter@openics.org> -Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.4 Package: tdeio-apt-trinity diff --git a/debian/_base/applications/tdeio-ftps/debian/control b/debian/_base/applications/tdeio-ftps/debian/control index 59f7f2f09..fa28a992d 100644 --- a/debian/_base/applications/tdeio-ftps/debian/control +++ b/debian/_base/applications/tdeio-ftps/debian/control @@ -2,7 +2,7 @@ Source: tdeio-ftps-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: debhelper (>= 9~), cdbs, cmake, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.3 Package: tdeio-ftps-trinity diff --git a/debian/_base/applications/tdeio-gopher/debian/control b/debian/_base/applications/tdeio-gopher/debian/control index e96697c21..cde000270 100644 --- a/debian/_base/applications/tdeio-gopher/debian/control +++ b/debian/_base/applications/tdeio-gopher/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Albert Astals Cid <aacid@kde.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, tdelibs14-trinity-dev, cmake +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.4 Package: tdeio-gopher-trinity diff --git a/debian/_base/applications/tdeio-locate/debian/control b/debian/_base/applications/tdeio-locate/debian/control index 9950f4faa..a8ccec9df 100644 --- a/debian/_base/applications/tdeio-locate/debian/control +++ b/debian/_base/applications/tdeio-locate/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Tobi Vollebregt <tobivollebregt@gmail.com> -Build-Depends: cdbs, debhelper (>= 9~), quilt, tdelibs14-trinity-dev, bzip2, python-all, cmake +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, bzip2, python-all Standards-Version: 3.8.4 Package: tdeio-locate-trinity diff --git a/debian/_base/applications/tdeio-sword/debian/control b/debian/_base/applications/tdeio-sword/debian/control index 681a21074..830aee566 100644 --- a/debian/_base/applications/tdeio-sword/debian/control +++ b/debian/_base/applications/tdeio-sword/debian/control @@ -2,7 +2,7 @@ Source: tdeio-sword-trinity Section: tde Priority: extra Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, libsword-dev (>= 1.5.8-1), tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, libsword-dev (>= 1.5.8-1), tdelibs14-trinity-dev Standards-Version: 3.7.2 Package: tdeio-sword-trinity diff --git a/debian/_base/applications/tdeio-umountwrapper/debian/control b/debian/_base/applications/tdeio-umountwrapper/debian/control index 97f8bf159..82ba76b2f 100644 --- a/debian/_base/applications/tdeio-umountwrapper/debian/control +++ b/debian/_base/applications/tdeio-umountwrapper/debian/control @@ -2,7 +2,7 @@ Source: tdeio-umountwrapper-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.4 Package: tdeio-umountwrapper-trinity diff --git a/debian/_base/applications/tdenetworkmanager/debian/control b/debian/_base/applications/tdenetworkmanager/debian/control index 0817ea987..9b902017e 100644 --- a/debian/_base/applications/tdenetworkmanager/debian/control +++ b/debian/_base/applications/tdenetworkmanager/debian/control @@ -2,14 +2,11 @@ Source: tdenetworkmanager-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: cdbs, - debhelper (>= 9~), - pkg-config, +Build-Depends: cdbs, debhelper (>= 9~), quilt, + cmake, ninja-build, tdelibs14-trinity-dev, libiw-dev, - libnl-3-dev | libnl-dev (>= 1.1), - quilt, - libtool, libltdl-dev, cmake + libnl-3-dev | libnl-dev (>= 1.1) Standards-Version: 3.8.4 Homepage: http://www.trinitydesktop.org/ diff --git a/debian/_base/applications/tdepacman/debian/control b/debian/_base/applications/tdepacman/debian/control index e8c557664..ef38377b0 100644 --- a/debian/_base/applications/tdepacman/debian/control +++ b/debian/_base/applications/tdepacman/debian/control @@ -3,7 +3,7 @@ Section: games Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: J.rg Th.nnissen <joe@dsite.de> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, tdelibs14-trinity-dev, libtdegames-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, libtdegames-trinity-dev Standards-Version: 0.3.2 Package: tdepacman-trinity diff --git a/debian/_base/applications/tdepowersave/debian/control b/debian/_base/applications/tdepowersave/debian/control index f2f2a009f..05906055f 100644 --- a/debian/_base/applications/tdepowersave/debian/control +++ b/debian/_base/applications/tdepowersave/debian/control @@ -3,8 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Michael Biebl <biebl@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, tdelibs14-trinity-dev, libxss-dev, libxtst-dev, libdbus-1-dev (>= 0.6), libdbus-1-tqt-dev, cmake, automake, autoconf, libtool, libltdl-dev -Build-Conflicts: autoconf2.13 +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, libxss-dev, libxtst-dev, libdbus-1-dev (>= 0.6), libdbus-1-tqt-dev Standards-Version: 3.8.4 Homepage: http://sourceforge.net/projects/powersave/ diff --git a/debian/_base/applications/tdesudo/debian/control b/debian/_base/applications/tdesudo/debian/control index 8f03f70f8..bcc187291 100644 --- a/debian/_base/applications/tdesudo/debian/control +++ b/debian/_base/applications/tdesudo/debian/control @@ -2,7 +2,7 @@ Source: tdesudo-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.4 Package: tdesudo-trinity diff --git a/debian/_base/applications/tdesvn/debian/control b/debian/_base/applications/tdesvn/debian/control index bccbc06dd..4444e1d45 100644 --- a/debian/_base/applications/tdesvn/debian/control +++ b/debian/_base/applications/tdesvn/debian/control @@ -3,7 +3,7 @@ Section: devel Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> Uploaders: Michael Biebl <biebl@debian.org> -Build-Depends: cdbs (>= 0.4.50), debhelper (>= 9~), cmake (>= 2.4), tdelibs14-trinity-dev (>= 4:3.4.3-2), libsvn-dev (>= 1.2.0), libssl-dev (>= 0.9.8a), libsqlite3-dev, quilt, libaprutil1-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, libsvn-dev (>= 1.2.0), libssl-dev (>= 0.9.8a), libsqlite3-dev, libaprutil1-dev Standards-Version: 3.8.4 Package: libsvnqt4-trinity diff --git a/debian/_base/applications/tdmtheme/debian/control b/debian/_base/applications/tdmtheme/debian/control index 588435757..90200001e 100644 --- a/debian/_base/applications/tdmtheme/debian/control +++ b/debian/_base/applications/tdmtheme/debian/control @@ -5,7 +5,7 @@ Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org> Uploaders: Kel Modderman <kel@otaku42.de>, Fathi Boudra <fabo@debian.org>, Mark Purcell <msp@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.4 Homepage: http://beta.smileaf.org/projects diff --git a/debian/_base/applications/tellico/debian/control b/debian/_base/applications/tellico/debian/control index 2c77ec1d7..46c18beb9 100644 --- a/debian/_base/applications/tellico/debian/control +++ b/debian/_base/applications/tellico/debian/control @@ -3,11 +3,10 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Regis Boudin <regis@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), cmake, +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, tdemultimedia-trinity-dev, libtdepim1-trinity-dev, libxml2-dev, libxslt1-dev, libtag1-dev, libyaz-dev, - libpoppler-tqt-dev, libexempi-dev, libbtparse-dev, libv4l-dev, - automake, autoconf, libtool, libltdl-dev + libpoppler-tqt-dev, libexempi-dev, libbtparse-dev, libv4l-dev Standards-Version: 3.8.4 Homepage: http://periapsis.org/tellico/ diff --git a/debian/_base/applications/tork/debian/control b/debian/_base/applications/tork/debian/control index 08e642304..42906b954 100644 --- a/debian/_base/applications/tork/debian/control +++ b/debian/_base/applications/tork/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Homepage: http://tork.sourceforge.net/ Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, tdelibs-trinity-dev, pkg-config, torsocks, libgeoip-dev, libssl-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs-trinity-dev, torsocks, libgeoip-dev, libssl-dev Standards-Version: 3.9.1 Package: tork-trinity diff --git a/debian/_base/applications/wlassistant/debian/control b/debian/_base/applications/wlassistant/debian/control index 57707b21d..61a9de287 100644 --- a/debian/_base/applications/wlassistant/debian/control +++ b/debian/_base/applications/wlassistant/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> Uploaders: Achim Bohnet <ach@mpe.mpg.de>, Mark Purcell <msp@debian.org> -Build-Depends: debhelper (>= 9~), cdbs, quilt, cmake, tdelibs14-trinity-dev, net-tools, wireless-tools, libiw-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, net-tools, wireless-tools, libiw-dev Standards-Version: 3.8.4 Package: wlassistant-trinity diff --git a/debian/_base/applications/yakuake/debian/control b/debian/_base/applications/yakuake/debian/control index f43c84f5d..4a9d1df65 100644 --- a/debian/_base/applications/yakuake/debian/control +++ b/debian/_base/applications/yakuake/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Ana Beatriz Guerrero Lopez <ana@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, tdelibs14-trinity-dev, libltdl-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, libltdl-dev Standards-Version: 3.8.4 Homepage: http://extragear.kde.org/apps/yakuake/ diff --git a/debian/_base/core/tde-i18n/debian/control b/debian/_base/core/tde-i18n/debian/control index 066dcb7e0..a1523f04a 100644 --- a/debian/_base/core/tde-i18n/debian/control +++ b/debian/_base/core/tde-i18n/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org> -Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.4 Package: tde-i18n-af-trinity diff --git a/debian/_base/core/tde-i18n/debian/rules b/debian/_base/core/tde-i18n/debian/rules index 3ab71190d..962092a46 100755 --- a/debian/_base/core/tde-i18n/debian/rules +++ b/debian/_base/core/tde-i18n/debian/rules @@ -25,6 +25,13 @@ ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) endif DEB_MAKE_PARALLEL ?= $(and $(DEB_BUILD_PARALLEL),$(DEB_PARALLEL_JOBS),-j$(DEB_PARALLEL_JOBS)) +ifneq "$(wildcard /usr/bin/ninja)" "" +MAKE = ninja -v +DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR) +DEB_MAKE_INSTALL_TARGET = install +DEB_CMAKE_NORMAL_ARGS += -GNinja +endif + # The default gzip compressor has been changed in dpkg >= 1.17.0. deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ sed -e "s|.*version ||" -e "s| .*||" | \ @@ -60,7 +67,7 @@ $(STAMP_BUILD): [ -e $(cur_lang_dir)/CMakeLists.txt ] || \ ln -s ../template/commonCMakeLists.txt $(cur_lang_dir)/CMakeLists.txt cd $(cur_lang_dir)/build && \ - cmake .. $(DEB_CMAKE_EXTRA_FLAGS) && \ + cmake .. $(DEB_CMAKE_NORMAL_ARGS) $(DEB_CMAKE_EXTRA_FLAGS) && \ $(MAKE) $(DEB_MAKE_PARALLEL) touch $@ @@ -73,7 +80,7 @@ install:: $(I18N_INSTALL) $(I18N_INSTALL): build cd $(cur_lang_dir)/build && \ - $(MAKE) install DESTDIR=$(CURDIR)/debian/$(cur_pkg) $(DEB_MAKE_PARALLEL) + DESTDIR=$(CURDIR)/debian/$(cur_pkg) $(MAKE) install $(DEB_MAKE_PARALLEL) clean: $(I18N_CLEAN) debian-clean diff --git a/debian/_base/core/tdeaccessibility/debian/control b/debian/_base/core/tdeaccessibility/debian/control index e0fa1f2ed..d7ad52c5a 100644 --- a/debian/_base/core/tdeaccessibility/debian/control +++ b/debian/_base/core/tdeaccessibility/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com> -Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, tdelibs14-trinity-dev, tdemultimedia-trinity-dev, libakode-dev, libxtst-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, tdemultimedia-trinity-dev, libakode-dev, libxtst-dev Standards-Version: 3.8.4 Package: tdeaccessibility-trinity diff --git a/debian/_base/core/tdeaddons/debian/control b/debian/_base/core/tdeaddons/debian/control index 1dfa99c48..7947caebb 100644 --- a/debian/_base/core/tdeaddons/debian/control +++ b/debian/_base/core/tdeaddons/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org> -Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, gawk, tdelibs14-trinity-dev, atlantik-trinity-dev, tdebase-trinity-dev, tdemultimedia-trinity-dev, libtdegames-trinity-dev, libkonq4-trinity-dev, tdepim-trinity-dev, libsdl1.2-dev (>= 1.2.2-3.3), libssl-dev (>= 0.9.6), libdb4.8++-dev | libdb++-dev, libogg-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, atlantik-trinity-dev, tdebase-trinity-dev, tdemultimedia-trinity-dev, libtdegames-trinity-dev, libkonq4-trinity-dev, tdepim-trinity-dev, libsdl1.2-dev (>= 1.2.2-3.3), libssl-dev (>= 0.9.6), libdb4.8++-dev | libdb++-dev, libogg-dev Standards-Version: 3.8.4 Package: tdeaddons-trinity diff --git a/debian/_base/core/tdeadmin/debian/control b/debian/_base/core/tdeadmin/debian/control index 6f0541c01..0f610f91b 100644 --- a/debian/_base/core/tdeadmin/debian/control +++ b/debian/_base/core/tdeadmin/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Fathi Boudra <fboudra@free.fr>, Modestas Vainius <geromanas@mailas.com>, Sune Vuorela <debian@pusling.com> -Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, tdelibs14-trinity-dev, libpam0g-dev, docbook-to-man +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, libpam0g-dev, docbook-to-man Standards-Version: 3.8.4 Package: tdeadmin-trinity diff --git a/debian/_base/core/tdeartwork/debian/control b/debian/_base/core/tdeartwork/debian/control index 1a82801da..5550d2149 100644 --- a/debian/_base/core/tdeartwork/debian/control +++ b/debian/_base/core/tdeartwork/debian/control @@ -4,8 +4,8 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Sune Vuorela <debian@pusling.com> -Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, autotools-dev, tdelibs14-trinity-dev, gawk, sharutils, tdebase-trinity-dev, twin-trinity, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, xscreensaver, xscreensaver-gl, xscreensaver-data, xscreensaver-data-extra, xscreensaver-gl-extra, rss-glx, fireflies, automake, autoconf, libtool, libltdl-dev -Build-Conflicts: autoconf2.13, nvidia-glx +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, tdebase-trinity-dev, twin-trinity, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, xscreensaver, xscreensaver-gl, xscreensaver-data, xscreensaver-data-extra, xscreensaver-gl-extra, rss-glx, fireflies +Build-Conflicts: nvidia-glx Standards-Version: 3.8.4 Package: tdeartwork-trinity diff --git a/debian/_base/core/tdebase/debian/control b/debian/_base/core/tdebase/debian/control index e49b3b8b7..b8f3a1a08 100644 --- a/debian/_base/core/tdebase/debian/control +++ b/debian/_base/core/tdebase/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Fathi Boudra <fboudra@free.fr>, Modestas Vainius <geromanas@mailas.com>, Sune Vuorela <debian@pusling.com> -Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, gawk, tdelibs14-trinity-dev, libldap2-dev, libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, xscreensaver, xscreensaver-data, xscreensaver-data-extra, libxss-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xkb-data, xutils, sharutils, texinfo, htdig, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, libogg-dev, libavahi-tqt-dev, udev, libudev-dev, libdbus-1-dev, libconfig-dev, libart-2.0-dev (>= 4:14.0.0~), libssl-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, libldap2-dev, libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, xscreensaver, xscreensaver-data, xscreensaver-data-extra, libxss-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xkb-data, xutils, texinfo, htdig, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, libogg-dev, libavahi-tqt-dev, udev, libudev-dev, libdbus-1-dev, libconfig-dev, libart-2.0-dev (>= 4:14.0.0~), libssl-dev Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11, tdelibs14-trinity-doc Build-Conflicts: nvidia-glx (<< 1.0.8774-6) Standards-Version: 3.8.4 diff --git a/debian/_base/core/tdeedu/debian/control b/debian/_base/core/tdeedu/debian/control index e48cbeb85..fcd218c9d 100644 --- a/debian/_base/core/tdeedu/debian/control +++ b/debian/_base/core/tdeedu/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Daniel Schepler <schepler@debian.org>, Sune Vuorela <debian@pusling.com> -Build-Depends: debhelper (>= 9~), cdbs (>= 0.4.39-0.1), quilt, cmake, tdelibs14-trinity-dev, libnum-ocaml-dev | ocaml-nox (<< 4.08), libfacile-ocaml-dev, libboost-python-dev (>= 1.33.1), libusb-dev, doxygen, graphviz, texlive-latex-base, texlive-latex-extra, ghostscript +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, libnum-ocaml-dev | ocaml-nox (<< 4.08), libfacile-ocaml-dev, libboost-python-dev (>= 1.33.1), libusb-dev, doxygen, graphviz, texlive-latex-base, texlive-latex-extra, ghostscript Standards-Version: 3.8.4 Package: tdeedu-trinity diff --git a/debian/_base/core/tdegames/debian/control b/debian/_base/core/tdegames/debian/control index c52fa9be5..3b32a27f3 100644 --- a/debian/_base/core/tdegames/debian/control +++ b/debian/_base/core/tdegames/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Daniel Schepler <schepler@debian.org>, Sune Vuorela <debian@pusling.com> -Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, gawk, tdelibs14-trinity-dev, tdemultimedia-trinity-dev, groff-base, sharutils, bzip2, sharutils, libogg-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, tdemultimedia-trinity-dev, groff-base, bzip2, libogg-dev Build-Depends-Indep: doxygen, graphviz, gsfonts-x11, libtqtinterface-doc, tdelibs14-trinity-doc Standards-Version: 3.8.4 diff --git a/debian/_base/core/tdegraphics/debian/control b/debian/_base/core/tdegraphics/debian/control index 33815d953..d9405452a 100644 --- a/debian/_base/core/tdegraphics/debian/control +++ b/debian/_base/core/tdegraphics/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Francesco Pedrini <francesco.pedrini@gmail.com>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com> -Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, tdelibs14-trinity-dev, imlib11-dev, libexif-dev (>= 0.6.9-1), libfribidi-dev, freeglut3-dev, libgphoto2-dev | libgphoto2-6-dev | libgphoto2-2-dev, libopenexr-dev (>= 1.2.1), libpaper-dev, libpoppler-private-dev | libpoppler-dev (<< 0.18.4-3), libpoppler-dev, libsane-dev (>> 1.0.15), libtiff-dev, libtiff-tools, liblcms2-dev | liblcms1-dev, libusb-dev, libxxf86vm-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, imlib11-dev, libexif-dev (>= 0.6.9-1), libfribidi-dev, freeglut3-dev, libgphoto2-dev | libgphoto2-6-dev | libgphoto2-2-dev, libopenexr-dev (>= 1.2.1), libpaper-dev, libpoppler-private-dev | libpoppler-dev (<< 0.18.4-3), libpoppler-dev, libsane-dev (>> 1.0.15), libtiff-dev, libtiff-tools, liblcms2-dev | liblcms1-dev, libusb-dev, libxxf86vm-dev Standards-Version: 3.8.4 Package: tdegraphics-trinity diff --git a/debian/_base/core/tdelibs/debian/control b/debian/_base/core/tdelibs/debian/control index c72579075..65d5c3131 100644 --- a/debian/_base/core/tdelibs/debian/control +++ b/debian/_base/core/tdelibs/debian/control @@ -4,8 +4,8 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Adeodato Sim <dato@net.com.org.es>, Ana Beatriz Guerrero Lopez <ana@debian.org>, Daniel Schepler <schepler@debian.org>, Fathi Boudra <fboudra@free.fr>, Sune Vuorela <debian@pusling.com> -Build-Depends: cdbs (>= 0.4.41ubuntu2), debhelper (>= 9~), quilt, cmake, autotools-dev, - binutils (>= 2.14.90.0.7), binutils-dev, docbook-to-man, gawk, +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, + binutils (>= 2.14.90.0.7), binutils-dev, docbook-to-man, libart-2.0-dev (>= 4:14.0.0~), libarts1-trinity-dev (>= 1.5.0), libacl1-dev, libattr1-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], aspell, libaspell-dev, hspell, libbz2-dev, liblzma-dev, libcupsys2-dev | libcups2-dev, @@ -14,7 +14,7 @@ Build-Depends: cdbs (>= 0.4.41ubuntu2), debhelper (>= 9~), quilt, cmake, autotoo libsasl2-dev, libxcomposite-dev, libdbus-1-tqt-dev, libtiff-dev, libavahi-client-dev (>= 0.4), x11-xserver-utils, libxml2-dev, libxml2-utils, libxslt1-dev, libavahi-tqt-dev, - sharutils, texinfo, libogg-dev, libtqtinterface-dev, + texinfo, libogg-dev, libtqtinterface-dev, lsb-release, base-files, sudo, libr-dev, libudev-dev, libltdl-dev, libmagic-dev, libpcsclite-dev, opensc-pkcs11 | opensc (<< 0.13.0-5), libpkcs11-helper1-dev, libcryptsetup-dev diff --git a/debian/_base/core/tdemultimedia/debian/control b/debian/_base/core/tdemultimedia/debian/control index 35409df9c..255eb1f53 100644 --- a/debian/_base/core/tdemultimedia/debian/control +++ b/debian/_base/core/tdemultimedia/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Fathi Boudra <fboudra@free.fr>, Sune Vuorela <debian@pusling.com> -Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, tdelibs14-trinity-dev, cdparanoia, libcdparanoia0-dev, libflac-dev (>= 1.1.4-1), libgstreamer-plugins-base1.0-dev | libgstreamer-plugins-base0.10-dev, libsamplerate0-dev, libspeex-dev (>> 1.1.5), libtag1-dev (>> 1.3.1), libtheora-dev, libxine2-dev | libxine-dev, libxxf86dga-dev, libxv-dev, libxxf86vm-dev, libakode-dev, libogg-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, cdparanoia, libcdparanoia0-dev, libflac-dev (>= 1.1.4-1), libgstreamer-plugins-base1.0-dev | libgstreamer-plugins-base0.10-dev, libsamplerate0-dev, libspeex-dev (>> 1.1.5), libtag1-dev (>> 1.3.1), libtheora-dev, libxine2-dev | libxine-dev, libxxf86dga-dev, libxv-dev, libxxf86vm-dev, libakode-dev, libogg-dev Standards-Version: 3.8.4 Package: tdemultimedia-trinity diff --git a/debian/_base/core/tdenetwork/debian/control b/debian/_base/core/tdenetwork/debian/control index d7fccd60f..576cc7d6c 100644 --- a/debian/_base/core/tdenetwork/debian/control +++ b/debian/_base/core/tdenetwork/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Modestas Vainius <geromanas@mailas.com>, Sarah Hobbs <hobbsee@ubuntu.com>, Sune Vuorela <debian@pusling.com> -Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, docbook-to-man, doxygen, gawk, tdelibs14-trinity-dev, libgnutls-dev | libgadu-dev (>> 1:1.12.0-3), libgcrypt-dev, libgadu-dev, libiw-dev (>> 27+28pre8), libmeanwhile-dev (>= 1.0.2), libslp-dev, libspeex-dev, libsqlite3-dev, libxml2-dev, libxslt1-dev, libxtst-dev, libtqtinterface-doc, sharutils, valgrind [!armel !mips !mipsel !riscv64], libxxf86vm-dev, libv4l-dev, libssl-dev, libtqca-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, docbook-to-man, doxygen, tdelibs14-trinity-dev, libgnutls-dev | libgadu-dev (>> 1:1.12.0-3), libgcrypt-dev, libgadu-dev, libiw-dev (>> 27+28pre8), libmeanwhile-dev (>= 1.0.2), libslp-dev, libspeex-dev, libsqlite3-dev, libxml2-dev, libxslt1-dev, libxtst-dev, libtqtinterface-doc, valgrind [!armel !mips !mipsel !riscv64], libxxf86vm-dev, libv4l-dev, libssl-dev, libtqca-dev Standards-Version: 3.8.4 Package: tdenetwork-trinity diff --git a/debian/_base/core/tdenetwork/debian/patches/series b/debian/_base/core/tdenetwork/debian/patches/series index 8b1378917..e69de29bb 100644 --- a/debian/_base/core/tdenetwork/debian/patches/series +++ b/debian/_base/core/tdenetwork/debian/patches/series @@ -1 +0,0 @@ - diff --git a/debian/_base/core/tdepim/debian/control b/debian/_base/core/tdepim/debian/control index 8ae922a3f..04985ff6a 100644 --- a/debian/_base/core/tdepim/debian/control +++ b/debian/_base/core/tdepim/debian/control @@ -4,12 +4,12 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com> -Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, - gawk, tdelibs14-trinity-dev, bison, byacc, bzip2, +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, + tdelibs14-trinity-dev, bison, byacc, bzip2, flex, groff-base, libogg-dev, libboost-dev (>= 1.33.1), libgpgme11-dev | libgpgme-dev (>= 1.0~), libreadline-dev | libreadline6-dev | libreadline5-dev, libsasl2-dev, libssl-dev, - libxpm-dev, libxss-dev, sharutils, texinfo, dpkg-dev (>= 1.14.4), + libxpm-dev, libxss-dev, texinfo, dpkg-dev (>= 1.14.4), libgpg-error-dev (>= 1.4-2), gpgsm, libical-dev, libcaldav-dev (>= 0.6.5), libcarddav-dev (>= 0.6.2), libcurl4-gnutls-dev Build-Depends-Indep: doxygen, graphviz, gsfonts-x11, libtqtinterface-doc, tdelibs14-trinity-doc diff --git a/debian/_base/core/tdesdk/debian/control b/debian/_base/core/tdesdk/debian/control index 5db03b27d..4ba626370 100644 --- a/debian/_base/core/tdesdk/debian/control +++ b/debian/_base/core/tdesdk/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Fathi Boudra <fboudra@free.fr>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com> -Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, gawk, +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, pkg-config, tdelibs14-trinity-dev, binutils-dev, bison, flex, libfl-dev | flex (<< 2.5.39), tdepim-trinity-dev, libapr1-dev, libtdepim1-trinity-dev, libktnef1-trinity-dev, libsvn-dev, libdb-dev, diff --git a/debian/_base/core/tdetoys/debian/control b/debian/_base/core/tdetoys/debian/control index d77ac52aa..873973bb6 100644 --- a/debian/_base/core/tdetoys/debian/control +++ b/debian/_base/core/tdetoys/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Modestas Vainius <geromanas@mailas.com> -Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.4 Package: tdetoys-trinity diff --git a/debian/_base/core/tdeutils/debian/control b/debian/_base/core/tdeutils/debian/control index df07a3bec..855618432 100644 --- a/debian/_base/core/tdeutils/debian/control +++ b/debian/_base/core/tdeutils/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Fathi Boudra <fboudra@free.fr>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com> -Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, tdelibs14-trinity-dev, tdebase-trinity-dev, libkonq4-trinity-dev, libgmp3-dev, libsnmp-dev, libxpm-dev, python-all-dev, libxtst-dev, xutils +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, tdebase-trinity-dev, libkonq4-trinity-dev, libgmp3-dev, libsnmp-dev, libxpm-dev, python-all-dev, libxtst-dev, xutils Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11, tdelibs14-trinity-doc Standards-Version: 3.8.4 diff --git a/debian/_base/core/tdevelop/debian/control b/debian/_base/core/tdevelop/debian/control index 3cedd8dc2..960cc83d6 100644 --- a/debian/_base/core/tdevelop/debian/control +++ b/debian/_base/core/tdevelop/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Jeremy Lain <jeremy.laine@m4x.org> -Build-Depends: cdbs (>= 0.4.38), debhelper (>= 9~), quilt, cmake, tdelibs14-trinity-dev, tdelibs14-trinity-doc, libtqtinterface-doc, flex, python-all, libcvsservice-trinity-dev, groff-base, libsvn-dev, libaprutil1-dev, libdb-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, tdelibs14-trinity-doc, libtqtinterface-doc, flex, python-all, libcvsservice-trinity-dev, groff-base, libsvn-dev, libaprutil1-dev, libdb-dev Standards-Version: 3.8.4 Package: tdevelop-trinity diff --git a/debian/_base/core/tdewebdev/debian/control b/debian/_base/core/tdewebdev/debian/control index fbd686f51..3499f9075 100644 --- a/debian/_base/core/tdewebdev/debian/control +++ b/debian/_base/core/tdewebdev/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Adeodato Sim <dato@net.com.org.es>, Ana Beatriz Guerrero Lopez <ana@debian.org>, Armin Berres <trigger+debian@space-based.de>, Sune Vuorela <debian@pusling.com> -Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, tdelibs14-trinity-dev, tqt3-doc, libreadline-dev | libreadline6-dev | libreadline5-dev, libxml2-dev, libxslt1-dev, libicu-dev, libcvsservice-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, tqt3-doc, libreadline-dev | libreadline6-dev | libreadline5-dev, libxml2-dev, libxslt1-dev, libicu-dev, libcvsservice-trinity-dev Standards-Version: 3.8.4 Homepage: http://trinity.pearsoncomputing.net diff --git a/debian/_base/core/tdewebdev/debian/patches/common/README b/debian/_base/core/tdewebdev/debian/patches/common/README deleted file mode 100644 index 9e81cc359..000000000 --- a/debian/_base/core/tdewebdev/debian/patches/common/README +++ /dev/null @@ -1,14 +0,0 @@ -Common patches across TDE Debian packages -========================================= - - These directory should contain patches to the admin/ subdir of TDE - modules that are meant to be applied to all packaged modules. As the - admin/ subdir is shared across modules (and so, it's identical for all - modules at a certain version), I think it makes sense to have these - patches in a central location, and update them here. - - The script update.sh takes care of automatically updating the patches - that update autotools and libtool. You need to pass the location of an - admin/ directory as the first argument. - - -- Adeodato Simó, 2005-02-26 diff --git a/debian/_base/core/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff b/debian/_base/core/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff deleted file mode 100644 index 28c95742b..000000000 --- a/debian/_base/core/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff +++ /dev/null @@ -1,26 +0,0 @@ ---- kde/admin/cvs.sh 2005-11-26 02:42:02.000000000 +0000 -+++ kde/admin/cvs.sh 2005-11-26 02:42:26.000000000 +0000 -@@ -537,6 +537,8 @@ - if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi - export EXTRACTRC PREPARETIPS - -+kdepotpath=/usr/include/tde/tde.pot -+ - for subdir in $dirs; do - test -z "$VERBOSE" || echo "Making messages in $subdir" - (cd $subdir -@@ -554,10 +556,10 @@ - fi - perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile - -- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot -- if ! test -f $kdepotpath; then -- kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot -- fi -+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot -+# if ! test -f $kdepotpath; then -+# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot -+# fi - - $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ - XGETTEXT="${XGETTEXT:-xgettext} --foreign-user -C -ci18n -ki18n -ktr2i18n -kI18N_NOOP -kI18N_NOOP2 -kaliasLocale -x $kdepotpath" messages diff --git a/debian/_base/core/tdewebdev/debian/patches/series b/debian/_base/core/tdewebdev/debian/patches/series index 8f8f0bd6b..e69de29bb 100644 --- a/debian/_base/core/tdewebdev/debian/patches/series +++ b/debian/_base/core/tdewebdev/debian/patches/series @@ -1 +0,0 @@ -common/kubuntu_01_kdepot.diff diff --git a/debian/_base/dependencies/akode/debian/control b/debian/_base/dependencies/akode/debian/control index c27d6439d..f183c3510 100644 --- a/debian/_base/dependencies/akode/debian/control +++ b/debian/_base/dependencies/akode/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Isaac Clerencia <isaac@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Adeodato Simó <dato@net.com.org.es> -Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, gawk, libflac-dev (>= 1.1.1-3), libflac-dev, libmad0-dev, libogg-dev, libvorbis-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsamplerate0-dev, libspeex-dev, libpulse-dev, libjack-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, libflac-dev (>= 1.1.1-3), libflac-dev, libmad0-dev, libogg-dev, libvorbis-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsamplerate0-dev, libspeex-dev, libpulse-dev, libjack-dev Standards-Version: 3.7.3 Package: libakode2 diff --git a/debian/_base/dependencies/akode/debian/patches/series b/debian/_base/dependencies/akode/debian/patches/series index 8b1378917..e69de29bb 100644 --- a/debian/_base/dependencies/akode/debian/patches/series +++ b/debian/_base/dependencies/akode/debian/patches/series @@ -1 +0,0 @@ - diff --git a/debian/_base/dependencies/arts/debian/control b/debian/_base/dependencies/arts/debian/control index 6c5ca4af5..bb9f63ca4 100644 --- a/debian/_base/dependencies/arts/debian/control +++ b/debian/_base/dependencies/arts/debian/control @@ -4,12 +4,12 @@ Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Qt/TDE Maintainers <debian-qt-tde@lists.debian.org> Priority: optional Uploaders: Adeodato Sim <dato@net.com.org.es>, Ana Beatriz Guerrero Lopez <ana@debian.org>, Fathi Boudra <fabo@debian.org>, Modestas Vainius <modestas@vainius.eu> -Build-Depends: cdbs (>= 0.4.48), debhelper (>= 9~), quilt, - docbook-to-man, gawk, sharutils, texinfo, +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, + docbook-to-man, texinfo, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libaudio-dev, libaudiofile-dev, libglib2.0-dev, libmad0-dev, libogg-dev, libtqtinterface-dev, - libvorbis-dev, cmake, libltdl-dev + libvorbis-dev, libltdl-dev Build-Conflicts: libmas-dev Standards-Version: 3.8.4 diff --git a/debian/_base/dependencies/avahi-tqt/debian/cdbs/debian-tde.mk b/debian/_base/dependencies/avahi-tqt/debian/cdbs/debian-tde.mk new file mode 100644 index 000000000..f36e3527c --- /dev/null +++ b/debian/_base/dependencies/avahi-tqt/debian/cdbs/debian-tde.mk @@ -0,0 +1,246 @@ +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2003 Christopher L Cheney <ccheney@debian.org> +# Copyright © 2019 TDE Team +# Description: A class for TDE packages; sets TDE environment variables, etc +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2, or (at +# your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +# 02111-1307 USA. + +ifndef _cdbs_bootstrap +_cdbs_scripts_path ?= /usr/lib/cdbs +_cdbs_rules_path ?= /usr/share/cdbs/1/rules +_cdbs_class_path ?= /usr/share/cdbs/1/class +endif + +ifndef _cdbs_class_debian-qt-kde +_cdbs_class_debian-qt-kde := 1 + +# for dh_icons +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4) + +# Note: This _must_ be included before autotools.mk, or it won't work. +common-configure-arch common-configure-indep:: debian/stamp-cvs-make +debian/stamp-cvs-make: +ifndef _cdbs_class_cmake + cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in +ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" "" + cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh +endif +ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" "" + cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh +endif + $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; +endif + touch debian/stamp-cvs-make + +include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix) + +ifdef _cdbs_tarball_dir +DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE) +else +DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) +endif + +ifndef _cdbs_class_cmake +include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) +endif + +ifdef _cdbs_class_cmake +ifneq "$(wildcard /usr/bin/ninja)" "" +MAKE = ninja -v +DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR) +DEB_MAKE_INSTALL_TARGET = install +DEB_CMAKE_NORMAL_ARGS += -GNinja +endif +endif + +ifndef _cdbs_rules_patchsys_quilt +DEB_PATCHDIRS := debian/patches/common debian/patches +endif + +export kde_cgidir = \$${libdir}/cgi-bin +export kde_confdir = \$${sysconfdir}/trinity +export kde_htmldir = \$${datadir}/doc/tde/HTML + +DEB_KDE_ENABLE_FINAL := yes +DEB_INSTALL_DOCS_ALL := + +DEB_DH_MAKESHLIBS_ARGS_ALL := -V +DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib) + +DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" +DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el + +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + +ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb + ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) + cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,) + else + cdbs_kde_enable_final = + endif +endif + +ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_final = + cdbs_kde_enable_debug = --enable-debug=yes +else + cdbs_kde_enable_debug = --disable-debug +endif + +ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_debug = --enable-debug=full +endif + +DEB_BUILD_PARALLEL ?= true + +cdbs_configure_flags += \ + --with-qt-dir=/usr/share/qt3 \ + --disable-rpath \ + --with-xinerama \ + $(cdbs_kde_enable_final) \ + $(cdbs_kde_enable_debug) + + +# This is a convenience target for calling manually. +# It's not part of the build process. +buildprep: clean apply-patches +ifndef _cdbs_class_cmake + $(MAKE) -f admin/Makefile.common dist +endif + debian/rules clean + +.tdepkginfo: + echo "# TDE package information" >.tdepkginfo + dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo + dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo + date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo + +post-patches:: .tdepkginfo + +common-build-arch:: debian/stamp-man-pages +debian/stamp-man-pages: + if ! test -d debian/man/out; then mkdir -p debian/man/out; fi + for f in $$(find debian/man -name '*.sgml'); do \ + docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \ + done + for f in $$(find debian/man -name '*.man'); do \ + soelim -I debian/man $$f \ + > debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \ + done + touch debian/stamp-man-pages + +common-binary-indep:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_INDEP_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + +common-binary-arch:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_ARCH_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + # update multi-arch path in install files + ls -d debian/* | \ + grep -E "(install|links)$$" | \ + while read a; do \ + [ -d $$a ] || [ -f $$a.arch ] || \ + ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \ + sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \ + done + +clean:: + rm -rf debian/man/out + -rmdir debian/man + rm -f debian/stamp-man-pages + rm -rf debian/shlibs-check + # revert multi-arch path in install files + ls -d debian/* | \ + grep -E "(install|links)$$" | \ + while read a; do \ + [ ! -f $$a.arch ] || \ + mv $$a.arch $$a; \ + done + +$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: + if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi + if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi + if test -e debian/$(cdbs_curpkg).lintian; then \ + install -p -D -m644 debian/$(cdbs_curpkg).lintian \ + debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \ + fi + if test -e debian/$(cdbs_curpkg).presubj; then \ + install -p -D -m644 debian/$(cdbs_curpkg).presubj \ + debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ + fi + +binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: + set -e; \ + for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \ + pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \ + echo Building $$pkg HTML docs...; \ + mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + /opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \ + done + for pkg in $(DOC_HTML_PRUNE) ; do \ + rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + done + +common-build-indep:: debian/stamp-kde-apidox +debian/stamp-kde-apidox: + $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) + touch $@ + +common-install-indep:: common-install-kde-apidox +common-install-kde-apidox:: + $(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox) + +cleanbuilddir:: + -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR)) + +clean:: +ifndef _cdbs_class_cmake + if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \ + cd $(DEB_SRCDIR); \ + find . -name Makefile.in -print | \ + xargs --no-run-if-empty rm -f; \ + rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \ + configure configure.files configure.in stamp-h.in \ + subdirs; \ + fi +endif + rm -f .tdepkginfo + rm -f debian/stamp-kde-apidox + rm -f debian/stamp-cvs-make + +endif diff --git a/debian/_base/dependencies/avahi-tqt/debian/cdbs/versions.pl b/debian/_base/dependencies/avahi-tqt/debian/cdbs/versions.pl new file mode 100644 index 000000000..1b110f7af --- /dev/null +++ b/debian/_base/dependencies/avahi-tqt/debian/cdbs/versions.pl @@ -0,0 +1,19 @@ +#!/usr/bin/env perl + +use strict; +use warnings; + +my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`; +my ($version3, $version3_next); +my ($version2, $version2_next); + +($version3 = $version) =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/; +($version2 = $version3) =~ s/\.[^.]+$//; + +($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e; +($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e; + +print "TDE-Version3=$version3\n"; +print "TDE-Version2=$version2\n"; +print "TDE-Next-Version3=$version3_next\n"; +print "TDE-Next-Version2=$version2_next\n"; diff --git a/debian/_base/dependencies/avahi-tqt/debian/control b/debian/_base/dependencies/avahi-tqt/debian/control index b3b68b176..cb06b6e20 100644 --- a/debian/_base/dependencies/avahi-tqt/debian/control +++ b/debian/_base/dependencies/avahi-tqt/debian/control @@ -3,10 +3,9 @@ Section: net Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> -Build-Depends: debhelper (>= 9~), - cmake, +Build-Depends: cdbs, debhelper (>= 9~), quilt, + cmake, ninja-build, gcc, - cdbs, pkg-config, libtqtinterface-dev, libavahi-common-dev, diff --git a/debian/_base/dependencies/avahi-tqt/debian/patches/.gitignore b/debian/_base/dependencies/avahi-tqt/debian/patches/series index e69de29bb..e69de29bb 100644 --- a/debian/_base/dependencies/avahi-tqt/debian/patches/.gitignore +++ b/debian/_base/dependencies/avahi-tqt/debian/patches/series diff --git a/debian/_base/dependencies/avahi-tqt/debian/rules b/debian/_base/dependencies/avahi-tqt/debian/rules index 42b7e8ec6..dc8f0248c 100755 --- a/debian/_base/dependencies/avahi-tqt/debian/rules +++ b/debian/_base/dependencies/avahi-tqt/debian/rules @@ -2,21 +2,12 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk +include debian/cdbs/debian-tde.mk # Ensure at build time that the library has no dependencies on undefined # symbols, and speed up loading. export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,-z,defs -Wl,-O1 -# The default gzip compressor has been changed in dpkg >= 1.17.0. -deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ - sed -e "s|.*version ||" -e "s| .*||" | \ - xargs -r dpkg --compare-versions 1.17.0 lt \ - && echo xz || echo gzip) -ifeq ($(deb_default_compress),gzip) -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) -endif - # Build options DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ diff --git a/debian/_base/dependencies/dbus-1-tqt/debian/control b/debian/_base/dependencies/dbus-1-tqt/debian/control index 01c10d2ba..8bbc68466 100644 --- a/debian/_base/dependencies/dbus-1-tqt/debian/control +++ b/debian/_base/dependencies/dbus-1-tqt/debian/control @@ -2,7 +2,7 @@ Source: dbus-1-tqt Section: devel Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: cdbs (>= 0.4.43), debhelper (>= 9~), quilt, libtqtinterface-dev, libdbus-1-dev (>= 0.90), cmake +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, libtqtinterface-dev, libdbus-1-dev (>= 0.90) Build-Depends-Indep: doxygen, graphviz Standards-Version: 3.8.3 diff --git a/debian/_base/dependencies/dbus-tqt/debian/cdbs/debian-tde.mk b/debian/_base/dependencies/dbus-tqt/debian/cdbs/debian-tde.mk new file mode 100644 index 000000000..f36e3527c --- /dev/null +++ b/debian/_base/dependencies/dbus-tqt/debian/cdbs/debian-tde.mk @@ -0,0 +1,246 @@ +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2003 Christopher L Cheney <ccheney@debian.org> +# Copyright © 2019 TDE Team +# Description: A class for TDE packages; sets TDE environment variables, etc +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2, or (at +# your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +# 02111-1307 USA. + +ifndef _cdbs_bootstrap +_cdbs_scripts_path ?= /usr/lib/cdbs +_cdbs_rules_path ?= /usr/share/cdbs/1/rules +_cdbs_class_path ?= /usr/share/cdbs/1/class +endif + +ifndef _cdbs_class_debian-qt-kde +_cdbs_class_debian-qt-kde := 1 + +# for dh_icons +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4) + +# Note: This _must_ be included before autotools.mk, or it won't work. +common-configure-arch common-configure-indep:: debian/stamp-cvs-make +debian/stamp-cvs-make: +ifndef _cdbs_class_cmake + cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in +ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" "" + cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh +endif +ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" "" + cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh +endif + $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; +endif + touch debian/stamp-cvs-make + +include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix) + +ifdef _cdbs_tarball_dir +DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE) +else +DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) +endif + +ifndef _cdbs_class_cmake +include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) +endif + +ifdef _cdbs_class_cmake +ifneq "$(wildcard /usr/bin/ninja)" "" +MAKE = ninja -v +DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR) +DEB_MAKE_INSTALL_TARGET = install +DEB_CMAKE_NORMAL_ARGS += -GNinja +endif +endif + +ifndef _cdbs_rules_patchsys_quilt +DEB_PATCHDIRS := debian/patches/common debian/patches +endif + +export kde_cgidir = \$${libdir}/cgi-bin +export kde_confdir = \$${sysconfdir}/trinity +export kde_htmldir = \$${datadir}/doc/tde/HTML + +DEB_KDE_ENABLE_FINAL := yes +DEB_INSTALL_DOCS_ALL := + +DEB_DH_MAKESHLIBS_ARGS_ALL := -V +DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib) + +DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" +DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el + +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + +ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb + ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) + cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,) + else + cdbs_kde_enable_final = + endif +endif + +ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_final = + cdbs_kde_enable_debug = --enable-debug=yes +else + cdbs_kde_enable_debug = --disable-debug +endif + +ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_debug = --enable-debug=full +endif + +DEB_BUILD_PARALLEL ?= true + +cdbs_configure_flags += \ + --with-qt-dir=/usr/share/qt3 \ + --disable-rpath \ + --with-xinerama \ + $(cdbs_kde_enable_final) \ + $(cdbs_kde_enable_debug) + + +# This is a convenience target for calling manually. +# It's not part of the build process. +buildprep: clean apply-patches +ifndef _cdbs_class_cmake + $(MAKE) -f admin/Makefile.common dist +endif + debian/rules clean + +.tdepkginfo: + echo "# TDE package information" >.tdepkginfo + dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo + dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo + date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo + +post-patches:: .tdepkginfo + +common-build-arch:: debian/stamp-man-pages +debian/stamp-man-pages: + if ! test -d debian/man/out; then mkdir -p debian/man/out; fi + for f in $$(find debian/man -name '*.sgml'); do \ + docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \ + done + for f in $$(find debian/man -name '*.man'); do \ + soelim -I debian/man $$f \ + > debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \ + done + touch debian/stamp-man-pages + +common-binary-indep:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_INDEP_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + +common-binary-arch:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_ARCH_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + # update multi-arch path in install files + ls -d debian/* | \ + grep -E "(install|links)$$" | \ + while read a; do \ + [ -d $$a ] || [ -f $$a.arch ] || \ + ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \ + sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \ + done + +clean:: + rm -rf debian/man/out + -rmdir debian/man + rm -f debian/stamp-man-pages + rm -rf debian/shlibs-check + # revert multi-arch path in install files + ls -d debian/* | \ + grep -E "(install|links)$$" | \ + while read a; do \ + [ ! -f $$a.arch ] || \ + mv $$a.arch $$a; \ + done + +$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: + if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi + if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi + if test -e debian/$(cdbs_curpkg).lintian; then \ + install -p -D -m644 debian/$(cdbs_curpkg).lintian \ + debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \ + fi + if test -e debian/$(cdbs_curpkg).presubj; then \ + install -p -D -m644 debian/$(cdbs_curpkg).presubj \ + debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ + fi + +binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: + set -e; \ + for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \ + pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \ + echo Building $$pkg HTML docs...; \ + mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + /opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \ + done + for pkg in $(DOC_HTML_PRUNE) ; do \ + rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + done + +common-build-indep:: debian/stamp-kde-apidox +debian/stamp-kde-apidox: + $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) + touch $@ + +common-install-indep:: common-install-kde-apidox +common-install-kde-apidox:: + $(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox) + +cleanbuilddir:: + -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR)) + +clean:: +ifndef _cdbs_class_cmake + if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \ + cd $(DEB_SRCDIR); \ + find . -name Makefile.in -print | \ + xargs --no-run-if-empty rm -f; \ + rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \ + configure configure.files configure.in stamp-h.in \ + subdirs; \ + fi +endif + rm -f .tdepkginfo + rm -f debian/stamp-kde-apidox + rm -f debian/stamp-cvs-make + +endif diff --git a/debian/_base/dependencies/dbus-tqt/debian/cdbs/versions.pl b/debian/_base/dependencies/dbus-tqt/debian/cdbs/versions.pl new file mode 100644 index 000000000..1b110f7af --- /dev/null +++ b/debian/_base/dependencies/dbus-tqt/debian/cdbs/versions.pl @@ -0,0 +1,19 @@ +#!/usr/bin/env perl + +use strict; +use warnings; + +my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`; +my ($version3, $version3_next); +my ($version2, $version2_next); + +($version3 = $version) =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/; +($version2 = $version3) =~ s/\.[^.]+$//; + +($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e; +($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e; + +print "TDE-Version3=$version3\n"; +print "TDE-Version2=$version2\n"; +print "TDE-Next-Version3=$version3_next\n"; +print "TDE-Next-Version2=$version2_next\n"; diff --git a/debian/_base/dependencies/dbus-tqt/debian/control b/debian/_base/dependencies/dbus-tqt/debian/control index 4bd589370..221bd5ca1 100644 --- a/debian/_base/dependencies/dbus-tqt/debian/control +++ b/debian/_base/dependencies/dbus-tqt/debian/control @@ -3,25 +3,9 @@ Section: devel Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> Uploaders: Sjoerd Simons <sjoerd@debian.org>, Sebastian Drge <slomo@ubuntu.com> -Build-Depends: cdbs (>= 0.4.43), debhelper (>= 9~), quilt, libtqtinterface-dev, libdbus-1-dev (>= 0.90), cmake +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, libtqtinterface-dev, libdbus-1-dev (>= 0.90) Standards-Version: 3.8.3 -Package: libdbus-tqt-1-dev -Section: libdevel -Architecture: any -Replaces: libdbus-tqt-1-dev (<< 4:14.0.0~) -Breaks: libdbus-tqt-1-dev (<< 4:14.0.0~) -Depends: libdbus-tqt-1-1c2 (= ${source:Version}), libdbus-1-dev (>= 0.90), libtqtinterface-dev -Conflicts: dbus-tqt-1-dev -Description: simple interprocess messaging system (TQt interface) - D-BUS is a message bus, used for sending messages between applications. - Conceptually, it fits somewhere in between raw sockets and CORBA in - terms of complexity. - . - This package provides a TQt-style interface to D-BUS. - . - See the dbus description for more information about D-BUS in general. - Package: libdbus-tqt-1-1c2 Section: libs Architecture: any @@ -39,3 +23,18 @@ Description: simple interprocess messaging system (TQt-based shared library) . See the dbus description for more information about D-BUS in general. +Package: libdbus-tqt-1-dev +Section: libdevel +Architecture: any +Replaces: libdbus-tqt-1-dev (<< 4:14.0.0~) +Breaks: libdbus-tqt-1-dev (<< 4:14.0.0~) +Depends: libdbus-tqt-1-1c2 (= ${source:Version}), libdbus-1-dev (>= 0.90), libtqtinterface-dev +Conflicts: dbus-tqt-1-dev +Description: simple interprocess messaging system (TQt interface) + D-BUS is a message bus, used for sending messages between applications. + Conceptually, it fits somewhere in between raw sockets and CORBA in + terms of complexity. + . + This package provides a TQt-style interface to D-BUS. + . + See the dbus description for more information about D-BUS in general. diff --git a/debian/_base/dependencies/dbus-tqt/debian/docs b/debian/_base/dependencies/dbus-tqt/debian/docs new file mode 100644 index 000000000..6f83607c1 --- /dev/null +++ b/debian/_base/dependencies/dbus-tqt/debian/docs @@ -0,0 +1,3 @@ +AUTHORS +NEWS +README diff --git a/debian/_base/dependencies/dbus-tqt/debian/rules b/debian/_base/dependencies/dbus-tqt/debian/rules index ee5d0916d..ff4a21c43 100755 --- a/debian/_base/dependencies/dbus-tqt/debian/rules +++ b/debian/_base/dependencies/dbus-tqt/debian/rules @@ -4,19 +4,17 @@ # Copyright © 2006 Sjoerd Simons <sjoerd@debian.org> #include /usr/share/cdbs/1/rules/patchsys-quilt.mk -include /usr/share/cdbs/1/rules/utils.mk include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk +include debian/cdbs/debian-tde.mk # Strict library versioning DEB_DH_MAKESHLIBS_ARGS_ALL := -V -# The default gzip compressor has been changed in dpkg >= 1.17.0. -deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ - sed -e "s|.*version ||" -e "s| .*||" | \ - xargs -r dpkg --compare-versions 1.17.0 lt \ - && echo xz || echo gzip) -ifeq ($(deb_default_compress),gzip) -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) -endif +# Build options +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DWITH_ALL_OPTIONS="ON" diff --git a/debian/_base/dependencies/libart-lgpl/debian/cdbs/debian-tde.mk b/debian/_base/dependencies/libart-lgpl/debian/cdbs/debian-tde.mk new file mode 100644 index 000000000..f36e3527c --- /dev/null +++ b/debian/_base/dependencies/libart-lgpl/debian/cdbs/debian-tde.mk @@ -0,0 +1,246 @@ +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2003 Christopher L Cheney <ccheney@debian.org> +# Copyright © 2019 TDE Team +# Description: A class for TDE packages; sets TDE environment variables, etc +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2, or (at +# your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +# 02111-1307 USA. + +ifndef _cdbs_bootstrap +_cdbs_scripts_path ?= /usr/lib/cdbs +_cdbs_rules_path ?= /usr/share/cdbs/1/rules +_cdbs_class_path ?= /usr/share/cdbs/1/class +endif + +ifndef _cdbs_class_debian-qt-kde +_cdbs_class_debian-qt-kde := 1 + +# for dh_icons +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4) + +# Note: This _must_ be included before autotools.mk, or it won't work. +common-configure-arch common-configure-indep:: debian/stamp-cvs-make +debian/stamp-cvs-make: +ifndef _cdbs_class_cmake + cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in +ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" "" + cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh +endif +ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" "" + cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh +endif + $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; +endif + touch debian/stamp-cvs-make + +include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix) + +ifdef _cdbs_tarball_dir +DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE) +else +DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) +endif + +ifndef _cdbs_class_cmake +include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) +endif + +ifdef _cdbs_class_cmake +ifneq "$(wildcard /usr/bin/ninja)" "" +MAKE = ninja -v +DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR) +DEB_MAKE_INSTALL_TARGET = install +DEB_CMAKE_NORMAL_ARGS += -GNinja +endif +endif + +ifndef _cdbs_rules_patchsys_quilt +DEB_PATCHDIRS := debian/patches/common debian/patches +endif + +export kde_cgidir = \$${libdir}/cgi-bin +export kde_confdir = \$${sysconfdir}/trinity +export kde_htmldir = \$${datadir}/doc/tde/HTML + +DEB_KDE_ENABLE_FINAL := yes +DEB_INSTALL_DOCS_ALL := + +DEB_DH_MAKESHLIBS_ARGS_ALL := -V +DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib) + +DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" +DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el + +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + +ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb + ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) + cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,) + else + cdbs_kde_enable_final = + endif +endif + +ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_final = + cdbs_kde_enable_debug = --enable-debug=yes +else + cdbs_kde_enable_debug = --disable-debug +endif + +ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_debug = --enable-debug=full +endif + +DEB_BUILD_PARALLEL ?= true + +cdbs_configure_flags += \ + --with-qt-dir=/usr/share/qt3 \ + --disable-rpath \ + --with-xinerama \ + $(cdbs_kde_enable_final) \ + $(cdbs_kde_enable_debug) + + +# This is a convenience target for calling manually. +# It's not part of the build process. +buildprep: clean apply-patches +ifndef _cdbs_class_cmake + $(MAKE) -f admin/Makefile.common dist +endif + debian/rules clean + +.tdepkginfo: + echo "# TDE package information" >.tdepkginfo + dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo + dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo + date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo + +post-patches:: .tdepkginfo + +common-build-arch:: debian/stamp-man-pages +debian/stamp-man-pages: + if ! test -d debian/man/out; then mkdir -p debian/man/out; fi + for f in $$(find debian/man -name '*.sgml'); do \ + docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \ + done + for f in $$(find debian/man -name '*.man'); do \ + soelim -I debian/man $$f \ + > debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \ + done + touch debian/stamp-man-pages + +common-binary-indep:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_INDEP_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + +common-binary-arch:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_ARCH_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + # update multi-arch path in install files + ls -d debian/* | \ + grep -E "(install|links)$$" | \ + while read a; do \ + [ -d $$a ] || [ -f $$a.arch ] || \ + ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \ + sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \ + done + +clean:: + rm -rf debian/man/out + -rmdir debian/man + rm -f debian/stamp-man-pages + rm -rf debian/shlibs-check + # revert multi-arch path in install files + ls -d debian/* | \ + grep -E "(install|links)$$" | \ + while read a; do \ + [ ! -f $$a.arch ] || \ + mv $$a.arch $$a; \ + done + +$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: + if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi + if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi + if test -e debian/$(cdbs_curpkg).lintian; then \ + install -p -D -m644 debian/$(cdbs_curpkg).lintian \ + debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \ + fi + if test -e debian/$(cdbs_curpkg).presubj; then \ + install -p -D -m644 debian/$(cdbs_curpkg).presubj \ + debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ + fi + +binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: + set -e; \ + for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \ + pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \ + echo Building $$pkg HTML docs...; \ + mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + /opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \ + done + for pkg in $(DOC_HTML_PRUNE) ; do \ + rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + done + +common-build-indep:: debian/stamp-kde-apidox +debian/stamp-kde-apidox: + $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) + touch $@ + +common-install-indep:: common-install-kde-apidox +common-install-kde-apidox:: + $(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox) + +cleanbuilddir:: + -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR)) + +clean:: +ifndef _cdbs_class_cmake + if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \ + cd $(DEB_SRCDIR); \ + find . -name Makefile.in -print | \ + xargs --no-run-if-empty rm -f; \ + rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \ + configure configure.files configure.in stamp-h.in \ + subdirs; \ + fi +endif + rm -f .tdepkginfo + rm -f debian/stamp-kde-apidox + rm -f debian/stamp-cvs-make + +endif diff --git a/debian/_base/dependencies/libart-lgpl/debian/cdbs/versions.pl b/debian/_base/dependencies/libart-lgpl/debian/cdbs/versions.pl new file mode 100644 index 000000000..1b110f7af --- /dev/null +++ b/debian/_base/dependencies/libart-lgpl/debian/cdbs/versions.pl @@ -0,0 +1,19 @@ +#!/usr/bin/env perl + +use strict; +use warnings; + +my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`; +my ($version3, $version3_next); +my ($version2, $version2_next); + +($version3 = $version) =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/; +($version2 = $version3) =~ s/\.[^.]+$//; + +($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e; +($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e; + +print "TDE-Version3=$version3\n"; +print "TDE-Version2=$version2\n"; +print "TDE-Next-Version3=$version3_next\n"; +print "TDE-Next-Version2=$version2_next\n"; diff --git a/debian/_base/dependencies/libart-lgpl/debian/control b/debian/_base/dependencies/libart-lgpl/debian/control index 2ea76f718..648ea6b30 100644 --- a/debian/_base/dependencies/libart-lgpl/debian/control +++ b/debian/_base/dependencies/libart-lgpl/debian/control @@ -3,8 +3,8 @@ Section: devel Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Josselin Mouette <joss@debian.org> +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build Standards-Version: 3.8.4 -Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake Package: libart-2.0-2 Architecture: any diff --git a/debian/_base/dependencies/libart-lgpl/debian/docs b/debian/_base/dependencies/libart-lgpl/debian/docs new file mode 100644 index 000000000..6f83607c1 --- /dev/null +++ b/debian/_base/dependencies/libart-lgpl/debian/docs @@ -0,0 +1,3 @@ +AUTHORS +NEWS +README diff --git a/debian/_base/dependencies/libart-lgpl/debian/rules b/debian/_base/dependencies/libart-lgpl/debian/rules index ab3beba75..affcc25c7 100755 --- a/debian/_base/dependencies/libart-lgpl/debian/rules +++ b/debian/_base/dependencies/libart-lgpl/debian/rules @@ -2,21 +2,12 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk +include debian/cdbs/debian-tde.mk libart-2.0-N := $(shell sed -rn 's/^Package:[[:space:]]*(libart-2\.0-[0-9]+)[[:space:]]*$$/\1/p' debian/control) DEB_DH_MAKESHLIBS_ARGS_$(libart-2.0-N) += -V '$(libart-2.0-N)(>= 2.3.18)' -# The default gzip compressor has been changed in dpkg >= 1.17.0. -deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ - sed -e "s|.*version ||" -e "s| .*||" | \ - xargs -r dpkg --compare-versions 1.17.0 lt \ - && echo xz || echo gzip) -ifeq ($(deb_default_compress),gzip) -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) -endif - # Build options DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ diff --git a/debian/_base/dependencies/libcaldav/debian/control b/debian/_base/dependencies/libcaldav/debian/control index 1b11f6d11..441cabae2 100644 --- a/debian/_base/dependencies/libcaldav/debian/control +++ b/debian/_base/dependencies/libcaldav/debian/control @@ -2,7 +2,7 @@ Source: libcaldav Section: graphics Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, libcurl4-gnutls-dev (>= 7.19), libglib2.0-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, libcurl4-gnutls-dev (>= 7.19), libglib2.0-dev Standards-Version: 3.8.3 Package: libcaldav diff --git a/debian/_base/dependencies/libcarddav/debian/control b/debian/_base/dependencies/libcarddav/debian/control index df3429f54..738c0f991 100644 --- a/debian/_base/dependencies/libcarddav/debian/control +++ b/debian/_base/dependencies/libcarddav/debian/control @@ -2,7 +2,7 @@ Source: libcarddav Section: graphics Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, libcurl4-gnutls-dev, libglib2.0-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, libcurl4-gnutls-dev, libglib2.0-dev Standards-Version: 3.8.4 Package: libcarddav diff --git a/debian/_base/dependencies/libr/debian/README.Debian b/debian/_base/dependencies/libr/debian/README.Debian deleted file mode 100644 index 120ea0ed1..000000000 --- a/debian/_base/dependencies/libr/debian/README.Debian +++ /dev/null @@ -1,6 +0,0 @@ -libr for Debian ---------------- - -<possible notes regarding this package - if none, delete this file> - - -- Erich Hoover <ehoover@mines.edu> Tue, 03 Nov 2009 20:26:31 -0700 diff --git a/debian/_base/dependencies/libr/debian/cdbs/debian-tde.mk b/debian/_base/dependencies/libr/debian/cdbs/debian-tde.mk new file mode 100644 index 000000000..f36e3527c --- /dev/null +++ b/debian/_base/dependencies/libr/debian/cdbs/debian-tde.mk @@ -0,0 +1,246 @@ +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2003 Christopher L Cheney <ccheney@debian.org> +# Copyright © 2019 TDE Team +# Description: A class for TDE packages; sets TDE environment variables, etc +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2, or (at +# your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +# 02111-1307 USA. + +ifndef _cdbs_bootstrap +_cdbs_scripts_path ?= /usr/lib/cdbs +_cdbs_rules_path ?= /usr/share/cdbs/1/rules +_cdbs_class_path ?= /usr/share/cdbs/1/class +endif + +ifndef _cdbs_class_debian-qt-kde +_cdbs_class_debian-qt-kde := 1 + +# for dh_icons +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4) + +# Note: This _must_ be included before autotools.mk, or it won't work. +common-configure-arch common-configure-indep:: debian/stamp-cvs-make +debian/stamp-cvs-make: +ifndef _cdbs_class_cmake + cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in +ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" "" + cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh +endif +ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" "" + cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh +endif + $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; +endif + touch debian/stamp-cvs-make + +include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix) + +ifdef _cdbs_tarball_dir +DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE) +else +DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) +endif + +ifndef _cdbs_class_cmake +include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) +endif + +ifdef _cdbs_class_cmake +ifneq "$(wildcard /usr/bin/ninja)" "" +MAKE = ninja -v +DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR) +DEB_MAKE_INSTALL_TARGET = install +DEB_CMAKE_NORMAL_ARGS += -GNinja +endif +endif + +ifndef _cdbs_rules_patchsys_quilt +DEB_PATCHDIRS := debian/patches/common debian/patches +endif + +export kde_cgidir = \$${libdir}/cgi-bin +export kde_confdir = \$${sysconfdir}/trinity +export kde_htmldir = \$${datadir}/doc/tde/HTML + +DEB_KDE_ENABLE_FINAL := yes +DEB_INSTALL_DOCS_ALL := + +DEB_DH_MAKESHLIBS_ARGS_ALL := -V +DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib) + +DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" +DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el + +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + +ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb + ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) + cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,) + else + cdbs_kde_enable_final = + endif +endif + +ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_final = + cdbs_kde_enable_debug = --enable-debug=yes +else + cdbs_kde_enable_debug = --disable-debug +endif + +ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_debug = --enable-debug=full +endif + +DEB_BUILD_PARALLEL ?= true + +cdbs_configure_flags += \ + --with-qt-dir=/usr/share/qt3 \ + --disable-rpath \ + --with-xinerama \ + $(cdbs_kde_enable_final) \ + $(cdbs_kde_enable_debug) + + +# This is a convenience target for calling manually. +# It's not part of the build process. +buildprep: clean apply-patches +ifndef _cdbs_class_cmake + $(MAKE) -f admin/Makefile.common dist +endif + debian/rules clean + +.tdepkginfo: + echo "# TDE package information" >.tdepkginfo + dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo + dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo + date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo + +post-patches:: .tdepkginfo + +common-build-arch:: debian/stamp-man-pages +debian/stamp-man-pages: + if ! test -d debian/man/out; then mkdir -p debian/man/out; fi + for f in $$(find debian/man -name '*.sgml'); do \ + docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \ + done + for f in $$(find debian/man -name '*.man'); do \ + soelim -I debian/man $$f \ + > debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \ + done + touch debian/stamp-man-pages + +common-binary-indep:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_INDEP_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + +common-binary-arch:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_ARCH_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + # update multi-arch path in install files + ls -d debian/* | \ + grep -E "(install|links)$$" | \ + while read a; do \ + [ -d $$a ] || [ -f $$a.arch ] || \ + ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \ + sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \ + done + +clean:: + rm -rf debian/man/out + -rmdir debian/man + rm -f debian/stamp-man-pages + rm -rf debian/shlibs-check + # revert multi-arch path in install files + ls -d debian/* | \ + grep -E "(install|links)$$" | \ + while read a; do \ + [ ! -f $$a.arch ] || \ + mv $$a.arch $$a; \ + done + +$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: + if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi + if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi + if test -e debian/$(cdbs_curpkg).lintian; then \ + install -p -D -m644 debian/$(cdbs_curpkg).lintian \ + debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \ + fi + if test -e debian/$(cdbs_curpkg).presubj; then \ + install -p -D -m644 debian/$(cdbs_curpkg).presubj \ + debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ + fi + +binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: + set -e; \ + for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \ + pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \ + echo Building $$pkg HTML docs...; \ + mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + /opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \ + done + for pkg in $(DOC_HTML_PRUNE) ; do \ + rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + done + +common-build-indep:: debian/stamp-kde-apidox +debian/stamp-kde-apidox: + $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) + touch $@ + +common-install-indep:: common-install-kde-apidox +common-install-kde-apidox:: + $(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox) + +cleanbuilddir:: + -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR)) + +clean:: +ifndef _cdbs_class_cmake + if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \ + cd $(DEB_SRCDIR); \ + find . -name Makefile.in -print | \ + xargs --no-run-if-empty rm -f; \ + rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \ + configure configure.files configure.in stamp-h.in \ + subdirs; \ + fi +endif + rm -f .tdepkginfo + rm -f debian/stamp-kde-apidox + rm -f debian/stamp-cvs-make + +endif diff --git a/debian/_base/dependencies/libr/debian/cdbs/versions.pl b/debian/_base/dependencies/libr/debian/cdbs/versions.pl new file mode 100644 index 000000000..1b110f7af --- /dev/null +++ b/debian/_base/dependencies/libr/debian/cdbs/versions.pl @@ -0,0 +1,19 @@ +#!/usr/bin/env perl + +use strict; +use warnings; + +my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`; +my ($version3, $version3_next); +my ($version2, $version2_next); + +($version3 = $version) =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/; +($version2 = $version3) =~ s/\.[^.]+$//; + +($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e; +($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e; + +print "TDE-Version3=$version3\n"; +print "TDE-Version2=$version2\n"; +print "TDE-Next-Version3=$version3_next\n"; +print "TDE-Next-Version2=$version2_next\n"; diff --git a/debian/_base/dependencies/libr/debian/control b/debian/_base/dependencies/libr/debian/control index 74ad679f8..3b5803d1f 100644 --- a/debian/_base/dependencies/libr/debian/control +++ b/debian/_base/dependencies/libr/debian/control @@ -1,21 +1,21 @@ Source: libr Priority: extra Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: debhelper (>= 9~), cdbs, cmake, quilt, pkg-config, libglade2-dev, binutils-dev, doxygen +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, pkg-config, libglade2-dev, binutils-dev, doxygen Standards-Version: 3.8.4 Section: libs Homepage: http://www.compholio.com/elficon/ -Package: libr-dev -Section: libdevel +Package: libr0 +Section: libs Architecture: any -Depends: libr0 (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends} Description: ELF binary resource library Store and retrieve resources from ELF binaries. -Package: libr0 -Section: libs +Package: libr-dev +Section: libdevel Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: libr0 (= ${binary:Version}) Description: ELF binary resource library Store and retrieve resources from ELF binaries. diff --git a/debian/_base/dependencies/libr/debian/docs b/debian/_base/dependencies/libr/debian/docs index 50bd824bb..6f12db508 100644 --- a/debian/_base/dependencies/libr/debian/docs +++ b/debian/_base/dependencies/libr/debian/docs @@ -1,2 +1,2 @@ -NEWS +AUTHORS README diff --git a/debian/_base/dependencies/libr/debian/rules b/debian/_base/dependencies/libr/debian/rules index 2d7dda386..72e752cf6 100755 --- a/debian/_base/dependencies/libr/debian/rules +++ b/debian/_base/dependencies/libr/debian/rules @@ -2,19 +2,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/rules/utils.mk - -DEB_BUILD_PARALLEL ?= true - -# The default gzip compressor has been changed in dpkg >= 1.17.0. -deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ - sed -e "s|.*version ||" -e "s| .*||" | \ - xargs -r dpkg --compare-versions 1.17.0 lt \ - && echo xz || echo gzip) -ifeq ($(deb_default_compress),gzip) -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) -endif +include debian/cdbs/debian-tde.mk # Build options DEB_CMAKE_EXTRA_FLAGS := \ @@ -22,7 +10,3 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_SKIP_RPATH="OFF" \ -DCMAKE_VERBOSE_MAKEFILE="ON" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo - -clean:: - dh_testdir - rm -fr man/man3 diff --git a/debian/_base/dependencies/tqca-tls/debian/control b/debian/_base/dependencies/tqca-tls/debian/control index 121896f37..1c74ec299 100644 --- a/debian/_base/dependencies/tqca-tls/debian/control +++ b/debian/_base/dependencies/tqca-tls/debian/control @@ -2,7 +2,7 @@ Source: tqca-tls Section: libs Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, libtqca-dev, libssl-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, libtqca-dev, libssl-dev Standards-Version: 3.8.4 Package: tqca-tls diff --git a/dilos/dependencies/avahi-tqt/debian/patches/.gitignore b/debian/_base/dependencies/tqca-tls/debian/patches/series index e69de29bb..e69de29bb 100644 --- a/dilos/dependencies/avahi-tqt/debian/patches/.gitignore +++ b/debian/_base/dependencies/tqca-tls/debian/patches/series diff --git a/debian/_base/dependencies/tqca/debian/control b/debian/_base/dependencies/tqca/debian/control index 4b5fdb7cb..df897123b 100644 --- a/debian/_base/dependencies/tqca/debian/control +++ b/debian/_base/dependencies/tqca/debian/control @@ -2,7 +2,7 @@ Source: libtqca Section: libs Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, libtqtinterface-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, libtqtinterface-dev Standards-Version: 3.8.3 Package: libtqca diff --git a/ubuntu/_base/dependencies/avahi-tqt/debian/patches/.gitignore b/debian/_base/dependencies/tqca/debian/patches/series index e69de29bb..e69de29bb 100644 --- a/ubuntu/_base/dependencies/avahi-tqt/debian/patches/.gitignore +++ b/debian/_base/dependencies/tqca/debian/patches/series diff --git a/debian/_base/dependencies/tqtinterface/debian/cdbs/debian-tde.mk b/debian/_base/dependencies/tqtinterface/debian/cdbs/debian-tde.mk new file mode 100644 index 000000000..f36e3527c --- /dev/null +++ b/debian/_base/dependencies/tqtinterface/debian/cdbs/debian-tde.mk @@ -0,0 +1,246 @@ +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2003 Christopher L Cheney <ccheney@debian.org> +# Copyright © 2019 TDE Team +# Description: A class for TDE packages; sets TDE environment variables, etc +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2, or (at +# your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +# 02111-1307 USA. + +ifndef _cdbs_bootstrap +_cdbs_scripts_path ?= /usr/lib/cdbs +_cdbs_rules_path ?= /usr/share/cdbs/1/rules +_cdbs_class_path ?= /usr/share/cdbs/1/class +endif + +ifndef _cdbs_class_debian-qt-kde +_cdbs_class_debian-qt-kde := 1 + +# for dh_icons +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4) + +# Note: This _must_ be included before autotools.mk, or it won't work. +common-configure-arch common-configure-indep:: debian/stamp-cvs-make +debian/stamp-cvs-make: +ifndef _cdbs_class_cmake + cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in +ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" "" + cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh +endif +ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" "" + cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh +endif + $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; +endif + touch debian/stamp-cvs-make + +include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix) + +ifdef _cdbs_tarball_dir +DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE) +else +DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) +endif + +ifndef _cdbs_class_cmake +include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) +endif + +ifdef _cdbs_class_cmake +ifneq "$(wildcard /usr/bin/ninja)" "" +MAKE = ninja -v +DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR) +DEB_MAKE_INSTALL_TARGET = install +DEB_CMAKE_NORMAL_ARGS += -GNinja +endif +endif + +ifndef _cdbs_rules_patchsys_quilt +DEB_PATCHDIRS := debian/patches/common debian/patches +endif + +export kde_cgidir = \$${libdir}/cgi-bin +export kde_confdir = \$${sysconfdir}/trinity +export kde_htmldir = \$${datadir}/doc/tde/HTML + +DEB_KDE_ENABLE_FINAL := yes +DEB_INSTALL_DOCS_ALL := + +DEB_DH_MAKESHLIBS_ARGS_ALL := -V +DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib) + +DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" +DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el + +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + +ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb + ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) + cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,) + else + cdbs_kde_enable_final = + endif +endif + +ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_final = + cdbs_kde_enable_debug = --enable-debug=yes +else + cdbs_kde_enable_debug = --disable-debug +endif + +ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_debug = --enable-debug=full +endif + +DEB_BUILD_PARALLEL ?= true + +cdbs_configure_flags += \ + --with-qt-dir=/usr/share/qt3 \ + --disable-rpath \ + --with-xinerama \ + $(cdbs_kde_enable_final) \ + $(cdbs_kde_enable_debug) + + +# This is a convenience target for calling manually. +# It's not part of the build process. +buildprep: clean apply-patches +ifndef _cdbs_class_cmake + $(MAKE) -f admin/Makefile.common dist +endif + debian/rules clean + +.tdepkginfo: + echo "# TDE package information" >.tdepkginfo + dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo + dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo + date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo + +post-patches:: .tdepkginfo + +common-build-arch:: debian/stamp-man-pages +debian/stamp-man-pages: + if ! test -d debian/man/out; then mkdir -p debian/man/out; fi + for f in $$(find debian/man -name '*.sgml'); do \ + docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \ + done + for f in $$(find debian/man -name '*.man'); do \ + soelim -I debian/man $$f \ + > debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \ + done + touch debian/stamp-man-pages + +common-binary-indep:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_INDEP_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + +common-binary-arch:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_ARCH_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + # update multi-arch path in install files + ls -d debian/* | \ + grep -E "(install|links)$$" | \ + while read a; do \ + [ -d $$a ] || [ -f $$a.arch ] || \ + ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \ + sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \ + done + +clean:: + rm -rf debian/man/out + -rmdir debian/man + rm -f debian/stamp-man-pages + rm -rf debian/shlibs-check + # revert multi-arch path in install files + ls -d debian/* | \ + grep -E "(install|links)$$" | \ + while read a; do \ + [ ! -f $$a.arch ] || \ + mv $$a.arch $$a; \ + done + +$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: + if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi + if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi + if test -e debian/$(cdbs_curpkg).lintian; then \ + install -p -D -m644 debian/$(cdbs_curpkg).lintian \ + debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \ + fi + if test -e debian/$(cdbs_curpkg).presubj; then \ + install -p -D -m644 debian/$(cdbs_curpkg).presubj \ + debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ + fi + +binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: + set -e; \ + for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \ + pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \ + echo Building $$pkg HTML docs...; \ + mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + /opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \ + done + for pkg in $(DOC_HTML_PRUNE) ; do \ + rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + done + +common-build-indep:: debian/stamp-kde-apidox +debian/stamp-kde-apidox: + $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) + touch $@ + +common-install-indep:: common-install-kde-apidox +common-install-kde-apidox:: + $(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox) + +cleanbuilddir:: + -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR)) + +clean:: +ifndef _cdbs_class_cmake + if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \ + cd $(DEB_SRCDIR); \ + find . -name Makefile.in -print | \ + xargs --no-run-if-empty rm -f; \ + rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \ + configure configure.files configure.in stamp-h.in \ + subdirs; \ + fi +endif + rm -f .tdepkginfo + rm -f debian/stamp-kde-apidox + rm -f debian/stamp-cvs-make + +endif diff --git a/debian/_base/dependencies/tqtinterface/debian/cdbs/versions.pl b/debian/_base/dependencies/tqtinterface/debian/cdbs/versions.pl new file mode 100644 index 000000000..1b110f7af --- /dev/null +++ b/debian/_base/dependencies/tqtinterface/debian/cdbs/versions.pl @@ -0,0 +1,19 @@ +#!/usr/bin/env perl + +use strict; +use warnings; + +my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`; +my ($version3, $version3_next); +my ($version2, $version2_next); + +($version3 = $version) =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/; +($version2 = $version3) =~ s/\.[^.]+$//; + +($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e; +($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e; + +print "TDE-Version3=$version3\n"; +print "TDE-Version2=$version2\n"; +print "TDE-Next-Version3=$version3_next\n"; +print "TDE-Next-Version2=$version2_next\n"; diff --git a/debian/_base/dependencies/tqtinterface/debian/control b/debian/_base/dependencies/tqtinterface/debian/control index 4a404673c..ddd520f2c 100644 --- a/debian/_base/dependencies/tqtinterface/debian/control +++ b/debian/_base/dependencies/tqtinterface/debian/control @@ -2,7 +2,7 @@ Source: libtqtinterface Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: debhelper (>= 9~), quilt, libtqt3-mt-dev, tqt3-apps-dev, cmake, cdbs +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, libtqt3-mt-dev, tqt3-apps-dev Standards-Version: 3.8.4 Package: libtqtinterface diff --git a/debian/_base/dependencies/tqtinterface/debian/docs b/debian/_base/dependencies/tqtinterface/debian/docs index e69de29bb..ca0272abf 100644 --- a/debian/_base/dependencies/tqtinterface/debian/docs +++ b/debian/_base/dependencies/tqtinterface/debian/docs @@ -0,0 +1,3 @@ +AUTHORS +README +TODO diff --git a/debian/_base/dependencies/tqtinterface/debian/rules b/debian/_base/dependencies/tqtinterface/debian/rules index fe114f5e8..5772f17f6 100755 --- a/debian/_base/dependencies/tqtinterface/debian/rules +++ b/debian/_base/dependencies/tqtinterface/debian/rules @@ -1,32 +1,11 @@ #! /usr/bin/make -f -# see debian/rules file for tdesvn for cmake examples include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk -#include /usr/share/cdbs/1/rules/patchsys-quilt.mk -include /usr/share/cdbs/1/rules/utils.mk - -DEB_KDE_APIDOX := yes +include debian/cdbs/debian-tde.mk version=Debian Package $(DEB_VERSION) DEB_OPT_FLAG += -DDEBIAN_VERSION=$(DEB_VERSION) -DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) - -# The default gzip compressor has been changed in dpkg >= 1.17.0. -deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ - sed -e "s|.*version ||" -e "s| .*||" | \ - xargs -r dpkg --compare-versions 1.17.0 lt \ - && echo xz || echo gzip) -ifeq ($(deb_default_compress),gzip) -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) -endif - -# Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to -# never build in parallel, regardless of DEB_BUILD_OPTIONS. -DEB_BUILD_PARALLEL ?= true - -DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ diff --git a/debian/_base/libraries/libkexiv2/debian/control b/debian/_base/libraries/libkexiv2/debian/control index 177067d57..2a152e63e 100644 --- a/debian/_base/libraries/libkexiv2/debian/control +++ b/debian/_base/libraries/libkexiv2/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org> Uploaders: Achim Bohnet <ach@mpe.mpg.de>, Mark Purcell <msp@debian.org> -Build-Depends: debhelper (>= 9~), cdbs, cmake, libexiv2-dev, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, libexiv2-dev, tdelibs14-trinity-dev Standards-Version: 3.8.4 Homepage: http://www.kipi-plugins.org/ diff --git a/debian/_base/libraries/libkipi/debian/control b/debian/_base/libraries/libkipi/debian/control index d6a646d6c..5e41df47c 100644 --- a/debian/_base/libraries/libkipi/debian/control +++ b/debian/_base/libraries/libkipi/debian/control @@ -3,7 +3,7 @@ Section: libs Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> Uploaders: Achim Bohnet <ach@mpe.mpg.de>, Mark Purcell <msp@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, libexif-dev, tdelibs14-trinity-dev (>= 4:3.4.3-2) +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, libexif-dev, tdelibs14-trinity-dev Standards-Version: 3.8.4 Package: libkipi0-trinity-dev diff --git a/debian/_base/libraries/libtdeldap/debian/control b/debian/_base/libraries/libtdeldap/debian/control index 8a460e48e..730e4392b 100644 --- a/debian/_base/libraries/libtdeldap/debian/control +++ b/debian/_base/libraries/libtdeldap/debian/control @@ -2,7 +2,7 @@ Source: libtdeldap-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, tdelibs14-trinity-dev, libldap2-dev, heimdal-multidev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, libldap2-dev, heimdal-multidev Standards-Version: 3.8.4 Package: libtdeldap-trinity diff --git a/dilos/core/tde-i18n/debian/control b/dilos/core/tde-i18n/debian/control index 066dcb7e0..a1523f04a 100644 --- a/dilos/core/tde-i18n/debian/control +++ b/dilos/core/tde-i18n/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org> -Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.4 Package: tde-i18n-af-trinity diff --git a/dilos/core/tde-i18n/debian/rules b/dilos/core/tde-i18n/debian/rules index 0c61a9499..6c4b01fce 100755 --- a/dilos/core/tde-i18n/debian/rules +++ b/dilos/core/tde-i18n/debian/rules @@ -25,6 +25,13 @@ ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) endif DEB_MAKE_PARALLEL ?= $(and $(DEB_BUILD_PARALLEL),$(DEB_PARALLEL_JOBS),-j$(DEB_PARALLEL_JOBS)) +ifneq "$(wildcard /usr/bin/ninja)" "" +MAKE = ninja -v +DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR) +DEB_MAKE_INSTALL_TARGET = install +DEB_CMAKE_NORMAL_ARGS += -GNinja +endif + # The default gzip compressor has been changed in dpkg >= 1.17.0. deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ sed -e "s|.*version ||" -e "s| .*||" | \ @@ -59,7 +66,7 @@ $(STAMP_BUILD): [ -e $(cur_lang_dir)/CMakeLists.txt ] || \ ln -s ../template/commonCMakeLists.txt $(cur_lang_dir)/CMakeLists.txt cd $(cur_lang_dir)/build && \ - cmake .. $(DEB_CMAKE_EXTRA_FLAGS) && \ + cmake .. $(DEB_CMAKE_NORMAL_ARGS) $(DEB_CMAKE_EXTRA_FLAGS) && \ $(MAKE) $(DEB_MAKE_PARALLEL) touch $@ @@ -72,7 +79,7 @@ install:: $(I18N_INSTALL) $(I18N_INSTALL): build cd $(cur_lang_dir)/build && \ - $(MAKE) install DESTDIR=$(CURDIR)/debian/$(cur_pkg) $(DEB_MAKE_PARALLEL) + DESTDIR=$(CURDIR)/debian/$(cur_pkg) $(MAKE) install $(DEB_MAKE_PARALLEL) clean: $(I18N_CLEAN) debian-clean diff --git a/dilos/core/tdeaccessibility/debian/control b/dilos/core/tdeaccessibility/debian/control index 7072c5df9..aed1c619b 100644 --- a/dilos/core/tdeaccessibility/debian/control +++ b/dilos/core/tdeaccessibility/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com> -Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, tdelibs14-trinity-dev, tdemultimedia-trinity-dev, libakode-dev, libxtst-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, tdemultimedia-trinity-dev, libakode-dev, libxtst-dev Standards-Version: 3.8.4 Package: tdeaccessibility-trinity diff --git a/dilos/core/tdeaddons/debian/control b/dilos/core/tdeaddons/debian/control index 37d32cf3e..3ff97ccc1 100644 --- a/dilos/core/tdeaddons/debian/control +++ b/dilos/core/tdeaddons/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org> -Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, gawk, tdelibs14-trinity-dev, atlantik-trinity-dev, tdebase-trinity-dev, tdemultimedia-trinity-dev, libtdegames-trinity-dev, libkonq4-trinity-dev, tdepim-trinity-dev, libsdl1.2-dev (>= 1.2.2-3.3), libssl-dev (>= 0.9.6), libdb4.8++-dev | libdb++-dev, libogg-dev, libiconv-dev [solaris-any] +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, atlantik-trinity-dev, tdebase-trinity-dev, tdemultimedia-trinity-dev, libtdegames-trinity-dev, libkonq4-trinity-dev, tdepim-trinity-dev, libsdl1.2-dev (>= 1.2.2-3.3), libssl-dev (>= 0.9.6), libdb4.8++-dev | libdb++-dev, libogg-dev, libiconv-dev [solaris-any] Standards-Version: 3.8.4 Package: tdeaddons-trinity diff --git a/dilos/core/tdeadmin/debian/control b/dilos/core/tdeadmin/debian/control index de8b39f3b..b2a5484bb 100644 --- a/dilos/core/tdeadmin/debian/control +++ b/dilos/core/tdeadmin/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Fathi Boudra <fboudra@free.fr>, Modestas Vainius <geromanas@mailas.com>, Sune Vuorela <debian@pusling.com> -Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, tdelibs14-trinity-dev, libpam0g-dev, docbook-to-man +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, libpam0g-dev, docbook-to-man Standards-Version: 3.8.4 Package: tdeadmin-trinity diff --git a/dilos/core/tdeartwork/debian/control b/dilos/core/tdeartwork/debian/control index be27cfeef..bb1a921e9 100644 --- a/dilos/core/tdeartwork/debian/control +++ b/dilos/core/tdeartwork/debian/control @@ -4,8 +4,8 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Sune Vuorela <debian@pusling.com> -Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, autotools-dev, tdelibs14-trinity-dev, gawk, sharutils, tdebase-trinity-dev, twin-trinity, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, xscreensaver, xscreensaver-gl, xscreensaver-data, xscreensaver-data-extra, xscreensaver-gl-extra, rss-glx, fireflies [!solaris-any], automake, autoconf, libtool, libltdl-dev -Build-Conflicts: autoconf2.13, nvidia-glx +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, tdebase-trinity-dev, twin-trinity, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, xscreensaver, xscreensaver-gl, xscreensaver-data, xscreensaver-data-extra, xscreensaver-gl-extra, rss-glx, fireflies [!solaris-any] +Build-Conflicts: nvidia-glx Standards-Version: 3.8.4 Package: tdeartwork-trinity diff --git a/dilos/core/tdebase/debian/control b/dilos/core/tdebase/debian/control index c926d92db..e40bf7287 100644 --- a/dilos/core/tdebase/debian/control +++ b/dilos/core/tdebase/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Fathi Boudra <fboudra@free.fr>, Modestas Vainius <geromanas@mailas.com>, Sune Vuorela <debian@pusling.com> -Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, gawk, tdelibs14-trinity-dev, libldap2-dev, libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386 !solaris-any], libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386 !solaris-any], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, xscreensaver, xscreensaver-data, xscreensaver-data-extra, libxss-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xkb-data, xutils, sharutils, texinfo, htdig, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, libogg-dev, libavahi-tqt-dev, udev [!solaris-any], libudev-dev [!solaris-any], libdbus-1-dev, libconfig-dev, libart-2.0-dev (>= 4:14.0.0~), libssl-dev, libcpp [solaris-any] +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, libldap2-dev, libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386 !solaris-any], libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386 !solaris-any], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, xscreensaver, xscreensaver-data, xscreensaver-data-extra, libxss-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xkb-data, xutils, texinfo, htdig, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, libogg-dev, libavahi-tqt-dev, udev [!solaris-any], libudev-dev [!solaris-any], libdbus-1-dev, libconfig-dev, libart-2.0-dev (>= 4:14.0.0~), libssl-dev, libcpp [solaris-any] Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11, tdelibs14-trinity-doc Build-Conflicts: nvidia-glx (<< 1.0.8774-6) Standards-Version: 3.8.4 diff --git a/dilos/core/tdeedu/debian/control b/dilos/core/tdeedu/debian/control index 9f2c8c1cd..ce6b8e832 100644 --- a/dilos/core/tdeedu/debian/control +++ b/dilos/core/tdeedu/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Daniel Schepler <schepler@debian.org>, Sune Vuorela <debian@pusling.com> -Build-Depends: debhelper (>= 9~), cdbs (>= 0.4.39-0.1), quilt, cmake, tdelibs14-trinity-dev, libnum-ocaml-dev | ocaml-nox (<< 4.08), libfacile-ocaml-dev, libboost-python-dev (>= 1.33.1), libusb-dev, doxygen, graphviz, texlive-latex-base, texlive-latex-extra, ghostscript +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, libnum-ocaml-dev | ocaml-nox (<< 4.08), libfacile-ocaml-dev, libboost-python-dev (>= 1.33.1), libusb-dev, doxygen, graphviz, texlive-latex-base, texlive-latex-extra, ghostscript Standards-Version: 3.8.4 Package: tdeedu-trinity diff --git a/dilos/core/tdegames/debian/control b/dilos/core/tdegames/debian/control index 0539830d8..6014af66b 100644 --- a/dilos/core/tdegames/debian/control +++ b/dilos/core/tdegames/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Daniel Schepler <schepler@debian.org>, Sune Vuorela <debian@pusling.com> -Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, gawk, tdelibs14-trinity-dev, tdemultimedia-trinity-dev, groff-base, sharutils, bzip2, sharutils, libogg-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, tdemultimedia-trinity-dev, groff-base, bzip2, libogg-dev Build-Depends-Indep: doxygen, graphviz, gsfonts-x11, libtqtinterface-doc, tdelibs14-trinity-doc Standards-Version: 3.8.4 diff --git a/dilos/core/tdegraphics/debian/control b/dilos/core/tdegraphics/debian/control index dfd3fbb15..16ef61f1f 100644 --- a/dilos/core/tdegraphics/debian/control +++ b/dilos/core/tdegraphics/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Francesco Pedrini <francesco.pedrini@gmail.com>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com> -Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, tdelibs14-trinity-dev, imlib11-dev, libexif-dev (>= 0.6.9-1), libfribidi-dev, freeglut3-dev, libgphoto2-dev | libgphoto2-6-dev | libgphoto2-2-dev, libopenexr-dev (>= 1.2.1), libpaper-dev, libpoppler-private-dev | libpoppler-dev (<< 0.18.4-3), libpoppler-dev, libsane-dev (>> 1.0.15), libtiff-dev, libtiff-tools, liblcms2-dev | liblcms1-dev, libusb-dev, libxxf86vm-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, imlib11-dev, libexif-dev (>= 0.6.9-1), libfribidi-dev, freeglut3-dev, libgphoto2-dev | libgphoto2-6-dev | libgphoto2-2-dev, libopenexr-dev (>= 1.2.1), libpaper-dev, libpoppler-private-dev | libpoppler-dev (<< 0.18.4-3), libpoppler-dev, libsane-dev (>> 1.0.15), libtiff-dev, libtiff-tools, liblcms2-dev | liblcms1-dev, libusb-dev, libxxf86vm-dev Standards-Version: 3.8.4 Package: tdegraphics-trinity diff --git a/dilos/core/tdelibs/debian/control b/dilos/core/tdelibs/debian/control index 4883e16df..6eaaccd0a 100644 --- a/dilos/core/tdelibs/debian/control +++ b/dilos/core/tdelibs/debian/control @@ -4,8 +4,8 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Adeodato Sim <dato@net.com.org.es>, Ana Beatriz Guerrero Lopez <ana@debian.org>, Daniel Schepler <schepler@debian.org>, Fathi Boudra <fboudra@free.fr>, Sune Vuorela <debian@pusling.com> -Build-Depends: cdbs (>= 0.4.41ubuntu2), debhelper (>= 9~), quilt, cmake, autotools-dev, - binutils (>= 2.14.90.0.7), binutils-dev [!solaris-any], docbook-to-man, gawk, +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, + binutils (>= 2.14.90.0.7), binutils-dev [!solaris-any], docbook-to-man, libart-2.0-dev (>= 4:14.0.0~), libarts1-trinity-dev (>= 1.5.0), libacl1-dev [!solaris-any], libattr1-dev [!solaris-any], libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386 !solaris-any], aspell, libaspell-dev, hspell, libbz2-dev, liblzma-dev, libcupsys2-dev | libcups2-dev, @@ -14,7 +14,7 @@ Build-Depends: cdbs (>= 0.4.41ubuntu2), debhelper (>= 9~), quilt, cmake, autotoo libsasl2-dev, libxcomposite-dev, libdbus-1-tqt-dev, libtiff-dev, libavahi-client-dev (>= 0.4), x11-xserver-utils, libxml2-dev, libxml2-utils, libxslt1-dev, libavahi-tqt-dev, - sharutils, texinfo, libogg-dev, libtqtinterface-dev, + texinfo, libogg-dev, libtqtinterface-dev, lsb-release, base-files, sudo, libr-dev [!solaris-any], libudev-dev [!solaris-any], libltdl-dev, libmagic-dev, libpcsclite-dev, opensc-pkcs11 | opensc (<< 0.13.0-5), libpkcs11-helper1-dev, libcryptsetup-dev [!solaris-any], diff --git a/dilos/core/tdemultimedia/debian/control b/dilos/core/tdemultimedia/debian/control index a9345917a..71051b1c7 100644 --- a/dilos/core/tdemultimedia/debian/control +++ b/dilos/core/tdemultimedia/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Fathi Boudra <fboudra@free.fr>, Sune Vuorela <debian@pusling.com> -Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, tdelibs14-trinity-dev, cdparanoia, libcdparanoia0-dev, libflac-dev (>= 1.1.4-1), libgstreamer-plugins-base1.0-dev | libgstreamer-plugins-base0.10-dev, libsamplerate0-dev, libspeex-dev (>> 1.1.5), libtag1-dev (>> 1.3.1), libtheora-dev, libxine2-dev | libxine-dev, libxxf86dga-dev, libxv-dev, libxxf86vm-dev, libakode-dev, libogg-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, cdparanoia, libcdparanoia0-dev, libflac-dev (>= 1.1.4-1), libgstreamer-plugins-base1.0-dev | libgstreamer-plugins-base0.10-dev, libsamplerate0-dev, libspeex-dev (>> 1.1.5), libtag1-dev (>> 1.3.1), libtheora-dev, libxine2-dev | libxine-dev, libxxf86dga-dev, libxv-dev, libxxf86vm-dev, libakode-dev, libogg-dev Standards-Version: 3.8.4 Package: tdemultimedia-trinity diff --git a/dilos/core/tdenetwork/debian/control b/dilos/core/tdenetwork/debian/control index a90ba00a2..0cc9f7007 100644 --- a/dilos/core/tdenetwork/debian/control +++ b/dilos/core/tdenetwork/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Modestas Vainius <geromanas@mailas.com>, Sarah Hobbs <hobbsee@ubuntu.com>, Sune Vuorela <debian@pusling.com> -Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, docbook-to-man, doxygen, gawk, tdelibs14-trinity-dev, libgnutls-dev | libgadu-dev (>> 1:1.12.0-3), libgcrypt-dev, libgadu-dev, libiw-dev (>> 27+28pre8) [!solaris-any], libmeanwhile-dev (>= 1.0.2), libslp-dev, libspeex-dev, libsqlite3-dev, libxml2-dev, libxslt1-dev, libxtst-dev, libtqtinterface-doc, sharutils, valgrind [!armel !mips !mipsel !riscv64 !solaris-any], libxxf86vm-dev, libv4l-dev [!solaris-any], libssl-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, docbook-to-man, doxygen, tdelibs14-trinity-dev, libgnutls-dev | libgadu-dev (>> 1:1.12.0-3), libgcrypt-dev, libgadu-dev, libiw-dev (>> 27+28pre8) [!solaris-any], libmeanwhile-dev (>= 1.0.2), libslp-dev, libspeex-dev, libsqlite3-dev, libxml2-dev, libxslt1-dev, libxtst-dev, libtqtinterface-doc, valgrind [!armel !mips !mipsel !riscv64 !solaris-any], libxxf86vm-dev, libv4l-dev [!solaris-any], libssl-dev Standards-Version: 3.8.4 Package: tdenetwork-trinity diff --git a/dilos/core/tdepim/debian/control b/dilos/core/tdepim/debian/control index 3d521b5f9..586d1c284 100644 --- a/dilos/core/tdepim/debian/control +++ b/dilos/core/tdepim/debian/control @@ -4,12 +4,12 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com> -Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, - gawk, tdelibs14-trinity-dev, bison, byacc, bzip2, +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, + tdelibs14-trinity-dev, bison, byacc, bzip2, flex, groff-base, libogg-dev, libboost-dev (>= 1.33.1), libgpgme11-dev | libgpgme-dev (>= 1.0~), libreadline-dev | libreadline6-dev | libreadline5-dev, libsasl2-dev, libssl-dev, - libxpm-dev, libxss-dev, sharutils, texinfo, dpkg-dev (>= 1.14.4), + libxpm-dev, libxss-dev, texinfo, dpkg-dev (>= 1.14.4), libgpg-error-dev (>= 1.4-2), gpgsm, libical-dev, libcaldav-dev (>= 0.6.5), libcarddav-dev (>= 0.6.2), libcurl4-gnutls-dev Build-Depends-Indep: doxygen, graphviz, gsfonts-x11, libtqtinterface-doc, tdelibs14-trinity-doc diff --git a/dilos/core/tdesdk/debian/control b/dilos/core/tdesdk/debian/control index 7b41d304d..618f186c7 100644 --- a/dilos/core/tdesdk/debian/control +++ b/dilos/core/tdesdk/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Fathi Boudra <fboudra@free.fr>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com> -Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, gawk, +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, pkg-config, tdelibs14-trinity-dev, binutils-dev [!solaris-any], bison, flex, libfl-dev | flex (<< 2.5.39), tdepim-trinity-dev, libapr1-dev, libtdepim1-trinity-dev, libktnef1-trinity-dev, libsvn-dev, libdb-dev, diff --git a/dilos/core/tdetoys/debian/control b/dilos/core/tdetoys/debian/control index 649c83784..acc897d4e 100644 --- a/dilos/core/tdetoys/debian/control +++ b/dilos/core/tdetoys/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Modestas Vainius <geromanas@mailas.com> -Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.4 Package: tdetoys-trinity diff --git a/dilos/core/tdeutils/debian/control b/dilos/core/tdeutils/debian/control index 8f911a1d6..c33ed018a 100644 --- a/dilos/core/tdeutils/debian/control +++ b/dilos/core/tdeutils/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Fathi Boudra <fboudra@free.fr>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com> -Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, tdelibs14-trinity-dev, tdebase-trinity-dev, libkonq4-trinity-dev, libgmp3-dev, libsnmp-dev, libxpm-dev, python-all-dev, libxtst-dev, xutils +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, tdebase-trinity-dev, libkonq4-trinity-dev, libgmp3-dev, libsnmp-dev, libxpm-dev, python-all-dev, libxtst-dev, xutils Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11, tdelibs14-trinity-doc Standards-Version: 3.8.4 diff --git a/dilos/core/tdevelop/debian/control b/dilos/core/tdevelop/debian/control index 668b8e22b..947374613 100644 --- a/dilos/core/tdevelop/debian/control +++ b/dilos/core/tdevelop/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Jeremy Lain <jeremy.laine@m4x.org> -Build-Depends: cdbs (>= 0.4.38), debhelper (>= 9~), quilt, cmake, tdelibs14-trinity-dev, tdelibs14-trinity-doc, libtqtinterface-doc, flex, python-all, libcvsservice-trinity-dev, groff-base, libsvn-dev, libaprutil1-dev, libdb-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, tdelibs14-trinity-doc, libtqtinterface-doc, flex, python-all, libcvsservice-trinity-dev, groff-base, libsvn-dev, libaprutil1-dev, libdb-dev Standards-Version: 3.8.4 Package: tdevelop-trinity diff --git a/dilos/dependencies/arts/debian/control b/dilos/dependencies/arts/debian/control index 790c12d68..331e5a318 100644 --- a/dilos/dependencies/arts/debian/control +++ b/dilos/dependencies/arts/debian/control @@ -4,12 +4,12 @@ Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Qt/TDE Maintainers <debian-qt-tde@lists.debian.org> Priority: optional Uploaders: Adeodato Sim <dato@net.com.org.es>, Ana Beatriz Guerrero Lopez <ana@debian.org>, Fathi Boudra <fabo@debian.org>, Modestas Vainius <modestas@vainius.eu> -Build-Depends: cdbs (>= 0.4.48), debhelper (>= 9~), quilt, - docbook-to-man, gawk, sharutils, texinfo, +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, + docbook-to-man, texinfo, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386 !solaris-any], libaudio-dev, libaudiofile-dev, libglib2.0-dev, libmad0-dev, libogg-dev, libtqtinterface-dev, - libvorbis-dev, cmake, libltdl-dev + libvorbis-dev, libltdl-dev Build-Conflicts: libmas-dev Standards-Version: 3.8.4 diff --git a/dilos/dependencies/avahi-tqt/debian/cdbs/debian-tde.mk b/dilos/dependencies/avahi-tqt/debian/cdbs/debian-tde.mk new file mode 100644 index 000000000..f36e3527c --- /dev/null +++ b/dilos/dependencies/avahi-tqt/debian/cdbs/debian-tde.mk @@ -0,0 +1,246 @@ +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2003 Christopher L Cheney <ccheney@debian.org> +# Copyright © 2019 TDE Team +# Description: A class for TDE packages; sets TDE environment variables, etc +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2, or (at +# your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +# 02111-1307 USA. + +ifndef _cdbs_bootstrap +_cdbs_scripts_path ?= /usr/lib/cdbs +_cdbs_rules_path ?= /usr/share/cdbs/1/rules +_cdbs_class_path ?= /usr/share/cdbs/1/class +endif + +ifndef _cdbs_class_debian-qt-kde +_cdbs_class_debian-qt-kde := 1 + +# for dh_icons +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4) + +# Note: This _must_ be included before autotools.mk, or it won't work. +common-configure-arch common-configure-indep:: debian/stamp-cvs-make +debian/stamp-cvs-make: +ifndef _cdbs_class_cmake + cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in +ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" "" + cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh +endif +ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" "" + cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh +endif + $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; +endif + touch debian/stamp-cvs-make + +include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix) + +ifdef _cdbs_tarball_dir +DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE) +else +DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) +endif + +ifndef _cdbs_class_cmake +include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) +endif + +ifdef _cdbs_class_cmake +ifneq "$(wildcard /usr/bin/ninja)" "" +MAKE = ninja -v +DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR) +DEB_MAKE_INSTALL_TARGET = install +DEB_CMAKE_NORMAL_ARGS += -GNinja +endif +endif + +ifndef _cdbs_rules_patchsys_quilt +DEB_PATCHDIRS := debian/patches/common debian/patches +endif + +export kde_cgidir = \$${libdir}/cgi-bin +export kde_confdir = \$${sysconfdir}/trinity +export kde_htmldir = \$${datadir}/doc/tde/HTML + +DEB_KDE_ENABLE_FINAL := yes +DEB_INSTALL_DOCS_ALL := + +DEB_DH_MAKESHLIBS_ARGS_ALL := -V +DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib) + +DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" +DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el + +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + +ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb + ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) + cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,) + else + cdbs_kde_enable_final = + endif +endif + +ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_final = + cdbs_kde_enable_debug = --enable-debug=yes +else + cdbs_kde_enable_debug = --disable-debug +endif + +ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_debug = --enable-debug=full +endif + +DEB_BUILD_PARALLEL ?= true + +cdbs_configure_flags += \ + --with-qt-dir=/usr/share/qt3 \ + --disable-rpath \ + --with-xinerama \ + $(cdbs_kde_enable_final) \ + $(cdbs_kde_enable_debug) + + +# This is a convenience target for calling manually. +# It's not part of the build process. +buildprep: clean apply-patches +ifndef _cdbs_class_cmake + $(MAKE) -f admin/Makefile.common dist +endif + debian/rules clean + +.tdepkginfo: + echo "# TDE package information" >.tdepkginfo + dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo + dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo + date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo + +post-patches:: .tdepkginfo + +common-build-arch:: debian/stamp-man-pages +debian/stamp-man-pages: + if ! test -d debian/man/out; then mkdir -p debian/man/out; fi + for f in $$(find debian/man -name '*.sgml'); do \ + docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \ + done + for f in $$(find debian/man -name '*.man'); do \ + soelim -I debian/man $$f \ + > debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \ + done + touch debian/stamp-man-pages + +common-binary-indep:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_INDEP_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + +common-binary-arch:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_ARCH_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + # update multi-arch path in install files + ls -d debian/* | \ + grep -E "(install|links)$$" | \ + while read a; do \ + [ -d $$a ] || [ -f $$a.arch ] || \ + ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \ + sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \ + done + +clean:: + rm -rf debian/man/out + -rmdir debian/man + rm -f debian/stamp-man-pages + rm -rf debian/shlibs-check + # revert multi-arch path in install files + ls -d debian/* | \ + grep -E "(install|links)$$" | \ + while read a; do \ + [ ! -f $$a.arch ] || \ + mv $$a.arch $$a; \ + done + +$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: + if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi + if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi + if test -e debian/$(cdbs_curpkg).lintian; then \ + install -p -D -m644 debian/$(cdbs_curpkg).lintian \ + debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \ + fi + if test -e debian/$(cdbs_curpkg).presubj; then \ + install -p -D -m644 debian/$(cdbs_curpkg).presubj \ + debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ + fi + +binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: + set -e; \ + for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \ + pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \ + echo Building $$pkg HTML docs...; \ + mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + /opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \ + done + for pkg in $(DOC_HTML_PRUNE) ; do \ + rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + done + +common-build-indep:: debian/stamp-kde-apidox +debian/stamp-kde-apidox: + $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) + touch $@ + +common-install-indep:: common-install-kde-apidox +common-install-kde-apidox:: + $(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox) + +cleanbuilddir:: + -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR)) + +clean:: +ifndef _cdbs_class_cmake + if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \ + cd $(DEB_SRCDIR); \ + find . -name Makefile.in -print | \ + xargs --no-run-if-empty rm -f; \ + rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \ + configure configure.files configure.in stamp-h.in \ + subdirs; \ + fi +endif + rm -f .tdepkginfo + rm -f debian/stamp-kde-apidox + rm -f debian/stamp-cvs-make + +endif diff --git a/dilos/dependencies/avahi-tqt/debian/cdbs/versions.pl b/dilos/dependencies/avahi-tqt/debian/cdbs/versions.pl new file mode 100644 index 000000000..1b110f7af --- /dev/null +++ b/dilos/dependencies/avahi-tqt/debian/cdbs/versions.pl @@ -0,0 +1,19 @@ +#!/usr/bin/env perl + +use strict; +use warnings; + +my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`; +my ($version3, $version3_next); +my ($version2, $version2_next); + +($version3 = $version) =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/; +($version2 = $version3) =~ s/\.[^.]+$//; + +($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e; +($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e; + +print "TDE-Version3=$version3\n"; +print "TDE-Version2=$version2\n"; +print "TDE-Next-Version3=$version3_next\n"; +print "TDE-Next-Version2=$version2_next\n"; diff --git a/dilos/dependencies/avahi-tqt/debian/control b/dilos/dependencies/avahi-tqt/debian/control index b3b68b176..cb06b6e20 100644 --- a/dilos/dependencies/avahi-tqt/debian/control +++ b/dilos/dependencies/avahi-tqt/debian/control @@ -3,10 +3,9 @@ Section: net Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> -Build-Depends: debhelper (>= 9~), - cmake, +Build-Depends: cdbs, debhelper (>= 9~), quilt, + cmake, ninja-build, gcc, - cdbs, pkg-config, libtqtinterface-dev, libavahi-common-dev, diff --git a/dilos/dependencies/avahi-tqt/debian/patches/series b/dilos/dependencies/avahi-tqt/debian/patches/series new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/dilos/dependencies/avahi-tqt/debian/patches/series diff --git a/dilos/dependencies/avahi-tqt/debian/rules b/dilos/dependencies/avahi-tqt/debian/rules index 0ecbf4f4d..7ef42f747 100755 --- a/dilos/dependencies/avahi-tqt/debian/rules +++ b/dilos/dependencies/avahi-tqt/debian/rules @@ -2,22 +2,13 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk +include debian/cdbs/debian-tde.mk # Ensure at build time that the library has no dependencies on undefined # symbols, and speed up loading. export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,-z,defs # -Wl,-O1 -# The default gzip compressor has been changed in dpkg >= 1.17.0. -deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ - sed -e "s|.*version ||" -e "s| .*||" | \ - xargs -r dpkg --compare-versions 1.17.0 lt \ - && echo xz || echo gzip) -ifeq ($(deb_default_compress),gzip) -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) -endif - # Build options DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_SKIP_RPATH="OFF" \ diff --git a/dilos/dependencies/dbus-1-tqt/debian/control b/dilos/dependencies/dbus-1-tqt/debian/control index 01c10d2ba..8bbc68466 100644 --- a/dilos/dependencies/dbus-1-tqt/debian/control +++ b/dilos/dependencies/dbus-1-tqt/debian/control @@ -2,7 +2,7 @@ Source: dbus-1-tqt Section: devel Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: cdbs (>= 0.4.43), debhelper (>= 9~), quilt, libtqtinterface-dev, libdbus-1-dev (>= 0.90), cmake +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, libtqtinterface-dev, libdbus-1-dev (>= 0.90) Build-Depends-Indep: doxygen, graphviz Standards-Version: 3.8.3 diff --git a/dilos/dependencies/dbus-tqt/debian/cdbs/debian-tde.mk b/dilos/dependencies/dbus-tqt/debian/cdbs/debian-tde.mk new file mode 100644 index 000000000..f36e3527c --- /dev/null +++ b/dilos/dependencies/dbus-tqt/debian/cdbs/debian-tde.mk @@ -0,0 +1,246 @@ +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2003 Christopher L Cheney <ccheney@debian.org> +# Copyright © 2019 TDE Team +# Description: A class for TDE packages; sets TDE environment variables, etc +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2, or (at +# your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +# 02111-1307 USA. + +ifndef _cdbs_bootstrap +_cdbs_scripts_path ?= /usr/lib/cdbs +_cdbs_rules_path ?= /usr/share/cdbs/1/rules +_cdbs_class_path ?= /usr/share/cdbs/1/class +endif + +ifndef _cdbs_class_debian-qt-kde +_cdbs_class_debian-qt-kde := 1 + +# for dh_icons +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4) + +# Note: This _must_ be included before autotools.mk, or it won't work. +common-configure-arch common-configure-indep:: debian/stamp-cvs-make +debian/stamp-cvs-make: +ifndef _cdbs_class_cmake + cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in +ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" "" + cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh +endif +ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" "" + cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh +endif + $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; +endif + touch debian/stamp-cvs-make + +include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix) + +ifdef _cdbs_tarball_dir +DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE) +else +DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) +endif + +ifndef _cdbs_class_cmake +include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) +endif + +ifdef _cdbs_class_cmake +ifneq "$(wildcard /usr/bin/ninja)" "" +MAKE = ninja -v +DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR) +DEB_MAKE_INSTALL_TARGET = install +DEB_CMAKE_NORMAL_ARGS += -GNinja +endif +endif + +ifndef _cdbs_rules_patchsys_quilt +DEB_PATCHDIRS := debian/patches/common debian/patches +endif + +export kde_cgidir = \$${libdir}/cgi-bin +export kde_confdir = \$${sysconfdir}/trinity +export kde_htmldir = \$${datadir}/doc/tde/HTML + +DEB_KDE_ENABLE_FINAL := yes +DEB_INSTALL_DOCS_ALL := + +DEB_DH_MAKESHLIBS_ARGS_ALL := -V +DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib) + +DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" +DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el + +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + +ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb + ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) + cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,) + else + cdbs_kde_enable_final = + endif +endif + +ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_final = + cdbs_kde_enable_debug = --enable-debug=yes +else + cdbs_kde_enable_debug = --disable-debug +endif + +ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_debug = --enable-debug=full +endif + +DEB_BUILD_PARALLEL ?= true + +cdbs_configure_flags += \ + --with-qt-dir=/usr/share/qt3 \ + --disable-rpath \ + --with-xinerama \ + $(cdbs_kde_enable_final) \ + $(cdbs_kde_enable_debug) + + +# This is a convenience target for calling manually. +# It's not part of the build process. +buildprep: clean apply-patches +ifndef _cdbs_class_cmake + $(MAKE) -f admin/Makefile.common dist +endif + debian/rules clean + +.tdepkginfo: + echo "# TDE package information" >.tdepkginfo + dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo + dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo + date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo + +post-patches:: .tdepkginfo + +common-build-arch:: debian/stamp-man-pages +debian/stamp-man-pages: + if ! test -d debian/man/out; then mkdir -p debian/man/out; fi + for f in $$(find debian/man -name '*.sgml'); do \ + docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \ + done + for f in $$(find debian/man -name '*.man'); do \ + soelim -I debian/man $$f \ + > debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \ + done + touch debian/stamp-man-pages + +common-binary-indep:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_INDEP_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + +common-binary-arch:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_ARCH_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + # update multi-arch path in install files + ls -d debian/* | \ + grep -E "(install|links)$$" | \ + while read a; do \ + [ -d $$a ] || [ -f $$a.arch ] || \ + ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \ + sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \ + done + +clean:: + rm -rf debian/man/out + -rmdir debian/man + rm -f debian/stamp-man-pages + rm -rf debian/shlibs-check + # revert multi-arch path in install files + ls -d debian/* | \ + grep -E "(install|links)$$" | \ + while read a; do \ + [ ! -f $$a.arch ] || \ + mv $$a.arch $$a; \ + done + +$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: + if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi + if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi + if test -e debian/$(cdbs_curpkg).lintian; then \ + install -p -D -m644 debian/$(cdbs_curpkg).lintian \ + debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \ + fi + if test -e debian/$(cdbs_curpkg).presubj; then \ + install -p -D -m644 debian/$(cdbs_curpkg).presubj \ + debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ + fi + +binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: + set -e; \ + for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \ + pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \ + echo Building $$pkg HTML docs...; \ + mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + /opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \ + done + for pkg in $(DOC_HTML_PRUNE) ; do \ + rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + done + +common-build-indep:: debian/stamp-kde-apidox +debian/stamp-kde-apidox: + $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) + touch $@ + +common-install-indep:: common-install-kde-apidox +common-install-kde-apidox:: + $(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox) + +cleanbuilddir:: + -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR)) + +clean:: +ifndef _cdbs_class_cmake + if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \ + cd $(DEB_SRCDIR); \ + find . -name Makefile.in -print | \ + xargs --no-run-if-empty rm -f; \ + rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \ + configure configure.files configure.in stamp-h.in \ + subdirs; \ + fi +endif + rm -f .tdepkginfo + rm -f debian/stamp-kde-apidox + rm -f debian/stamp-cvs-make + +endif diff --git a/dilos/dependencies/dbus-tqt/debian/cdbs/versions.pl b/dilos/dependencies/dbus-tqt/debian/cdbs/versions.pl new file mode 100644 index 000000000..1b110f7af --- /dev/null +++ b/dilos/dependencies/dbus-tqt/debian/cdbs/versions.pl @@ -0,0 +1,19 @@ +#!/usr/bin/env perl + +use strict; +use warnings; + +my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`; +my ($version3, $version3_next); +my ($version2, $version2_next); + +($version3 = $version) =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/; +($version2 = $version3) =~ s/\.[^.]+$//; + +($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e; +($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e; + +print "TDE-Version3=$version3\n"; +print "TDE-Version2=$version2\n"; +print "TDE-Next-Version3=$version3_next\n"; +print "TDE-Next-Version2=$version2_next\n"; diff --git a/dilos/dependencies/dbus-tqt/debian/control b/dilos/dependencies/dbus-tqt/debian/control index 4bd589370..221bd5ca1 100644 --- a/dilos/dependencies/dbus-tqt/debian/control +++ b/dilos/dependencies/dbus-tqt/debian/control @@ -3,25 +3,9 @@ Section: devel Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> Uploaders: Sjoerd Simons <sjoerd@debian.org>, Sebastian Drge <slomo@ubuntu.com> -Build-Depends: cdbs (>= 0.4.43), debhelper (>= 9~), quilt, libtqtinterface-dev, libdbus-1-dev (>= 0.90), cmake +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, libtqtinterface-dev, libdbus-1-dev (>= 0.90) Standards-Version: 3.8.3 -Package: libdbus-tqt-1-dev -Section: libdevel -Architecture: any -Replaces: libdbus-tqt-1-dev (<< 4:14.0.0~) -Breaks: libdbus-tqt-1-dev (<< 4:14.0.0~) -Depends: libdbus-tqt-1-1c2 (= ${source:Version}), libdbus-1-dev (>= 0.90), libtqtinterface-dev -Conflicts: dbus-tqt-1-dev -Description: simple interprocess messaging system (TQt interface) - D-BUS is a message bus, used for sending messages between applications. - Conceptually, it fits somewhere in between raw sockets and CORBA in - terms of complexity. - . - This package provides a TQt-style interface to D-BUS. - . - See the dbus description for more information about D-BUS in general. - Package: libdbus-tqt-1-1c2 Section: libs Architecture: any @@ -39,3 +23,18 @@ Description: simple interprocess messaging system (TQt-based shared library) . See the dbus description for more information about D-BUS in general. +Package: libdbus-tqt-1-dev +Section: libdevel +Architecture: any +Replaces: libdbus-tqt-1-dev (<< 4:14.0.0~) +Breaks: libdbus-tqt-1-dev (<< 4:14.0.0~) +Depends: libdbus-tqt-1-1c2 (= ${source:Version}), libdbus-1-dev (>= 0.90), libtqtinterface-dev +Conflicts: dbus-tqt-1-dev +Description: simple interprocess messaging system (TQt interface) + D-BUS is a message bus, used for sending messages between applications. + Conceptually, it fits somewhere in between raw sockets and CORBA in + terms of complexity. + . + This package provides a TQt-style interface to D-BUS. + . + See the dbus description for more information about D-BUS in general. diff --git a/dilos/dependencies/dbus-tqt/debian/docs b/dilos/dependencies/dbus-tqt/debian/docs new file mode 100644 index 000000000..6f83607c1 --- /dev/null +++ b/dilos/dependencies/dbus-tqt/debian/docs @@ -0,0 +1,3 @@ +AUTHORS +NEWS +README diff --git a/dilos/dependencies/dbus-tqt/debian/rules b/dilos/dependencies/dbus-tqt/debian/rules index 97cc52a52..570be2358 100755 --- a/dilos/dependencies/dbus-tqt/debian/rules +++ b/dilos/dependencies/dbus-tqt/debian/rules @@ -3,24 +3,20 @@ # Copyright © 2003 Daniel Stone <daniels@debian.org> # Copyright © 2006 Sjoerd Simons <sjoerd@debian.org> -#include /usr/share/cdbs/1/rules/patchsys-quilt.mk -include /usr/share/cdbs/1/rules/utils.mk include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk +include debian/cdbs/debian-tde.mk # Strict library versioning DEB_DH_MAKESHLIBS_ARGS_ALL := -V -# The default gzip compressor has been changed in dpkg >= 1.17.0. -deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ - sed -e "s|.*version ||" -e "s| .*||" | \ - xargs -r dpkg --compare-versions 1.17.0 lt \ - && echo xz || echo gzip) -ifeq ($(deb_default_compress),gzip) -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) -endif - -DEB_CMAKE_EXTRA_FLAGS += \ +# Build options +DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_C_COMPILER=gcc \ - -DLIB_SUFFIX="/$(DEB_HOST_MULTIARCH)" + -DLIB_SUFFIX="/$(DEB_HOST_MULTIARCH)" \ + -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_APIDOX_HTML_DIRECTORY="usr/share/doc/libdbus-1-tqt/HTML" \ + -DWITH_ALL_OPTIONS="ON" diff --git a/dilos/dependencies/libart-lgpl/debian/cdbs/debian-tde.mk b/dilos/dependencies/libart-lgpl/debian/cdbs/debian-tde.mk new file mode 100644 index 000000000..f36e3527c --- /dev/null +++ b/dilos/dependencies/libart-lgpl/debian/cdbs/debian-tde.mk @@ -0,0 +1,246 @@ +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2003 Christopher L Cheney <ccheney@debian.org> +# Copyright © 2019 TDE Team +# Description: A class for TDE packages; sets TDE environment variables, etc +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2, or (at +# your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +# 02111-1307 USA. + +ifndef _cdbs_bootstrap +_cdbs_scripts_path ?= /usr/lib/cdbs +_cdbs_rules_path ?= /usr/share/cdbs/1/rules +_cdbs_class_path ?= /usr/share/cdbs/1/class +endif + +ifndef _cdbs_class_debian-qt-kde +_cdbs_class_debian-qt-kde := 1 + +# for dh_icons +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4) + +# Note: This _must_ be included before autotools.mk, or it won't work. +common-configure-arch common-configure-indep:: debian/stamp-cvs-make +debian/stamp-cvs-make: +ifndef _cdbs_class_cmake + cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in +ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" "" + cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh +endif +ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" "" + cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh +endif + $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; +endif + touch debian/stamp-cvs-make + +include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix) + +ifdef _cdbs_tarball_dir +DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE) +else +DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) +endif + +ifndef _cdbs_class_cmake +include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) +endif + +ifdef _cdbs_class_cmake +ifneq "$(wildcard /usr/bin/ninja)" "" +MAKE = ninja -v +DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR) +DEB_MAKE_INSTALL_TARGET = install +DEB_CMAKE_NORMAL_ARGS += -GNinja +endif +endif + +ifndef _cdbs_rules_patchsys_quilt +DEB_PATCHDIRS := debian/patches/common debian/patches +endif + +export kde_cgidir = \$${libdir}/cgi-bin +export kde_confdir = \$${sysconfdir}/trinity +export kde_htmldir = \$${datadir}/doc/tde/HTML + +DEB_KDE_ENABLE_FINAL := yes +DEB_INSTALL_DOCS_ALL := + +DEB_DH_MAKESHLIBS_ARGS_ALL := -V +DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib) + +DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" +DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el + +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + +ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb + ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) + cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,) + else + cdbs_kde_enable_final = + endif +endif + +ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_final = + cdbs_kde_enable_debug = --enable-debug=yes +else + cdbs_kde_enable_debug = --disable-debug +endif + +ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_debug = --enable-debug=full +endif + +DEB_BUILD_PARALLEL ?= true + +cdbs_configure_flags += \ + --with-qt-dir=/usr/share/qt3 \ + --disable-rpath \ + --with-xinerama \ + $(cdbs_kde_enable_final) \ + $(cdbs_kde_enable_debug) + + +# This is a convenience target for calling manually. +# It's not part of the build process. +buildprep: clean apply-patches +ifndef _cdbs_class_cmake + $(MAKE) -f admin/Makefile.common dist +endif + debian/rules clean + +.tdepkginfo: + echo "# TDE package information" >.tdepkginfo + dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo + dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo + date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo + +post-patches:: .tdepkginfo + +common-build-arch:: debian/stamp-man-pages +debian/stamp-man-pages: + if ! test -d debian/man/out; then mkdir -p debian/man/out; fi + for f in $$(find debian/man -name '*.sgml'); do \ + docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \ + done + for f in $$(find debian/man -name '*.man'); do \ + soelim -I debian/man $$f \ + > debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \ + done + touch debian/stamp-man-pages + +common-binary-indep:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_INDEP_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + +common-binary-arch:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_ARCH_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + # update multi-arch path in install files + ls -d debian/* | \ + grep -E "(install|links)$$" | \ + while read a; do \ + [ -d $$a ] || [ -f $$a.arch ] || \ + ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \ + sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \ + done + +clean:: + rm -rf debian/man/out + -rmdir debian/man + rm -f debian/stamp-man-pages + rm -rf debian/shlibs-check + # revert multi-arch path in install files + ls -d debian/* | \ + grep -E "(install|links)$$" | \ + while read a; do \ + [ ! -f $$a.arch ] || \ + mv $$a.arch $$a; \ + done + +$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: + if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi + if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi + if test -e debian/$(cdbs_curpkg).lintian; then \ + install -p -D -m644 debian/$(cdbs_curpkg).lintian \ + debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \ + fi + if test -e debian/$(cdbs_curpkg).presubj; then \ + install -p -D -m644 debian/$(cdbs_curpkg).presubj \ + debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ + fi + +binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: + set -e; \ + for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \ + pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \ + echo Building $$pkg HTML docs...; \ + mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + /opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \ + done + for pkg in $(DOC_HTML_PRUNE) ; do \ + rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + done + +common-build-indep:: debian/stamp-kde-apidox +debian/stamp-kde-apidox: + $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) + touch $@ + +common-install-indep:: common-install-kde-apidox +common-install-kde-apidox:: + $(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox) + +cleanbuilddir:: + -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR)) + +clean:: +ifndef _cdbs_class_cmake + if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \ + cd $(DEB_SRCDIR); \ + find . -name Makefile.in -print | \ + xargs --no-run-if-empty rm -f; \ + rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \ + configure configure.files configure.in stamp-h.in \ + subdirs; \ + fi +endif + rm -f .tdepkginfo + rm -f debian/stamp-kde-apidox + rm -f debian/stamp-cvs-make + +endif diff --git a/dilos/dependencies/libart-lgpl/debian/cdbs/versions.pl b/dilos/dependencies/libart-lgpl/debian/cdbs/versions.pl new file mode 100644 index 000000000..1b110f7af --- /dev/null +++ b/dilos/dependencies/libart-lgpl/debian/cdbs/versions.pl @@ -0,0 +1,19 @@ +#!/usr/bin/env perl + +use strict; +use warnings; + +my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`; +my ($version3, $version3_next); +my ($version2, $version2_next); + +($version3 = $version) =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/; +($version2 = $version3) =~ s/\.[^.]+$//; + +($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e; +($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e; + +print "TDE-Version3=$version3\n"; +print "TDE-Version2=$version2\n"; +print "TDE-Next-Version3=$version3_next\n"; +print "TDE-Next-Version2=$version2_next\n"; diff --git a/dilos/dependencies/libart-lgpl/debian/control b/dilos/dependencies/libart-lgpl/debian/control index 2ea76f718..648ea6b30 100644 --- a/dilos/dependencies/libart-lgpl/debian/control +++ b/dilos/dependencies/libart-lgpl/debian/control @@ -3,8 +3,8 @@ Section: devel Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Josselin Mouette <joss@debian.org> +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build Standards-Version: 3.8.4 -Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake Package: libart-2.0-2 Architecture: any diff --git a/dilos/dependencies/libart-lgpl/debian/docs b/dilos/dependencies/libart-lgpl/debian/docs new file mode 100644 index 000000000..6f83607c1 --- /dev/null +++ b/dilos/dependencies/libart-lgpl/debian/docs @@ -0,0 +1,3 @@ +AUTHORS +NEWS +README diff --git a/dilos/dependencies/libart-lgpl/debian/rules b/dilos/dependencies/libart-lgpl/debian/rules index 27c129c80..449353fe1 100755 --- a/dilos/dependencies/libart-lgpl/debian/rules +++ b/dilos/dependencies/libart-lgpl/debian/rules @@ -2,21 +2,12 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk +include debian/cdbs/debian-tde.mk libart-2.0-N := $(shell sed -rn 's/^Package:[[:space:]]*(libart-2\.0-[0-9]+)[[:space:]]*$$/\1/p' debian/control) DEB_DH_MAKESHLIBS_ARGS_$(libart-2.0-N) += -V '$(libart-2.0-N)(>= 2.3.18)' -# The default gzip compressor has been changed in dpkg >= 1.17.0. -deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ - sed -e "s|.*version ||" -e "s| .*||" | \ - xargs -r dpkg --compare-versions 1.17.0 lt \ - && echo xz || echo gzip) -ifeq ($(deb_default_compress),gzip) -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) -endif - # Build options DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_SKIP_RPATH="OFF" \ diff --git a/dilos/dependencies/tqca-tls/debian/control b/dilos/dependencies/tqca-tls/debian/control index 121896f37..1c74ec299 100644 --- a/dilos/dependencies/tqca-tls/debian/control +++ b/dilos/dependencies/tqca-tls/debian/control @@ -2,7 +2,7 @@ Source: tqca-tls Section: libs Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, libtqca-dev, libssl-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, libtqca-dev, libssl-dev Standards-Version: 3.8.4 Package: tqca-tls diff --git a/dilos/dependencies/tqca-tls/debian/patches/series b/dilos/dependencies/tqca-tls/debian/patches/series new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/dilos/dependencies/tqca-tls/debian/patches/series diff --git a/dilos/dependencies/tqca/debian/control b/dilos/dependencies/tqca/debian/control index 4b5fdb7cb..df897123b 100644 --- a/dilos/dependencies/tqca/debian/control +++ b/dilos/dependencies/tqca/debian/control @@ -2,7 +2,7 @@ Source: libtqca Section: libs Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, libtqtinterface-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, libtqtinterface-dev Standards-Version: 3.8.3 Package: libtqca diff --git a/dilos/dependencies/tqca/debian/patches/series b/dilos/dependencies/tqca/debian/patches/series new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/dilos/dependencies/tqca/debian/patches/series diff --git a/dilos/dependencies/tqtinterface/debian/cdbs/debian-tde.mk b/dilos/dependencies/tqtinterface/debian/cdbs/debian-tde.mk new file mode 100644 index 000000000..f36e3527c --- /dev/null +++ b/dilos/dependencies/tqtinterface/debian/cdbs/debian-tde.mk @@ -0,0 +1,246 @@ +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2003 Christopher L Cheney <ccheney@debian.org> +# Copyright © 2019 TDE Team +# Description: A class for TDE packages; sets TDE environment variables, etc +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2, or (at +# your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +# 02111-1307 USA. + +ifndef _cdbs_bootstrap +_cdbs_scripts_path ?= /usr/lib/cdbs +_cdbs_rules_path ?= /usr/share/cdbs/1/rules +_cdbs_class_path ?= /usr/share/cdbs/1/class +endif + +ifndef _cdbs_class_debian-qt-kde +_cdbs_class_debian-qt-kde := 1 + +# for dh_icons +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4) + +# Note: This _must_ be included before autotools.mk, or it won't work. +common-configure-arch common-configure-indep:: debian/stamp-cvs-make +debian/stamp-cvs-make: +ifndef _cdbs_class_cmake + cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in +ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" "" + cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh +endif +ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" "" + cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh +endif + $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; +endif + touch debian/stamp-cvs-make + +include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix) + +ifdef _cdbs_tarball_dir +DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE) +else +DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) +endif + +ifndef _cdbs_class_cmake +include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) +endif + +ifdef _cdbs_class_cmake +ifneq "$(wildcard /usr/bin/ninja)" "" +MAKE = ninja -v +DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR) +DEB_MAKE_INSTALL_TARGET = install +DEB_CMAKE_NORMAL_ARGS += -GNinja +endif +endif + +ifndef _cdbs_rules_patchsys_quilt +DEB_PATCHDIRS := debian/patches/common debian/patches +endif + +export kde_cgidir = \$${libdir}/cgi-bin +export kde_confdir = \$${sysconfdir}/trinity +export kde_htmldir = \$${datadir}/doc/tde/HTML + +DEB_KDE_ENABLE_FINAL := yes +DEB_INSTALL_DOCS_ALL := + +DEB_DH_MAKESHLIBS_ARGS_ALL := -V +DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib) + +DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" +DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el + +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + +ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb + ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) + cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,) + else + cdbs_kde_enable_final = + endif +endif + +ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_final = + cdbs_kde_enable_debug = --enable-debug=yes +else + cdbs_kde_enable_debug = --disable-debug +endif + +ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_debug = --enable-debug=full +endif + +DEB_BUILD_PARALLEL ?= true + +cdbs_configure_flags += \ + --with-qt-dir=/usr/share/qt3 \ + --disable-rpath \ + --with-xinerama \ + $(cdbs_kde_enable_final) \ + $(cdbs_kde_enable_debug) + + +# This is a convenience target for calling manually. +# It's not part of the build process. +buildprep: clean apply-patches +ifndef _cdbs_class_cmake + $(MAKE) -f admin/Makefile.common dist +endif + debian/rules clean + +.tdepkginfo: + echo "# TDE package information" >.tdepkginfo + dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo + dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo + date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo + +post-patches:: .tdepkginfo + +common-build-arch:: debian/stamp-man-pages +debian/stamp-man-pages: + if ! test -d debian/man/out; then mkdir -p debian/man/out; fi + for f in $$(find debian/man -name '*.sgml'); do \ + docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \ + done + for f in $$(find debian/man -name '*.man'); do \ + soelim -I debian/man $$f \ + > debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \ + done + touch debian/stamp-man-pages + +common-binary-indep:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_INDEP_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + +common-binary-arch:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_ARCH_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + # update multi-arch path in install files + ls -d debian/* | \ + grep -E "(install|links)$$" | \ + while read a; do \ + [ -d $$a ] || [ -f $$a.arch ] || \ + ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \ + sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \ + done + +clean:: + rm -rf debian/man/out + -rmdir debian/man + rm -f debian/stamp-man-pages + rm -rf debian/shlibs-check + # revert multi-arch path in install files + ls -d debian/* | \ + grep -E "(install|links)$$" | \ + while read a; do \ + [ ! -f $$a.arch ] || \ + mv $$a.arch $$a; \ + done + +$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: + if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi + if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi + if test -e debian/$(cdbs_curpkg).lintian; then \ + install -p -D -m644 debian/$(cdbs_curpkg).lintian \ + debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \ + fi + if test -e debian/$(cdbs_curpkg).presubj; then \ + install -p -D -m644 debian/$(cdbs_curpkg).presubj \ + debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ + fi + +binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: + set -e; \ + for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \ + pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \ + echo Building $$pkg HTML docs...; \ + mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + /opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \ + done + for pkg in $(DOC_HTML_PRUNE) ; do \ + rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + done + +common-build-indep:: debian/stamp-kde-apidox +debian/stamp-kde-apidox: + $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) + touch $@ + +common-install-indep:: common-install-kde-apidox +common-install-kde-apidox:: + $(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox) + +cleanbuilddir:: + -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR)) + +clean:: +ifndef _cdbs_class_cmake + if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \ + cd $(DEB_SRCDIR); \ + find . -name Makefile.in -print | \ + xargs --no-run-if-empty rm -f; \ + rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \ + configure configure.files configure.in stamp-h.in \ + subdirs; \ + fi +endif + rm -f .tdepkginfo + rm -f debian/stamp-kde-apidox + rm -f debian/stamp-cvs-make + +endif diff --git a/dilos/dependencies/tqtinterface/debian/cdbs/versions.pl b/dilos/dependencies/tqtinterface/debian/cdbs/versions.pl new file mode 100644 index 000000000..1b110f7af --- /dev/null +++ b/dilos/dependencies/tqtinterface/debian/cdbs/versions.pl @@ -0,0 +1,19 @@ +#!/usr/bin/env perl + +use strict; +use warnings; + +my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`; +my ($version3, $version3_next); +my ($version2, $version2_next); + +($version3 = $version) =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/; +($version2 = $version3) =~ s/\.[^.]+$//; + +($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e; +($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e; + +print "TDE-Version3=$version3\n"; +print "TDE-Version2=$version2\n"; +print "TDE-Next-Version3=$version3_next\n"; +print "TDE-Next-Version2=$version2_next\n"; diff --git a/dilos/dependencies/tqtinterface/debian/control b/dilos/dependencies/tqtinterface/debian/control index 5e5dd3887..2298ea76f 100644 --- a/dilos/dependencies/tqtinterface/debian/control +++ b/dilos/dependencies/tqtinterface/debian/control @@ -2,7 +2,7 @@ Source: libtqtinterface Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: debhelper (>= 9~), quilt, libtqt3-mt-dev, tqt3-apps-dev, cmake, cdbs +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, libtqt3-mt-dev, tqt3-apps-dev Standards-Version: 3.8.4 Package: libtqtinterface diff --git a/dilos/dependencies/tqtinterface/debian/docs b/dilos/dependencies/tqtinterface/debian/docs index e69de29bb..ca0272abf 100644 --- a/dilos/dependencies/tqtinterface/debian/docs +++ b/dilos/dependencies/tqtinterface/debian/docs @@ -0,0 +1,3 @@ +AUTHORS +README +TODO diff --git a/dilos/dependencies/tqtinterface/debian/rules b/dilos/dependencies/tqtinterface/debian/rules index 1fab67240..b4e01120d 100755 --- a/dilos/dependencies/tqtinterface/debian/rules +++ b/dilos/dependencies/tqtinterface/debian/rules @@ -1,32 +1,11 @@ #! /usr/bin/make -f -# see debian/rules file for tdesvn for cmake examples include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk -#include /usr/share/cdbs/1/rules/patchsys-quilt.mk -include /usr/share/cdbs/1/rules/utils.mk - -DEB_KDE_APIDOX := yes +include debian/cdbs/debian-tde.mk version=Debian Package $(DEB_VERSION) DEB_OPT_FLAG += -DDEBIAN_VERSION=$(DEB_VERSION) -DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) - -# The default gzip compressor has been changed in dpkg >= 1.17.0. -deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ - sed -e "s|.*version ||" -e "s| .*||" | \ - xargs -r dpkg --compare-versions 1.17.0 lt \ - && echo xz || echo gzip) -ifeq ($(deb_default_compress),gzip) -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) -endif - -# Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to -# never build in parallel, regardless of DEB_BUILD_OPTIONS. -DEB_BUILD_PARALLEL ?= true - -DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) DEB_CMAKE_EXTRA_FLAGS := \ -DPKGCONFIG_INSTALL_DIR="/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig" \ diff --git a/dilos/libraries/libtdeldap/debian/control b/dilos/libraries/libtdeldap/debian/control index 8a460e48e..730e4392b 100644 --- a/dilos/libraries/libtdeldap/debian/control +++ b/dilos/libraries/libtdeldap/debian/control @@ -2,7 +2,7 @@ Source: libtdeldap-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, tdelibs14-trinity-dev, libldap2-dev, heimdal-multidev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, libldap2-dev, heimdal-multidev Standards-Version: 3.8.4 Package: libtdeldap-trinity diff --git a/ubuntu/_base/applications/abakus/debian/control b/ubuntu/_base/applications/abakus/debian/control index 296556487..6a91bb139 100644 --- a/ubuntu/_base/applications/abakus/debian/control +++ b/ubuntu/_base/applications/abakus/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Steffen Joeris <steffen.joeris@skolelinux.de> -Build-Depends: autotools-dev, debhelper (>= 9~), quilt, cdbs (>= 0.4.0), cmake, imagemagick, tdelibs14-trinity-dev, chrpath, bison, flex +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, imagemagick, bison, flex Standards-Version: 3.8.4 Package: abakus-trinity diff --git a/ubuntu/_base/applications/abakus/debian/rules b/ubuntu/_base/applications/abakus/debian/rules index a9d88368b..3c72c1e14 100755 --- a/ubuntu/_base/applications/abakus/debian/rules +++ b/ubuntu/_base/applications/abakus/debian/rules @@ -39,7 +39,6 @@ common-build-arch:: debian/abakus.xpm common-install-arch:: install -D -m 644 debian/abakus.xpm debian/abakus-trinity/opt/trinity/share/pixmaps/abakus.xpm - chrpath -d debian/abakus-trinity/opt/trinity/bin/abakus dh_icons -pabakus-trinity binary-install/abakus-trinity:: diff --git a/ubuntu/_base/applications/amarok/debian/control b/ubuntu/_base/applications/amarok/debian/control index 33a6ca78c..29bdda800 100644 --- a/ubuntu/_base/applications/amarok/debian/control +++ b/ubuntu/_base/applications/amarok/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Modestas Vainius <modestas@vainius.eu> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, bzip2, +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, bzip2, tdelibs14-trinity-dev, tdebase-trinity-dev, libakode-dev, libxine2-dev | libxine-dev, libdbus-tqt-1-dev, libtag1-dev, libsqlite3-dev, diff --git a/ubuntu/_base/applications/basket/debian/control b/ubuntu/_base/applications/basket/debian/control index 94be4fa92..363e8a251 100644 --- a/ubuntu/_base/applications/basket/debian/control +++ b/ubuntu/_base/applications/basket/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Sune Vuorela <debian@pusling.com> -Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, tdelibs14-trinity-dev, tdepim-trinity-dev, libgpgme11-dev | libgpgme-dev (>= 1.0~) +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, tdepim-trinity-dev, libgpgme11-dev | libgpgme-dev (>= 1.0~) Standards-Version: 3.8.4 Package: basket-trinity diff --git a/ubuntu/_base/applications/codeine/debian/control b/ubuntu/_base/applications/codeine/debian/control index 541184a6d..baa0ce54c 100644 --- a/ubuntu/_base/applications/codeine/debian/control +++ b/ubuntu/_base/applications/codeine/debian/control @@ -2,7 +2,7 @@ Source: codeine-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, tdelibs-trinity-dev, libxine2-dev | libxine-dev, libxtst-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs-trinity-dev, libxine2-dev | libxine-dev, libxtst-dev Standards-Version: 3.7.3 Homepage: http://codeine.sourceforge.net/ diff --git a/ubuntu/_base/applications/compizconfig-backend-tdeconfig/debian/control b/ubuntu/_base/applications/compizconfig-backend-tdeconfig/debian/control index 3a51ad49e..984629f4b 100644 --- a/ubuntu/_base/applications/compizconfig-backend-tdeconfig/debian/control +++ b/ubuntu/_base/applications/compizconfig-backend-tdeconfig/debian/control @@ -2,7 +2,7 @@ Source: compizconfig-backend-tdeconfig-trinity Section: libs Priority: extra Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, compiz-trinity-dev, pkg-config, tdelibs14-trinity-dev, libcompizconfig0-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, compiz-trinity-dev, pkg-config, tdelibs14-trinity-dev, libcompizconfig0-trinity-dev Standards-Version: 3.8.4 Package: compizconfig-backend-tdeconfig-trinity diff --git a/ubuntu/_base/applications/dolphin/debian/control b/ubuntu/_base/applications/dolphin/debian/control index 3474f76f5..9879eafc6 100644 --- a/ubuntu/_base/applications/dolphin/debian/control +++ b/ubuntu/_base/applications/dolphin/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Anthony Mercatante <tonio@ubuntu.com> -Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, tdelibs14-trinity-dev, libkonq4-trinity-dev, tdebase-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, libkonq4-trinity-dev, tdebase-trinity-dev Standards-Version: 3.8.4 Package: dolphin-trinity diff --git a/ubuntu/_base/applications/filelight/debian/control b/ubuntu/_base/applications/filelight/debian/control index 2c6bbea62..73a83dcea 100644 --- a/ubuntu/_base/applications/filelight/debian/control +++ b/ubuntu/_base/applications/filelight/debian/control @@ -5,7 +5,7 @@ Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org> Uploaders: Ral Snchez Siles <rasasi78@gmail.com> Standards-Version: 3.8.4 -Build-Depends: debhelper (>= 9~), cdbs, cmake, tdelibs14-trinity-dev, xutils, chrpath, quilt (>= 0.40), libltdl-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, xutils Homepage: http://www.methylblue.com/filelight/ Package: filelight-trinity diff --git a/ubuntu/_base/applications/gtk-qt-engine/debian/control b/ubuntu/_base/applications/gtk-qt-engine/debian/control index d7ffbdf2e..45aebffa5 100644 --- a/ubuntu/_base/applications/gtk-qt-engine/debian/control +++ b/ubuntu/_base/applications/gtk-qt-engine/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Bastian Venthur <venthur@debian.org> -Build-Depends: debhelper (>= 9~), quilt, cdbs, tdelibs14-trinity-dev, libgtk2.0-dev, cmake, libgtk2.0-dev (>= 2.10.1) +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, libgtk2.0-dev (>= 2.10.1) Standards-Version: 3.8.4 Package: gtk-qt-engine-trinity diff --git a/ubuntu/_base/applications/gwenview-i18n/debian/control b/ubuntu/_base/applications/gwenview-i18n/debian/control index 2f7c72b53..0890faaaa 100644 --- a/ubuntu/_base/applications/gwenview-i18n/debian/control +++ b/ubuntu/_base/applications/gwenview-i18n/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> Build-Depends-Indep: tdelibs14-trinity-dev -Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build Standards-Version: 3.8.0 Homepage: http://gwenview.sourceforge.net diff --git a/ubuntu/_base/applications/k3b-i18n/debian/control b/ubuntu/_base/applications/k3b-i18n/debian/control index 81fb1a805..7cc131110 100644 --- a/ubuntu/_base/applications/k3b-i18n/debian/control +++ b/ubuntu/_base/applications/k3b-i18n/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> Uploaders: Francois Marier <francois@debian.org>, Fathi Boudra <fabo@debian.org> -Build-Depends: debhelper (>= 9~), cdbs, quilt, cmake +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build Build-Depends-Indep: tdelibs14-trinity-dev Standards-Version: 3.8.3 diff --git a/ubuntu/_base/applications/k3b/debian/control b/ubuntu/_base/applications/k3b/debian/control index e6c93b2ba..37439748e 100644 --- a/ubuntu/_base/applications/k3b/debian/control +++ b/ubuntu/_base/applications/k3b/debian/control @@ -5,8 +5,8 @@ Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org> Uploaders: Francois Marier <francois@debian.org>, Fathi Boudra <fabo@debian.org> Build-Depends: - debhelper (>= 9~), quilt, cdbs (>= 0.4.52ubuntu18), cmake, chrpath, - tdelibs14-trinity-dev (>= 3.5.0), libdbus-tqt-1-dev, + cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, + tdelibs14-trinity-dev, libdbus-tqt-1-dev, libdvdread-dev, libasound2-dev, lame, libmp3lame-dev, libflac++-dev (>= 1.1.2), flac, libpopt-dev, libmpcdec-dev, libtag1-dev (>= 1.4-3), libmad0-dev, libavformat-dev, libavcodec-dev, libvorbis-dev, libsamplerate0-dev, libsndfile1-dev diff --git a/ubuntu/_base/applications/kaffeine-mozilla/debian/control b/ubuntu/_base/applications/kaffeine-mozilla/debian/control index 584421c43..7648d5ca0 100644 --- a/ubuntu/_base/applications/kaffeine-mozilla/debian/control +++ b/ubuntu/_base/applications/kaffeine-mozilla/debian/control @@ -3,7 +3,7 @@ Section: web Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> Uploaders: Riku Voipio <riku.voipio@iki.fi> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, pkg-config, libxaw7-dev, libnspr4-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, pkg-config, libxaw7-dev, libnspr4-dev Standards-Version: 3.8.4 Package: kaffeine-mozilla-trinity diff --git a/ubuntu/_base/applications/kaffeine/debian/control b/ubuntu/_base/applications/kaffeine/debian/control index a6398e4c4..1da33a4fb 100644 --- a/ubuntu/_base/applications/kaffeine/debian/control +++ b/ubuntu/_base/applications/kaffeine/debian/control @@ -5,7 +5,7 @@ Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org> Uploaders: Riku Voipio <riku.voipio@iki.fi>, Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, tdelibs14-trinity-dev, +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, libcdparanoia0-dev, libogg-dev, libxine2-dev | libxine-dev (>= 1.1.7), libxcb1-dev, libxtst-dev, libgstreamer1.0-dev | libgstreamer0.10-dev, libgstreamer-plugins-base1.0-dev | libgstreamer-plugins-base0.10-dev, diff --git a/ubuntu/_base/applications/kasablanca/debian/control b/ubuntu/_base/applications/kasablanca/debian/control index 45ad09182..04aa9de09 100644 --- a/ubuntu/_base/applications/kasablanca/debian/control +++ b/ubuntu/_base/applications/kasablanca/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, tdelibs14-trinity-dev, libssl-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, libssl-dev Standards-Version: 3.8.3 Package: kasablanca-trinity diff --git a/ubuntu/_base/applications/katapult/debian/control b/ubuntu/_base/applications/katapult/debian/control index 3ae989076..edc2a17fe 100644 --- a/ubuntu/_base/applications/katapult/debian/control +++ b/ubuntu/_base/applications/katapult/debian/control @@ -2,7 +2,7 @@ Source: katapult-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: cdbs (>= 0.4.46ubuntu5), debhelper (>= 9~), quilt, cmake, tdelibs14-trinity-dev, libxi-dev, sharutils +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, libxi-dev Standards-Version: 3.8.4 Package: katapult-trinity diff --git a/ubuntu/_base/applications/kbarcode/debian/control b/ubuntu/_base/applications/kbarcode/debian/control index 31c7739db..239a009bc 100644 --- a/ubuntu/_base/applications/kbarcode/debian/control +++ b/ubuntu/_base/applications/kbarcode/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.4 Package: kbarcode-trinity diff --git a/ubuntu/_base/applications/kbfx/debian/control b/ubuntu/_base/applications/kbfx/debian/control index 1c57e56b0..1f47343e6 100644 --- a/ubuntu/_base/applications/kbfx/debian/control +++ b/ubuntu/_base/applications/kbfx/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.4 Package: kbfx-trinity diff --git a/ubuntu/_base/applications/kbibtex/debian/control b/ubuntu/_base/applications/kbibtex/debian/control index 56c0d7f2e..bc7d8af56 100644 --- a/ubuntu/_base/applications/kbibtex/debian/control +++ b/ubuntu/_base/applications/kbibtex/debian/control @@ -2,7 +2,7 @@ Source: kbibtex-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, tdelibs14-trinity-dev (>= 3.3.2), libxslt1-dev, libyaz-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev (>= 3.3.2), libxslt1-dev, libyaz-dev Standards-Version: 3.9.0 Homepage: http://www.unix-ag.uni-kl.de/~fischer/kbibtex Vcs-Browser: http://git.debian.org/?p=pkg-exppsy/kbibtex.git diff --git a/ubuntu/_base/applications/kbiff/debian/control b/ubuntu/_base/applications/kbiff/debian/control index 15753cf08..bef326207 100644 --- a/ubuntu/_base/applications/kbiff/debian/control +++ b/ubuntu/_base/applications/kbiff/debian/control @@ -2,7 +2,7 @@ Source: kbiff-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, tdelibs14-trinity-dev (>= 4:3.4.2) +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev (>= 4:3.4.2) Standards-Version: 3.9.1 Package: kbiff-trinity diff --git a/ubuntu/_base/applications/kbookreader/debian/control b/ubuntu/_base/applications/kbookreader/debian/control index 8dcc648da..d4b43da8d 100644 --- a/ubuntu/_base/applications/kbookreader/debian/control +++ b/ubuntu/_base/applications/kbookreader/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Anthony Mercatante <tonio@ubuntu.com> -Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.4 Homepage: http://k9copy.sourceforge.net/ diff --git a/ubuntu/_base/applications/kchmviewer/debian/control b/ubuntu/_base/applications/kchmviewer/debian/control index 03258c555..eec956b27 100644 --- a/ubuntu/_base/applications/kchmviewer/debian/control +++ b/ubuntu/_base/applications/kchmviewer/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Jose Luis Tallon <jltallon@adv-solutions.net> -Build-Depends: debhelper (>= 9~), cdbs, quilt, cmake, tdelibs14-trinity-dev, libchm-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, libchm-dev Standards-Version: 3.8.4 Homepage: http://www.kchmviewer.net/ diff --git a/ubuntu/_base/applications/kcmautostart/debian/control b/ubuntu/_base/applications/kcmautostart/debian/control index 5449f2002..b1ae1750c 100644 --- a/ubuntu/_base/applications/kcmautostart/debian/control +++ b/ubuntu/_base/applications/kcmautostart/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Raphaël Pinson <raphink@raphink.net> -Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.4 Package: kcontrol-autostart-trinity diff --git a/ubuntu/_base/applications/kcmldap/debian/control b/ubuntu/_base/applications/kcmldap/debian/control index badcdac78..0654ea684 100644 --- a/ubuntu/_base/applications/kcmldap/debian/control +++ b/ubuntu/_base/applications/kcmldap/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Raphaël Pinson <raphink@raphink.net> -Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, tdelibs14-trinity-dev, libtdeldap-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, libtdeldap-trinity-dev Standards-Version: 3.8.4 Package: kcontrol-ldap-bonding-trinity diff --git a/ubuntu/_base/applications/kcmldapcontroller/debian/control b/ubuntu/_base/applications/kcmldapcontroller/debian/control index 61d8b6a0b..596ab76b8 100644 --- a/ubuntu/_base/applications/kcmldapcontroller/debian/control +++ b/ubuntu/_base/applications/kcmldapcontroller/debian/control @@ -2,7 +2,7 @@ Source: kcontrol-ldap-controller-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, tdelibs14-trinity-dev, libldap2-dev, slapi-dev | slapd, libtdeldap-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, libldap2-dev, slapi-dev | slapd, libtdeldap-trinity-dev Standards-Version: 3.8.4 Package: kcontrol-ldap-controller-trinity diff --git a/ubuntu/_base/applications/kcmldapmanager/debian/control b/ubuntu/_base/applications/kcmldapmanager/debian/control index 2ced21c69..c07c7932e 100644 --- a/ubuntu/_base/applications/kcmldapmanager/debian/control +++ b/ubuntu/_base/applications/kcmldapmanager/debian/control @@ -2,7 +2,7 @@ Source: kcontrol-ldap-manager-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: debhelper (>= 9~), cdbs, quilt, cmake, tdelibs14-trinity-dev, libldap2-dev, libtdeldap-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, libldap2-dev, libtdeldap-trinity-dev Standards-Version: 3.8.4 Package: kcontrol-ldap-manager-trinity diff --git a/ubuntu/_base/applications/kcpuload/debian/control b/ubuntu/_base/applications/kcpuload/debian/control index 9fe3d3372..a50b32671 100644 --- a/ubuntu/_base/applications/kcpuload/debian/control +++ b/ubuntu/_base/applications/kcpuload/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Helen Faulkner <helen@debian.org> -Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.4 Package: kcpuload-trinity diff --git a/ubuntu/_base/applications/kdbg/debian/control b/ubuntu/_base/applications/kdbg/debian/control index 4911d1bb4..8c3f65078 100644 --- a/ubuntu/_base/applications/kdbg/debian/control +++ b/ubuntu/_base/applications/kdbg/debian/control @@ -2,7 +2,7 @@ Source: kdbg-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.4 Homepage: http://www.kdbg.org/ diff --git a/ubuntu/_base/applications/kdbusnotification/debian/control b/ubuntu/_base/applications/kdbusnotification/debian/control index 6f5faf327..126d0fe27 100644 --- a/ubuntu/_base/applications/kdbusnotification/debian/control +++ b/ubuntu/_base/applications/kdbusnotification/debian/control @@ -2,7 +2,7 @@ Source: kdbusnotification-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, tdelibs14-trinity-dev, libdbus-glib-1-dev, libgtk2.0-dev, libglib2.0-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, libdbus-glib-1-dev, libgtk2.0-dev, libglib2.0-dev Standards-Version: 3.8.4 Package: kdbusnotification-trinity diff --git a/ubuntu/_base/applications/kdiff3/debian/control b/ubuntu/_base/applications/kdiff3/debian/control index 4fcea9f0a..d8a3248c0 100644 --- a/ubuntu/_base/applications/kdiff3/debian/control +++ b/ubuntu/_base/applications/kdiff3/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Eike Sauer <eike@debian.org> -Build-Depends: debhelper (>= 9~), cdbs, quilt, cmake, tdelibs14-trinity-dev, libkonq4-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, libkonq4-trinity-dev Standards-Version: 3.8.4 Package: kdiff3-trinity diff --git a/ubuntu/_base/applications/kdirstat/debian/control b/ubuntu/_base/applications/kdirstat/debian/control index c21cc8daa..0e025da7a 100644 --- a/ubuntu/_base/applications/kdirstat/debian/control +++ b/ubuntu/_base/applications/kdirstat/debian/control @@ -2,7 +2,7 @@ Source: kdirstat-trinity Section: misc Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: cdbs (>= 0.4.41), debhelper (>= 9~), quilt, cmake, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.4 Homepage: http://kdirstat.sourceforge.net/ diff --git a/ubuntu/_base/applications/kdpkg/debian/control b/ubuntu/_base/applications/kdpkg/debian/control index a09364f5a..2e2098fca 100644 --- a/ubuntu/_base/applications/kdpkg/debian/control +++ b/ubuntu/_base/applications/kdpkg/debian/control @@ -3,7 +3,7 @@ Section: admin Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Alexander Kopf <kopf-alexander@gmx.de> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.4 Package: kdpkg-trinity diff --git a/ubuntu/_base/applications/keep/debian/control b/ubuntu/_base/applications/keep/debian/control index 80cd51661..d6daa8bfe 100644 --- a/ubuntu/_base/applications/keep/debian/control +++ b/ubuntu/_base/applications/keep/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org> Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.4 Package: keep-trinity diff --git a/ubuntu/_base/applications/kerberostray/debian/control b/ubuntu/_base/applications/kerberostray/debian/control index f966a8640..c8f45fe82 100644 --- a/ubuntu/_base/applications/kerberostray/debian/control +++ b/ubuntu/_base/applications/kerberostray/debian/control @@ -2,7 +2,7 @@ Source: kerberostray-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, tdelibs14-trinity-dev, libtdeldap-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, libtdeldap-trinity-dev Standards-Version: 3.8.4 Package: kerberostray-trinity diff --git a/ubuntu/_base/applications/keximdb/debian/control b/ubuntu/_base/applications/keximdb/debian/control index 517f7246b..d15eaafce 100644 --- a/ubuntu/_base/applications/keximdb/debian/control +++ b/ubuntu/_base/applications/keximdb/debian/control @@ -2,7 +2,7 @@ Source: keximdb-trinity Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Martin Ellis <martin.ellis@kdemail.net> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, koffice-trinity-dev, libglib2.0-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, koffice-trinity-dev, libglib2.0-dev Standards-Version: 3.7.2 Section: tde diff --git a/ubuntu/_base/applications/kgtk-qt3/debian/control b/ubuntu/_base/applications/kgtk-qt3/debian/control index 90ad964eb..5c545fd5c 100644 --- a/ubuntu/_base/applications/kgtk-qt3/debian/control +++ b/ubuntu/_base/applications/kgtk-qt3/debian/control @@ -2,7 +2,7 @@ Source: kgtk-qt3-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: debhelper (>= 9~), quilt, cdbs, tdelibs14-trinity-dev, libgtk2.0-dev, libtqtinterface-dev, cmake +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, libgtk2.0-dev Standards-Version: 3.8.4 Homepage: http://trinity.pearsoncomputing.net diff --git a/ubuntu/_base/applications/kima/debian/control b/ubuntu/_base/applications/kima/debian/control index 610fbc460..f9bcdc75c 100644 --- a/ubuntu/_base/applications/kima/debian/control +++ b/ubuntu/_base/applications/kima/debian/control @@ -2,7 +2,7 @@ Source: kima-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, tdelibs14-trinity-dev, +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, libxnvctrl-dev [amd64 i386] | nvidia-settings [amd64 i386] Standards-Version: 3.8.4 diff --git a/ubuntu/_base/applications/kiosktool/debian/control b/ubuntu/_base/applications/kiosktool/debian/control index 1c59f816f..ddc5f4ba5 100644 --- a/ubuntu/_base/applications/kiosktool/debian/control +++ b/ubuntu/_base/applications/kiosktool/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Pedro Jurado Maqueda <melenas@kdehispano.org> -Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.4 Package: kiosktool-trinity diff --git a/ubuntu/_base/applications/kkbswitch/debian/control b/ubuntu/_base/applications/kkbswitch/debian/control index 28a4cc194..a0e196369 100644 --- a/ubuntu/_base/applications/kkbswitch/debian/control +++ b/ubuntu/_base/applications/kkbswitch/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Hebrew Packaging Team <debian-hebrew-package@lists.alioth.debian.org> Uploaders: Baruch Even <baruch@debian.org>, Lior Kaplan <kaplan@debian.org>, Shachar Shemesh <shachar@debian.org> -Build-Depends: debhelper (>= 9~), cdbs, cmake, tdelibs14-trinity-dev, libxkbfile-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, libxkbfile-dev Standards-Version: 3.7.3 Homepage: http://kkbswitch.sourceforge.net/ diff --git a/ubuntu/_base/applications/klamav/debian/control b/ubuntu/_base/applications/klamav/debian/control index e3354e939..103e62699 100644 --- a/ubuntu/_base/applications/klamav/debian/control +++ b/ubuntu/_base/applications/klamav/debian/control @@ -3,7 +3,7 @@ Section: admin Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Scott Kitterman <scott@kitterman.com> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, tdelibs14-trinity-dev, libclamav-dev (>= 0.102~) +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, libclamav-dev (>= 0.102~) Standards-Version: 3.8.4 Package: klamav-trinity diff --git a/ubuntu/_base/applications/klcddimmer/debian/control b/ubuntu/_base/applications/klcddimmer/debian/control index 0cb16fca1..ed79ba1b7 100644 --- a/ubuntu/_base/applications/klcddimmer/debian/control +++ b/ubuntu/_base/applications/klcddimmer/debian/control @@ -2,7 +2,7 @@ Source: klcddimmer-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: debhelper (>= 9~), cdbs, cmake, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.7.3 Homepage: http://klcddimeer.sourceforge.net/ diff --git a/ubuntu/_base/applications/kmplayer/debian/control b/ubuntu/_base/applications/kmplayer/debian/control index 4a45d7d9b..1536c441a 100644 --- a/ubuntu/_base/applications/kmplayer/debian/control +++ b/ubuntu/_base/applications/kmplayer/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org> Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, tdelibs14-trinity-dev, +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, libnspr4-dev, libcairo2-dev, libdbus-1-dev, libdbus-glib-1-dev, libdbus-tqt-1-dev, libgstreamer-plugins-base1.0-dev | libgstreamer-plugins-base0.10-dev, libgtk2.0-dev, libxine2-dev | libxine-dev, libxv-dev, libxtst-dev, diff --git a/ubuntu/_base/applications/knemo/debian/control b/ubuntu/_base/applications/knemo/debian/control index e9f1d8794..55f5efa30 100644 --- a/ubuntu/_base/applications/knemo/debian/control +++ b/ubuntu/_base/applications/knemo/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> Uploaders: Achim Bohnet <ach@mpe.mpg.de>, Mark Purcell <msp@debian.org> -Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, tdelibs14-trinity-dev, net-tools, wireless-tools, libiw-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, net-tools, wireless-tools, libiw-dev Standards-Version: 3.8.4 Package: knemo-trinity diff --git a/ubuntu/_base/applications/knetload/debian/control b/ubuntu/_base/applications/knetload/debian/control index 4abe1f0c2..713983b12 100644 --- a/ubuntu/_base/applications/knetload/debian/control +++ b/ubuntu/_base/applications/knetload/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Helen Faulkner <helen@debian.org> -Build-Depends: debhelper (>= 9~), cdbs, quilt, cmake, tdelibs14-trinity-dev (>= 4:3.4.2), libltdl-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev (>= 4:3.4.2) Standards-Version: 3.8.4 Package: knetload-trinity diff --git a/ubuntu/_base/applications/knetstats/debian/control b/ubuntu/_base/applications/knetstats/debian/control index 23e1c19f3..5982061fe 100644 --- a/ubuntu/_base/applications/knetstats/debian/control +++ b/ubuntu/_base/applications/knetstats/debian/control @@ -2,7 +2,7 @@ Source: knetstats-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.4 Homepage: http://knetstats.sourceforge.net/ diff --git a/ubuntu/_base/applications/knights/debian/control b/ubuntu/_base/applications/knights/debian/control index 6857903bd..da3365874 100644 --- a/ubuntu/_base/applications/knights/debian/control +++ b/ubuntu/_base/applications/knights/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Jose Carlos Medeiros <debian@psabs.com.br> Uploaders: Ola Lundqvist <opal@debian.org> -Build-Depends: debhelper (>= 9~), cdbs, quilt, cmake, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.4 Homepage: http://knights.sourceforge.net/ diff --git a/ubuntu/_base/applications/knmap/debian/control b/ubuntu/_base/applications/knmap/debian/control index e5d52fd61..98d098c0e 100644 --- a/ubuntu/_base/applications/knmap/debian/control +++ b/ubuntu/_base/applications/knmap/debian/control @@ -2,7 +2,7 @@ Source: knmap-trinity Section: tde Priority: extra Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: debhelper (>= 9~), cdbs, quilt, cmake, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.2 Package: knmap-trinity diff --git a/ubuntu/_base/applications/knowit/debian/control b/ubuntu/_base/applications/knowit/debian/control index b81748a26..86ea15702 100644 --- a/ubuntu/_base/applications/knowit/debian/control +++ b/ubuntu/_base/applications/knowit/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Lorenzo Villani <arbiter@arbiterlab.net> -Build-Depends: debhelper (>= 9~), cdbs, quilt, cmake, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.4 Homepage: http://knowit.sourceforge.net/ diff --git a/ubuntu/_base/applications/knutclient/debian/control b/ubuntu/_base/applications/knutclient/debian/control index 595be5331..aff5bf19c 100644 --- a/ubuntu/_base/applications/knutclient/debian/control +++ b/ubuntu/_base/applications/knutclient/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Arnaud Quette <aquette@debian.org> Standards-Version: 3.8.4 -Build-Depends: debhelper (>= 9~), cdbs, cmake, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev Homepage: http://www.knut.noveradsl.cz/knutclient/ Package: knutclient-trinity diff --git a/ubuntu/_base/applications/kompose/debian/control b/ubuntu/_base/applications/kompose/debian/control index f7d5561d9..3e3b2b4c7 100644 --- a/ubuntu/_base/applications/kompose/debian/control +++ b/ubuntu/_base/applications/kompose/debian/control @@ -3,7 +3,7 @@ Section: admin Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Ana Beatriz Guerrero Lopez <ana@debian.org>, Sune Vuorela <debian@pusling.com> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, tdelibs14-trinity-dev, libimlib2-dev, libx11-dev, libxdamage-dev, libxcomposite-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, libimlib2-dev, libx11-dev, libxdamage-dev, libxcomposite-dev Standards-Version: 3.8.4 Package: kompose-trinity diff --git a/ubuntu/_base/applications/konversation/debian/control b/ubuntu/_base/applications/konversation/debian/control index c5ca8a890..596b8197e 100644 --- a/ubuntu/_base/applications/konversation/debian/control +++ b/ubuntu/_base/applications/konversation/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org> Uploaders: Modestas Vainius <modestas@vainius.eu> -Build-Depends: debhelper (>= 9~), cdbs (>= 0.4.27-3), cmake, tdelibs14-trinity-dev, xsltproc, docbook-xsl, docbook-xml, libxi-dev, quilt (>= 0.40), automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, xsltproc, docbook-xsl, docbook-xml, libxi-dev Standards-Version: 3.8.4 DM-Upload-Allowed: yes Homepage: http://konversation.kde.org/ diff --git a/ubuntu/_base/applications/kooldock/debian/control b/ubuntu/_base/applications/kooldock/debian/control index c0140b881..d60507d8c 100644 --- a/ubuntu/_base/applications/kooldock/debian/control +++ b/ubuntu/_base/applications/kooldock/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, tdelibs-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs-trinity-dev Standards-Version: 3.8.0 Homepage: http://sourceforge.net/projects/kooldock/ diff --git a/ubuntu/_base/applications/kpicosim/debian/control b/ubuntu/_base/applications/kpicosim/debian/control index a91600278..e5a005f94 100644 --- a/ubuntu/_base/applications/kpicosim/debian/control +++ b/ubuntu/_base/applications/kpicosim/debian/control @@ -2,7 +2,7 @@ Source: kpicosim-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: debhelper (>= 9~), cdbs, quilt, cmake, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.4 Package: kpicosim-trinity diff --git a/ubuntu/_base/applications/kpilot/debian/control b/ubuntu/_base/applications/kpilot/debian/control index 096307e77..0e1549c27 100644 --- a/ubuntu/_base/applications/kpilot/debian/control +++ b/ubuntu/_base/applications/kpilot/debian/control @@ -2,7 +2,7 @@ Source: kpilot-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, tdepim-trinity-dev, libpisock-dev Standards-Version: 3.8.4 diff --git a/ubuntu/_base/applications/kplayer/debian/control b/ubuntu/_base/applications/kplayer/debian/control index a2a0b1e2e..37d7ccc8b 100644 --- a/ubuntu/_base/applications/kplayer/debian/control +++ b/ubuntu/_base/applications/kplayer/debian/control @@ -2,7 +2,7 @@ Source: kplayer-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, tdelibs-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs-trinity-dev Standards-Version: 3.8.4 Homepage: http://kplayer.sourceforge.net/ #Vcs-Git: git://anonscm.debian.org/collab-maint/kplayer-trinity.git diff --git a/ubuntu/_base/applications/kpowersave/debian/control b/ubuntu/_base/applications/kpowersave/debian/control index cf8c3aa22..c647bc5ad 100644 --- a/ubuntu/_base/applications/kpowersave/debian/control +++ b/ubuntu/_base/applications/kpowersave/debian/control @@ -3,8 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Michael Biebl <biebl@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, tdelibs14-trinity-dev, libxss-dev, libxtst-dev, libhal-dev (>= 0.5.6), libdbus-1-dev (>= 0.6), libdbus-tqt-1-dev, cmake, automake, autoconf, libtool, libltdl-dev -Build-Conflicts: autoconf2.13 +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, libxss-dev, libxtst-dev, libhal-dev (>= 0.5.6), libdbus-1-dev (>= 0.6), libdbus-tqt-1-dev Standards-Version: 3.8.4 Homepage: http://sourceforge.net/projects/powersave/ diff --git a/ubuntu/_base/applications/krename/debian/control b/ubuntu/_base/applications/krename/debian/control index e4766f603..7f7e389c5 100644 --- a/ubuntu/_base/applications/krename/debian/control +++ b/ubuntu/_base/applications/krename/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> Uploaders: Richard A. Johnson <nixternal@ubuntu.com> -Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, tdelibs14-trinity-dev, patchutils, libx11-dev, libxext-dev, libxpm-dev, x-dev | x11proto-core-dev | libx11-dev, perl +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, libx11-dev, libxext-dev, libxpm-dev, x-dev | x11proto-core-dev | libx11-dev, perl Standards-Version: 3.8.4 Package: krename-trinity diff --git a/ubuntu/_base/applications/kscope/debian/control b/ubuntu/_base/applications/kscope/debian/control index 22760d2f9..0d5f15013 100644 --- a/ubuntu/_base/applications/kscope/debian/control +++ b/ubuntu/_base/applications/kscope/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org> Uploaders: Fathi Boudra <fabo@debian.org>, Mark Purcell <msp@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, bison, flex, tdebase-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, bison, flex, tdebase-trinity-dev Standards-Version: 3.8.0 Homepage: http://kscope.sourceforge.net Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/kde-extras/kscope/?op=log diff --git a/ubuntu/_base/applications/ksensors/debian/control b/ubuntu/_base/applications/ksensors/debian/control index f420734ae..c9632b830 100644 --- a/ubuntu/_base/applications/ksensors/debian/control +++ b/ubuntu/_base/applications/ksensors/debian/control @@ -2,7 +2,7 @@ Source: ksensors-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, libsensors4-dev, tdelibs14-trinity-dev, imagemagick +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, libsensors4-dev, tdelibs14-trinity-dev, imagemagick Build-Conflicts: autoconf2.13 Standards-Version: 3.8.3 diff --git a/ubuntu/_base/applications/kshowmail/debian/control b/ubuntu/_base/applications/kshowmail/debian/control index 018efd73d..1d50f3c7e 100644 --- a/ubuntu/_base/applications/kshowmail/debian/control +++ b/ubuntu/_base/applications/kshowmail/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: extra Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Lionel Le Folgoc <mrpouit@ubuntu.com> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, tdelibs14-trinity-dev, libmimelib1-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, libmimelib1-trinity-dev Standards-Version: 3.7.2 Package: kshowmail-trinity diff --git a/ubuntu/_base/applications/kshutdown/debian/control b/ubuntu/_base/applications/kshutdown/debian/control index bfa2a42cf..e0b5dc5b2 100644 --- a/ubuntu/_base/applications/kshutdown/debian/control +++ b/ubuntu/_base/applications/kshutdown/debian/control @@ -2,7 +2,7 @@ Source: kshutdown-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 9~), quilt, cmake, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.1 Package: kshutdown-trinity diff --git a/ubuntu/_base/applications/ksplash-engine-moodin/debian/control b/ubuntu/_base/applications/ksplash-engine-moodin/debian/control index 86840fbab..6973c18ec 100644 --- a/ubuntu/_base/applications/ksplash-engine-moodin/debian/control +++ b/ubuntu/_base/applications/ksplash-engine-moodin/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org> Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org> -Build-Depends: debhelper (>= 9~), cdbs, quilt, cmake, tdebase-trinity-dev, ksplash-trinity +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdebase-trinity-dev, ksplash-trinity Standards-Version: 3.8.4 Package: ksplash-engine-moodin-trinity diff --git a/ubuntu/_base/applications/kstreamripper/debian/control b/ubuntu/_base/applications/kstreamripper/debian/control index 50e3ae373..fe080b9c8 100644 --- a/ubuntu/_base/applications/kstreamripper/debian/control +++ b/ubuntu/_base/applications/kstreamripper/debian/control @@ -2,7 +2,7 @@ Source: kstreamripper-trinity Section: sound Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: debhelper (>= 9~), cdbs, tdelibs14-trinity-dev, cmake, quilt +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.4 Package: kstreamripper-trinity diff --git a/ubuntu/_base/applications/ksystemlog/debian/control b/ubuntu/_base/applications/ksystemlog/debian/control index 737296b9a..a29ad02a1 100644 --- a/ubuntu/_base/applications/ksystemlog/debian/control +++ b/ubuntu/_base/applications/ksystemlog/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org> Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.4 Package: ksystemlog-trinity diff --git a/ubuntu/_base/applications/ktechlab/debian/control b/ubuntu/_base/applications/ktechlab/debian/control index a9498e453..f5952100e 100644 --- a/ubuntu/_base/applications/ktechlab/debian/control +++ b/ubuntu/_base/applications/ktechlab/debian/control @@ -2,7 +2,7 @@ Source: ktechlab-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: debhelper (>= 9~), cdbs, quilt, cmake, imagemagick, tdelibs14-trinity-dev, gpsim-dev (>= 0.21.11-2) +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, imagemagick, tdelibs14-trinity-dev, gpsim-dev (>= 0.21.11-2) Standards-Version: 3.8.4 Package: ktechlab-trinity diff --git a/ubuntu/_base/applications/kvkbd/debian/control b/ubuntu/_base/applications/kvkbd/debian/control index bf34083d2..ec883d426 100644 --- a/ubuntu/_base/applications/kvkbd/debian/control +++ b/ubuntu/_base/applications/kvkbd/debian/control @@ -2,7 +2,7 @@ Source: kvkbd-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, libxtst-dev, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, libxtst-dev, tdelibs14-trinity-dev Standards-Version: 3.8.4 Homepage: http://pan4os.info/main/index.php diff --git a/ubuntu/_base/applications/kvpnc/debian/control b/ubuntu/_base/applications/kvpnc/debian/control index fdb9307ca..4691d3023 100644 --- a/ubuntu/_base/applications/kvpnc/debian/control +++ b/ubuntu/_base/applications/kvpnc/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> Uploaders: Fathi Boudra <fabo@debian.org>, Mark Purcell <msp@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, tdelibs14-trinity-dev, libgcrypt-dev | libgcrypt20-dev | libgcrypt11-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, libgcrypt-dev | libgcrypt20-dev | libgcrypt11-dev Standards-Version: 3.8.4 Package: kvpnc-trinity diff --git a/ubuntu/_base/applications/kxmleditor/debian/control b/ubuntu/_base/applications/kxmleditor/debian/control index 7f3dba27b..677794e1f 100644 --- a/ubuntu/_base/applications/kxmleditor/debian/control +++ b/ubuntu/_base/applications/kxmleditor/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> X-Original-Maintainer: Jose Luis Tallon <jltallon@adv-solutions.net> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, tdelibs-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs-trinity-dev Standards-Version: 3.8.0 Package: kxmleditor-trinity diff --git a/ubuntu/_base/applications/mathemagics/debian/control b/ubuntu/_base/applications/mathemagics/debian/control index caf5c29ce..fc71842cd 100644 --- a/ubuntu/_base/applications/mathemagics/debian/control +++ b/ubuntu/_base/applications/mathemagics/debian/control @@ -2,7 +2,7 @@ Source: mathemagics-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.4 Package: mathemagics-trinity diff --git a/ubuntu/_base/applications/mplayerthumbs/debian/control b/ubuntu/_base/applications/mplayerthumbs/debian/control index 2bb5235a1..de67af535 100644 --- a/ubuntu/_base/applications/mplayerthumbs/debian/control +++ b/ubuntu/_base/applications/mplayerthumbs/debian/control @@ -2,7 +2,7 @@ Source: mplayerthumbs-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.2 Package: mplayerthumbs-trinity diff --git a/ubuntu/_base/applications/potracegui/debian/control b/ubuntu/_base/applications/potracegui/debian/control index 3f1f07421..d6bcb78c0 100644 --- a/ubuntu/_base/applications/potracegui/debian/control +++ b/ubuntu/_base/applications/potracegui/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Christoph Wegscheider <christoph.wegscheider@wegi.net> Uploaders: Bartosz Fenski <fenio@debian.org> -Build-Depends: debhelper (>= 9~), cdbs, quilt, cmake, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.4 Package: potracegui-trinity diff --git a/ubuntu/_base/applications/rosegarden/debian/control b/ubuntu/_base/applications/rosegarden/debian/control index 25cfa7c58..4ec703bf7 100644 --- a/ubuntu/_base/applications/rosegarden/debian/control +++ b/ubuntu/_base/applications/rosegarden/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> 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 (>= 9~), quilt, cdbs, cmake, tdelibs14-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: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-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/ubuntu/_base/applications/smartcardauth/debian/control b/ubuntu/_base/applications/smartcardauth/debian/control index cda1d7f49..ea8dfe54f 100644 --- a/ubuntu/_base/applications/smartcardauth/debian/control +++ b/ubuntu/_base/applications/smartcardauth/debian/control @@ -2,7 +2,7 @@ Source: smartcardauth Section: tde Priority: extra Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: debhelper (>= 9~), cdbs, quilt, cmake, pkg-config, libpkcs11-helper1-dev, libgnutls-dev | libgnutls28-dev | libgnutls30-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, pkg-config, libpkcs11-helper1-dev, libgnutls-dev | libgnutls28-dev | libgnutls30-dev Standards-Version: 3.8.4 Package: smartcardauth diff --git a/ubuntu/_base/applications/tastymenu/debian/control b/ubuntu/_base/applications/tastymenu/debian/control index 6970559d5..4f8994ed2 100644 --- a/ubuntu/_base/applications/tastymenu/debian/control +++ b/ubuntu/_base/applications/tastymenu/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> X-Original-Maintainer: Marco Martin <notmart@gmail.com> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, tdelibs-trinity-dev, libxau-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs-trinity-dev, libxau-dev Standards-Version: 3.8.0 Package: tastymenu-trinity diff --git a/ubuntu/_base/applications/tde-style-baghira/debian/control b/ubuntu/_base/applications/tde-style-baghira/debian/control index cc009d9c6..4650b8a47 100644 --- a/ubuntu/_base/applications/tde-style-baghira/debian/control +++ b/ubuntu/_base/applications/tde-style-baghira/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> X-Original-Maintainer: Jose Luis Tallon <jltallon@adv-solutions.net> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, tdebase-trinity-dev, libxtst-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdebase-trinity-dev, libxtst-dev Standards-Version: 3.8.0 Package: tde-style-baghira-trinity diff --git a/ubuntu/_base/applications/tde-style-domino/debian/control b/ubuntu/_base/applications/tde-style-domino/debian/control index bc2218167..b37d5bce2 100644 --- a/ubuntu/_base/applications/tde-style-domino/debian/control +++ b/ubuntu/_base/applications/tde-style-domino/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> X-Original-Maintainer: Jonathan Patrick Davies <jpatrick@kubuntu.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, tdebase-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdebase-trinity-dev Standards-Version: 3.7.3 Homepage: http://kde-look.org/content/show.php?content=42804 diff --git a/ubuntu/_base/applications/tde-style-ia-ora/debian/control b/ubuntu/_base/applications/tde-style-ia-ora/debian/control index bff9e29f7..30dc4c4be 100644 --- a/ubuntu/_base/applications/tde-style-ia-ora/debian/control +++ b/ubuntu/_base/applications/tde-style-ia-ora/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> X-Original-Maintainer: Jose Luis Tallon <jltallon@adv-solutions.net> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, tdebase-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdebase-trinity-dev Standards-Version: 3.8.0 Package: tde-style-ia-ora-trinity diff --git a/ubuntu/_base/applications/tde-style-lipstik/debian/control b/ubuntu/_base/applications/tde-style-lipstik/debian/control index 9a1eaf718..26a9da6a1 100644 --- a/ubuntu/_base/applications/tde-style-lipstik/debian/control +++ b/ubuntu/_base/applications/tde-style-lipstik/debian/control @@ -2,7 +2,7 @@ Source: tde-style-lipstik-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: debhelper (>= 9~), cdbs, quilt, cmake, tdelibs14-trinity-dev (>= 4:3.2) +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.4 Package: tde-style-lipstik-trinity diff --git a/ubuntu/_base/applications/tde-style-qtcurve/debian/control b/ubuntu/_base/applications/tde-style-qtcurve/debian/control index 9db68cc92..fb5d2539a 100644 --- a/ubuntu/_base/applications/tde-style-qtcurve/debian/control +++ b/ubuntu/_base/applications/tde-style-qtcurve/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Bastian Venthur <venthur@debian.org> -Build-Depends: debhelper (>= 9~), quilt, tdelibs14-trinity-dev, cmake, cdbs +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.4 Package: tde-style-qtcurve-trinity diff --git a/ubuntu/_base/applications/tde-systemsettings/debian/control b/ubuntu/_base/applications/tde-systemsettings/debian/control index db88db49c..0c4f2fcaf 100644 --- a/ubuntu/_base/applications/tde-systemsettings/debian/control +++ b/ubuntu/_base/applications/tde-systemsettings/debian/control @@ -2,7 +2,7 @@ Source: tde-systemsettings-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.4 Package: tde-systemsettings-trinity diff --git a/ubuntu/_base/applications/tdedocker/debian/control b/ubuntu/_base/applications/tdedocker/debian/control index cfd3dfa11..865e17dca 100644 --- a/ubuntu/_base/applications/tdedocker/debian/control +++ b/ubuntu/_base/applications/tdedocker/debian/control @@ -2,7 +2,7 @@ Source: tdedocker-trinity Section: x11 Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, tdelibs-trinity-dev, libxpm-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs-trinity-dev, libxpm-dev Standards-Version: 3.7.2 Package: tdedocker-trinity diff --git a/ubuntu/_base/applications/tdeio-apt/debian/control b/ubuntu/_base/applications/tdeio-apt/debian/control index 772e939b9..dc915c4c4 100644 --- a/ubuntu/_base/applications/tdeio-apt/debian/control +++ b/ubuntu/_base/applications/tdeio-apt/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Emmanuel Bouthenot <kolter@openics.org> -Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.4 Package: tdeio-apt-trinity diff --git a/ubuntu/_base/applications/tdeio-ftps/debian/control b/ubuntu/_base/applications/tdeio-ftps/debian/control index 59f7f2f09..fa28a992d 100644 --- a/ubuntu/_base/applications/tdeio-ftps/debian/control +++ b/ubuntu/_base/applications/tdeio-ftps/debian/control @@ -2,7 +2,7 @@ Source: tdeio-ftps-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: debhelper (>= 9~), cdbs, cmake, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.3 Package: tdeio-ftps-trinity diff --git a/ubuntu/_base/applications/tdeio-gopher/debian/control b/ubuntu/_base/applications/tdeio-gopher/debian/control index e96697c21..cde000270 100644 --- a/ubuntu/_base/applications/tdeio-gopher/debian/control +++ b/ubuntu/_base/applications/tdeio-gopher/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Albert Astals Cid <aacid@kde.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, tdelibs14-trinity-dev, cmake +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.4 Package: tdeio-gopher-trinity diff --git a/ubuntu/_base/applications/tdeio-locate/debian/control b/ubuntu/_base/applications/tdeio-locate/debian/control index f5fe26eb8..2496e68bb 100644 --- a/ubuntu/_base/applications/tdeio-locate/debian/control +++ b/ubuntu/_base/applications/tdeio-locate/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Tobi Vollebregt <tobivollebregt@gmail.com> -Build-Depends: cdbs, debhelper (>= 9~), quilt, tdelibs14-trinity-dev, bzip2, python-all, cmake +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, bzip2, python-all Standards-Version: 3.8.4 Package: tdeio-locate-trinity diff --git a/ubuntu/_base/applications/tdeio-sword/debian/control b/ubuntu/_base/applications/tdeio-sword/debian/control index 681a21074..830aee566 100644 --- a/ubuntu/_base/applications/tdeio-sword/debian/control +++ b/ubuntu/_base/applications/tdeio-sword/debian/control @@ -2,7 +2,7 @@ Source: tdeio-sword-trinity Section: tde Priority: extra Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, libsword-dev (>= 1.5.8-1), tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, libsword-dev (>= 1.5.8-1), tdelibs14-trinity-dev Standards-Version: 3.7.2 Package: tdeio-sword-trinity diff --git a/ubuntu/_base/applications/tdeio-umountwrapper/debian/control b/ubuntu/_base/applications/tdeio-umountwrapper/debian/control index f031ad047..08cf07827 100644 --- a/ubuntu/_base/applications/tdeio-umountwrapper/debian/control +++ b/ubuntu/_base/applications/tdeio-umountwrapper/debian/control @@ -2,7 +2,7 @@ Source: tdeio-umountwrapper-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.4 Package: tdeio-umountwrapper-trinity diff --git a/ubuntu/_base/applications/tdenetworkmanager/debian/control b/ubuntu/_base/applications/tdenetworkmanager/debian/control index b4bd0b391..dca2ceefa 100644 --- a/ubuntu/_base/applications/tdenetworkmanager/debian/control +++ b/ubuntu/_base/applications/tdenetworkmanager/debian/control @@ -2,14 +2,11 @@ Source: tdenetworkmanager-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: cdbs, - debhelper (>= 9~), - pkg-config, +Build-Depends: cdbs, debhelper (>= 9~), quilt, + cmake, ninja-build, tdelibs14-trinity-dev, libiw-dev, - libnl-3-dev | libnl-dev (>= 1.1), - quilt, - libtool, libltdl-dev, cmake + libnl-3-dev | libnl-dev (>= 1.1) Standards-Version: 3.8.4 Homepage: http://www.trinitydesktop.org/ diff --git a/ubuntu/_base/applications/tdepacman/debian/control b/ubuntu/_base/applications/tdepacman/debian/control index e8c557664..ef38377b0 100644 --- a/ubuntu/_base/applications/tdepacman/debian/control +++ b/ubuntu/_base/applications/tdepacman/debian/control @@ -3,7 +3,7 @@ Section: games Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: J.rg Th.nnissen <joe@dsite.de> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, tdelibs14-trinity-dev, libtdegames-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, libtdegames-trinity-dev Standards-Version: 0.3.2 Package: tdepacman-trinity diff --git a/ubuntu/_base/applications/tdepowersave/debian/control b/ubuntu/_base/applications/tdepowersave/debian/control index f2f2a009f..05906055f 100644 --- a/ubuntu/_base/applications/tdepowersave/debian/control +++ b/ubuntu/_base/applications/tdepowersave/debian/control @@ -3,8 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Michael Biebl <biebl@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, tdelibs14-trinity-dev, libxss-dev, libxtst-dev, libdbus-1-dev (>= 0.6), libdbus-1-tqt-dev, cmake, automake, autoconf, libtool, libltdl-dev -Build-Conflicts: autoconf2.13 +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, libxss-dev, libxtst-dev, libdbus-1-dev (>= 0.6), libdbus-1-tqt-dev Standards-Version: 3.8.4 Homepage: http://sourceforge.net/projects/powersave/ diff --git a/ubuntu/_base/applications/tdesudo/debian/control b/ubuntu/_base/applications/tdesudo/debian/control index 0f02a2dca..ae2a5a42d 100644 --- a/ubuntu/_base/applications/tdesudo/debian/control +++ b/ubuntu/_base/applications/tdesudo/debian/control @@ -2,7 +2,7 @@ Source: tdesudo-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.4 Package: tdesudo-trinity diff --git a/ubuntu/_base/applications/tdesvn/debian/control b/ubuntu/_base/applications/tdesvn/debian/control index ef84eb652..72b2ef04e 100644 --- a/ubuntu/_base/applications/tdesvn/debian/control +++ b/ubuntu/_base/applications/tdesvn/debian/control @@ -3,7 +3,7 @@ Section: devel Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> Uploaders: Michael Biebl <biebl@debian.org> -Build-Depends: cdbs (>= 0.4.50), debhelper (>= 9~), cmake (>= 2.4), tdelibs14-trinity-dev (>= 4:3.4.3-2), libsvn-dev (>= 1.2.0), libssl-dev (>= 0.9.8a), libsqlite3-dev, quilt, libaprutil1-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, libsvn-dev (>= 1.2.0), libssl-dev (>= 0.9.8a), libsqlite3-dev, libaprutil1-dev Standards-Version: 3.8.4 Package: libsvnqt4-trinity diff --git a/ubuntu/_base/applications/tdmtheme/debian/control b/ubuntu/_base/applications/tdmtheme/debian/control index 87894ea6f..e7b55f22a 100644 --- a/ubuntu/_base/applications/tdmtheme/debian/control +++ b/ubuntu/_base/applications/tdmtheme/debian/control @@ -5,7 +5,7 @@ Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org> Uploaders: Kel Modderman <kel@otaku42.de>, Fathi Boudra <fabo@debian.org>, Mark Purcell <msp@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.4 Homepage: http://beta.smileaf.org/projects diff --git a/ubuntu/_base/applications/tellico/debian/control b/ubuntu/_base/applications/tellico/debian/control index 3f76a8800..0e5597e03 100644 --- a/ubuntu/_base/applications/tellico/debian/control +++ b/ubuntu/_base/applications/tellico/debian/control @@ -3,11 +3,10 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Regis Boudin <regis@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), cmake, +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, tdemultimedia-trinity-dev, libtdepim1-trinity-dev, libxml2-dev, libxslt1-dev, libtag1-dev, libyaz-dev, - libpoppler-tqt-dev, libexempi-dev, libbtparse-dev, libv4l-dev, - automake, autoconf, libtool, libltdl-dev + libpoppler-tqt-dev, libexempi-dev, libbtparse-dev, libv4l-dev Standards-Version: 3.8.4 Homepage: http://periapsis.org/tellico/ diff --git a/ubuntu/_base/applications/tork/debian/control b/ubuntu/_base/applications/tork/debian/control index 08e642304..42906b954 100644 --- a/ubuntu/_base/applications/tork/debian/control +++ b/ubuntu/_base/applications/tork/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Homepage: http://tork.sourceforge.net/ Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, tdelibs-trinity-dev, pkg-config, torsocks, libgeoip-dev, libssl-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs-trinity-dev, torsocks, libgeoip-dev, libssl-dev Standards-Version: 3.9.1 Package: tork-trinity diff --git a/ubuntu/_base/applications/wlassistant/debian/control b/ubuntu/_base/applications/wlassistant/debian/control index ffbc7dbbc..44d233949 100644 --- a/ubuntu/_base/applications/wlassistant/debian/control +++ b/ubuntu/_base/applications/wlassistant/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> Uploaders: Achim Bohnet <ach@mpe.mpg.de>, Mark Purcell <msp@debian.org> -Build-Depends: debhelper (>= 9~), cdbs, quilt, cmake, tdelibs14-trinity-dev, net-tools, wireless-tools, libiw-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, net-tools, wireless-tools, libiw-dev Standards-Version: 3.8.4 Package: wlassistant-trinity diff --git a/ubuntu/_base/applications/yakuake/debian/control b/ubuntu/_base/applications/yakuake/debian/control index 47d5588ba..fd7ae1e92 100644 --- a/ubuntu/_base/applications/yakuake/debian/control +++ b/ubuntu/_base/applications/yakuake/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Ana Beatriz Guerrero Lopez <ana@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, tdelibs14-trinity-dev, libltdl-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, libltdl-dev Standards-Version: 3.8.4 Homepage: http://extragear.kde.org/apps/yakuake/ diff --git a/ubuntu/_base/core/tde-i18n/debian/control b/ubuntu/_base/core/tde-i18n/debian/control index 1148232d5..09235f18e 100644 --- a/ubuntu/_base/core/tde-i18n/debian/control +++ b/ubuntu/_base/core/tde-i18n/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org> -Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.4 Package: tde-i18n-af-trinity diff --git a/ubuntu/_base/core/tde-i18n/debian/rules b/ubuntu/_base/core/tde-i18n/debian/rules index 3ab71190d..962092a46 100755 --- a/ubuntu/_base/core/tde-i18n/debian/rules +++ b/ubuntu/_base/core/tde-i18n/debian/rules @@ -25,6 +25,13 @@ ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) endif DEB_MAKE_PARALLEL ?= $(and $(DEB_BUILD_PARALLEL),$(DEB_PARALLEL_JOBS),-j$(DEB_PARALLEL_JOBS)) +ifneq "$(wildcard /usr/bin/ninja)" "" +MAKE = ninja -v +DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR) +DEB_MAKE_INSTALL_TARGET = install +DEB_CMAKE_NORMAL_ARGS += -GNinja +endif + # The default gzip compressor has been changed in dpkg >= 1.17.0. deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ sed -e "s|.*version ||" -e "s| .*||" | \ @@ -60,7 +67,7 @@ $(STAMP_BUILD): [ -e $(cur_lang_dir)/CMakeLists.txt ] || \ ln -s ../template/commonCMakeLists.txt $(cur_lang_dir)/CMakeLists.txt cd $(cur_lang_dir)/build && \ - cmake .. $(DEB_CMAKE_EXTRA_FLAGS) && \ + cmake .. $(DEB_CMAKE_NORMAL_ARGS) $(DEB_CMAKE_EXTRA_FLAGS) && \ $(MAKE) $(DEB_MAKE_PARALLEL) touch $@ @@ -73,7 +80,7 @@ install:: $(I18N_INSTALL) $(I18N_INSTALL): build cd $(cur_lang_dir)/build && \ - $(MAKE) install DESTDIR=$(CURDIR)/debian/$(cur_pkg) $(DEB_MAKE_PARALLEL) + DESTDIR=$(CURDIR)/debian/$(cur_pkg) $(MAKE) install $(DEB_MAKE_PARALLEL) clean: $(I18N_CLEAN) debian-clean diff --git a/ubuntu/_base/core/tdeaccessibility/debian/control b/ubuntu/_base/core/tdeaccessibility/debian/control index df320c4f1..7e27c48f4 100644 --- a/ubuntu/_base/core/tdeaccessibility/debian/control +++ b/ubuntu/_base/core/tdeaccessibility/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com> -Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, tdelibs14-trinity-dev, tdemultimedia-trinity-dev, libakode-dev, libxtst-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, tdemultimedia-trinity-dev, libakode-dev, libxtst-dev Standards-Version: 3.8.4 Package: tdeaccessibility-trinity diff --git a/ubuntu/_base/core/tdeaddons/debian/control b/ubuntu/_base/core/tdeaddons/debian/control index 995e075f7..8caad54f1 100644 --- a/ubuntu/_base/core/tdeaddons/debian/control +++ b/ubuntu/_base/core/tdeaddons/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org> -Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, gawk, tdelibs14-trinity-dev, atlantik-trinity-dev, tdebase-trinity-dev, tdemultimedia-trinity-dev, libtdegames-trinity-dev, libkonq4-trinity-dev, tdepim-trinity-dev, libsdl1.2-dev (>= 1.2.2-3.3), libssl-dev (>= 0.9.6), libdb4.8++-dev | libdb++-dev, libogg-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, atlantik-trinity-dev, tdebase-trinity-dev, tdemultimedia-trinity-dev, libtdegames-trinity-dev, libkonq4-trinity-dev, tdepim-trinity-dev, libsdl1.2-dev (>= 1.2.2-3.3), libssl-dev (>= 0.9.6), libdb4.8++-dev | libdb++-dev, libogg-dev Standards-Version: 3.8.4 Package: tdeaddons-trinity diff --git a/ubuntu/_base/core/tdeadmin/debian/control b/ubuntu/_base/core/tdeadmin/debian/control index b720e4fb7..f9cca53af 100644 --- a/ubuntu/_base/core/tdeadmin/debian/control +++ b/ubuntu/_base/core/tdeadmin/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Fathi Boudra <fboudra@free.fr>, Modestas Vainius <geromanas@mailas.com>, Sune Vuorela <debian@pusling.com> -Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, tdelibs14-trinity-dev, libpam0g-dev, docbook-to-man +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, libpam0g-dev, docbook-to-man Standards-Version: 3.8.4 Package: tdeadmin-trinity diff --git a/ubuntu/_base/core/tdeartwork/debian/control b/ubuntu/_base/core/tdeartwork/debian/control index fcc5f3fcb..7326ae422 100644 --- a/ubuntu/_base/core/tdeartwork/debian/control +++ b/ubuntu/_base/core/tdeartwork/debian/control @@ -4,8 +4,8 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Sune Vuorela <debian@pusling.com> -Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, autotools-dev, tdelibs14-trinity-dev, gawk, sharutils, tdebase-trinity-dev, twin-trinity, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, xscreensaver, xscreensaver-gl, xscreensaver-data, xscreensaver-data-extra, xscreensaver-gl-extra, rss-glx, fireflies, automake, autoconf, libtool, libltdl-dev -Build-Conflicts: autoconf2.13, nvidia-glx +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, tdebase-trinity-dev, twin-trinity, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, xscreensaver, xscreensaver-gl, xscreensaver-data, xscreensaver-data-extra, xscreensaver-gl-extra, rss-glx, fireflies +Build-Conflicts: nvidia-glx Standards-Version: 3.8.4 Package: tdeartwork-trinity diff --git a/ubuntu/_base/core/tdebase/debian/control b/ubuntu/_base/core/tdebase/debian/control index 2bc6188f9..b8fe5d324 100644 --- a/ubuntu/_base/core/tdebase/debian/control +++ b/ubuntu/_base/core/tdebase/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Fathi Boudra <fboudra@free.fr>, Modestas Vainius <geromanas@mailas.com>, Sune Vuorela <debian@pusling.com> -Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, gawk, tdelibs14-trinity-dev, libldap2-dev, libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, xscreensaver, xscreensaver-data, xscreensaver-data-extra, libxss-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xkb-data, xutils, sharutils, texinfo, htdig, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, libogg-dev, libavahi-tqt-dev, udev, libudev-dev, libdbus-1-dev, libconfig-dev, libart-2.0-dev (>= 4:14.0.0~), libssl-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, libldap2-dev, libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, xscreensaver, xscreensaver-data, xscreensaver-data-extra, libxss-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xkb-data, xutils, texinfo, htdig, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, libogg-dev, libavahi-tqt-dev, udev, libudev-dev, libdbus-1-dev, libconfig-dev, libart-2.0-dev (>= 4:14.0.0~), libssl-dev Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11, tdelibs14-trinity-doc Build-Conflicts: nvidia-glx (<< 1.0.8774-6) Standards-Version: 3.8.4 diff --git a/ubuntu/_base/core/tdeedu/debian/control b/ubuntu/_base/core/tdeedu/debian/control index 1e1aaeca1..138f76e87 100644 --- a/ubuntu/_base/core/tdeedu/debian/control +++ b/ubuntu/_base/core/tdeedu/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Daniel Schepler <schepler@debian.org>, Sune Vuorela <debian@pusling.com> -Build-Depends: debhelper (>= 9~), cdbs (>= 0.4.39-0.1), quilt, cmake, tdelibs14-trinity-dev, libnum-ocaml-dev | ocaml-nox (<< 4.08), libfacile-ocaml-dev, libboost-python-dev (>= 1.33.1), libusb-dev, doxygen, graphviz, texlive-latex-base, texlive-latex-extra, ghostscript +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, libnum-ocaml-dev | ocaml-nox (<< 4.08), libfacile-ocaml-dev, libboost-python-dev (>= 1.33.1), libusb-dev, doxygen, graphviz, texlive-latex-base, texlive-latex-extra, ghostscript Standards-Version: 3.8.4 Package: tdeedu-trinity diff --git a/ubuntu/_base/core/tdegames/debian/control b/ubuntu/_base/core/tdegames/debian/control index a58a0830c..d082ed792 100644 --- a/ubuntu/_base/core/tdegames/debian/control +++ b/ubuntu/_base/core/tdegames/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Daniel Schepler <schepler@debian.org>, Sune Vuorela <debian@pusling.com> -Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, gawk, tdelibs14-trinity-dev, tdemultimedia-trinity-dev, groff-base, sharutils, bzip2, sharutils, libogg-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, tdemultimedia-trinity-dev, groff-base, bzip2, libogg-dev Build-Depends-Indep: doxygen, graphviz, gsfonts-x11, libtqtinterface-doc, tdelibs14-trinity-doc Standards-Version: 3.8.4 diff --git a/ubuntu/_base/core/tdegraphics/debian/control b/ubuntu/_base/core/tdegraphics/debian/control index c1e97b43c..56fcda81f 100644 --- a/ubuntu/_base/core/tdegraphics/debian/control +++ b/ubuntu/_base/core/tdegraphics/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Francesco Pedrini <francesco.pedrini@gmail.com>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com> -Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, tdelibs14-trinity-dev, imlib11-dev, libexif-dev (>= 0.6.9-1), libfribidi-dev, freeglut3-dev, libgphoto2-dev | libgphoto2-6-dev | libgphoto2-2-dev, libopenexr-dev (>= 1.2.1), libpaper-dev, libpoppler-private-dev | libpoppler-dev (<< 0.18.4-3), libpoppler-dev, libsane-dev (>> 1.0.15), libtiff-dev, libtiff-tools, liblcms2-dev | liblcms1-dev, libusb-dev, libxxf86vm-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, imlib11-dev, libexif-dev (>= 0.6.9-1), libfribidi-dev, freeglut3-dev, libgphoto2-dev | libgphoto2-6-dev | libgphoto2-2-dev, libopenexr-dev (>= 1.2.1), libpaper-dev, libpoppler-private-dev | libpoppler-dev (<< 0.18.4-3), libpoppler-dev, libsane-dev (>> 1.0.15), libtiff-dev, libtiff-tools, liblcms2-dev | liblcms1-dev, libusb-dev, libxxf86vm-dev Standards-Version: 3.8.4 Package: tdegraphics-trinity diff --git a/ubuntu/_base/core/tdelibs/debian/control b/ubuntu/_base/core/tdelibs/debian/control index 2bdf0200b..8c06a98ed 100644 --- a/ubuntu/_base/core/tdelibs/debian/control +++ b/ubuntu/_base/core/tdelibs/debian/control @@ -4,8 +4,8 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Adeodato Sim <dato@net.com.org.es>, Ana Beatriz Guerrero Lopez <ana@debian.org>, Daniel Schepler <schepler@debian.org>, Fathi Boudra <fboudra@free.fr>, Sune Vuorela <debian@pusling.com> -Build-Depends: cdbs (>= 0.4.41ubuntu2), debhelper (>= 9~), quilt, cmake, autotools-dev, - binutils (>= 2.14.90.0.7), binutils-dev, docbook-to-man, gawk, +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, + binutils (>= 2.14.90.0.7), binutils-dev, docbook-to-man, libart-2.0-dev (>= 4:14.0.0~), libarts1-trinity-dev (>= 1.5.0), libacl1-dev, libattr1-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], aspell, libaspell-dev, hspell, libbz2-dev, liblzma-dev, libcupsys2-dev | libcups2-dev, @@ -14,7 +14,7 @@ Build-Depends: cdbs (>= 0.4.41ubuntu2), debhelper (>= 9~), quilt, cmake, autotoo libsasl2-dev, libxcomposite-dev, libdbus-1-tqt-dev, libtiff-dev, libavahi-client-dev (>= 0.4), x11-xserver-utils, libxml2-dev, libxml2-utils, libxslt1-dev, libavahi-tqt-dev, - sharutils, texinfo, libogg-dev, libtqtinterface-dev, + texinfo, libogg-dev, libtqtinterface-dev, lsb-release, base-files, sudo, libr-dev, libudev-dev, libltdl-dev, libmagic-dev, libpcsclite-dev, opensc-pkcs11 | opensc (<< 0.13.0-5), libpkcs11-helper1-dev, libcryptsetup-dev diff --git a/ubuntu/_base/core/tdemultimedia/debian/control b/ubuntu/_base/core/tdemultimedia/debian/control index 661255d99..b6c47147d 100644 --- a/ubuntu/_base/core/tdemultimedia/debian/control +++ b/ubuntu/_base/core/tdemultimedia/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Fathi Boudra <fboudra@free.fr>, Sune Vuorela <debian@pusling.com> -Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, tdelibs14-trinity-dev, cdparanoia, libcdparanoia0-dev, libflac-dev (>= 1.1.4-1), libgstreamer-plugins-base1.0-dev | libgstreamer-plugins-base0.10-dev, libsamplerate0-dev, libspeex-dev (>> 1.1.5), libtag1-dev (>> 1.3.1), libtheora-dev, libxine2-dev | libxine-dev, libxxf86dga-dev, libxv-dev, libxxf86vm-dev, libakode-dev, libogg-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, cdparanoia, libcdparanoia0-dev, libflac-dev (>= 1.1.4-1), libgstreamer-plugins-base1.0-dev | libgstreamer-plugins-base0.10-dev, libsamplerate0-dev, libspeex-dev (>> 1.1.5), libtag1-dev (>> 1.3.1), libtheora-dev, libxine2-dev | libxine-dev, libxxf86dga-dev, libxv-dev, libxxf86vm-dev, libakode-dev, libogg-dev Standards-Version: 3.8.4 Package: tdemultimedia-trinity diff --git a/ubuntu/_base/core/tdenetwork/debian/control b/ubuntu/_base/core/tdenetwork/debian/control index ebf415242..3660c39b5 100644 --- a/ubuntu/_base/core/tdenetwork/debian/control +++ b/ubuntu/_base/core/tdenetwork/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Modestas Vainius <geromanas@mailas.com>, Sarah Hobbs <hobbsee@ubuntu.com>, Sune Vuorela <debian@pusling.com> -Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, docbook-to-man, doxygen, gawk, tdelibs14-trinity-dev, libgnutls-dev | libgadu-dev (>> 1:1.12.0-3), libgcrypt-dev, libgadu-dev, libiw-dev (>> 27+28pre8), libmeanwhile-dev (>= 1.0.2), libslp-dev, libspeex-dev, libsqlite3-dev, libxml2-dev, libxslt1-dev, libxtst-dev, libtqtinterface-doc, sharutils, valgrind [!armel !mips !mipsel !riscv64], libxxf86vm-dev, libv4l-dev, libssl-dev, libtqca-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, docbook-to-man, doxygen, tdelibs14-trinity-dev, libgnutls-dev | libgadu-dev (>> 1:1.12.0-3), libgcrypt-dev, libgadu-dev, libiw-dev (>> 27+28pre8), libmeanwhile-dev (>= 1.0.2), libslp-dev, libspeex-dev, libsqlite3-dev, libxml2-dev, libxslt1-dev, libxtst-dev, libtqtinterface-doc, valgrind [!armel !mips !mipsel !riscv64], libxxf86vm-dev, libv4l-dev, libssl-dev, libtqca-dev Standards-Version: 3.8.4 Package: tdenetwork-trinity diff --git a/ubuntu/_base/core/tdenetwork/debian/patches/series b/ubuntu/_base/core/tdenetwork/debian/patches/series index 8b1378917..e69de29bb 100644 --- a/ubuntu/_base/core/tdenetwork/debian/patches/series +++ b/ubuntu/_base/core/tdenetwork/debian/patches/series @@ -1 +0,0 @@ - diff --git a/ubuntu/_base/core/tdepim/debian/control b/ubuntu/_base/core/tdepim/debian/control index d859e268b..f02677ab4 100644 --- a/ubuntu/_base/core/tdepim/debian/control +++ b/ubuntu/_base/core/tdepim/debian/control @@ -4,12 +4,12 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com> -Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, - gawk, tdelibs14-trinity-dev, bison, byacc, bzip2, +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, + tdelibs14-trinity-dev, bison, byacc, bzip2, flex, groff-base, libogg-dev, libboost-dev (>= 1.33.1), libgpgme11-dev | libgpgme-dev (>= 1.0~), libreadline-dev | libreadline6-dev | libreadline5-dev, libsasl2-dev, libssl-dev, - libxpm-dev, libxss-dev, sharutils, texinfo, dpkg-dev (>= 1.14.4), + libxpm-dev, libxss-dev, texinfo, dpkg-dev (>= 1.14.4), libgpg-error-dev (>= 1.4-2), gpgsm, libical-dev, libcaldav-dev (>= 0.6.5), libcarddav-dev (>= 0.6.2), libcurl4-gnutls-dev Build-Depends-Indep: doxygen, graphviz, gsfonts-x11, libtqtinterface-doc, tdelibs14-trinity-doc diff --git a/ubuntu/_base/core/tdesdk/debian/control b/ubuntu/_base/core/tdesdk/debian/control index aa7f466b2..ad3222a25 100644 --- a/ubuntu/_base/core/tdesdk/debian/control +++ b/ubuntu/_base/core/tdesdk/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Fathi Boudra <fboudra@free.fr>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com> -Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, gawk, +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, pkg-config, tdelibs14-trinity-dev, binutils-dev, bison, flex, libfl-dev | flex (<< 2.5.39), tdepim-trinity-dev, libapr1-dev, libtdepim1-trinity-dev, libktnef1-trinity-dev, libsvn-dev, libdb-dev, diff --git a/ubuntu/_base/core/tdetoys/debian/control b/ubuntu/_base/core/tdetoys/debian/control index 82083ebbe..59f7994b5 100644 --- a/ubuntu/_base/core/tdetoys/debian/control +++ b/ubuntu/_base/core/tdetoys/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Modestas Vainius <geromanas@mailas.com> -Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.4 Package: tdetoys-trinity diff --git a/ubuntu/_base/core/tdeutils/debian/control b/ubuntu/_base/core/tdeutils/debian/control index fcb815af8..dc035de1c 100644 --- a/ubuntu/_base/core/tdeutils/debian/control +++ b/ubuntu/_base/core/tdeutils/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Fathi Boudra <fboudra@free.fr>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com> -Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, tdelibs14-trinity-dev, tdebase-trinity-dev, libkonq4-trinity-dev, libgmp3-dev, libsnmp-dev, libxpm-dev, python-all-dev, libxtst-dev, xutils +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, tdebase-trinity-dev, libkonq4-trinity-dev, libgmp3-dev, libsnmp-dev, libxpm-dev, python-all-dev, libxtst-dev, xutils Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11, tdelibs14-trinity-doc Standards-Version: 3.8.4 diff --git a/ubuntu/_base/core/tdevelop/debian/control b/ubuntu/_base/core/tdevelop/debian/control index 0e77d8950..ec0e2c48e 100644 --- a/ubuntu/_base/core/tdevelop/debian/control +++ b/ubuntu/_base/core/tdevelop/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Jeremy Lain <jeremy.laine@m4x.org> -Build-Depends: cdbs (>= 0.4.38), debhelper (>= 9~), quilt, cmake, tdelibs14-trinity-dev, tdelibs14-trinity-doc, libtqtinterface-doc, flex, python-all, libcvsservice-trinity-dev, groff-base, libsvn-dev, libaprutil1-dev, libdb-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, tdelibs14-trinity-doc, libtqtinterface-doc, flex, python-all, libcvsservice-trinity-dev, groff-base, libsvn-dev, libaprutil1-dev, libdb-dev Standards-Version: 3.8.4 Package: tdevelop-trinity diff --git a/ubuntu/_base/core/tdewebdev/debian/control b/ubuntu/_base/core/tdewebdev/debian/control index 616f4c878..c9cda4fbc 100644 --- a/ubuntu/_base/core/tdewebdev/debian/control +++ b/ubuntu/_base/core/tdewebdev/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Adeodato Sim <dato@net.com.org.es>, Ana Beatriz Guerrero Lopez <ana@debian.org>, Armin Berres <trigger+debian@space-based.de>, Sune Vuorela <debian@pusling.com> -Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, tdelibs14-trinity-dev, tqt3-doc, libreadline-dev | libreadline6-dev | libreadline5-dev, libxml2-dev, libxslt1-dev, libicu-dev, libcvsservice-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, tqt3-doc, libreadline-dev | libreadline6-dev | libreadline5-dev, libxml2-dev, libxslt1-dev, libicu-dev, libcvsservice-trinity-dev Standards-Version: 3.8.4 Homepage: http://trinity.pearsoncomputing.net diff --git a/ubuntu/_base/core/tdewebdev/debian/patches/common/README b/ubuntu/_base/core/tdewebdev/debian/patches/common/README deleted file mode 100644 index 9e81cc359..000000000 --- a/ubuntu/_base/core/tdewebdev/debian/patches/common/README +++ /dev/null @@ -1,14 +0,0 @@ -Common patches across TDE Debian packages -========================================= - - These directory should contain patches to the admin/ subdir of TDE - modules that are meant to be applied to all packaged modules. As the - admin/ subdir is shared across modules (and so, it's identical for all - modules at a certain version), I think it makes sense to have these - patches in a central location, and update them here. - - The script update.sh takes care of automatically updating the patches - that update autotools and libtool. You need to pass the location of an - admin/ directory as the first argument. - - -- Adeodato Simó, 2005-02-26 diff --git a/ubuntu/_base/core/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/_base/core/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff deleted file mode 100644 index 28c95742b..000000000 --- a/ubuntu/_base/core/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff +++ /dev/null @@ -1,26 +0,0 @@ ---- kde/admin/cvs.sh 2005-11-26 02:42:02.000000000 +0000 -+++ kde/admin/cvs.sh 2005-11-26 02:42:26.000000000 +0000 -@@ -537,6 +537,8 @@ - if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi - export EXTRACTRC PREPARETIPS - -+kdepotpath=/usr/include/tde/tde.pot -+ - for subdir in $dirs; do - test -z "$VERBOSE" || echo "Making messages in $subdir" - (cd $subdir -@@ -554,10 +556,10 @@ - fi - perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile - -- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot -- if ! test -f $kdepotpath; then -- kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot -- fi -+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot -+# if ! test -f $kdepotpath; then -+# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot -+# fi - - $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ - XGETTEXT="${XGETTEXT:-xgettext} --foreign-user -C -ci18n -ki18n -ktr2i18n -kI18N_NOOP -kI18N_NOOP2 -kaliasLocale -x $kdepotpath" messages diff --git a/ubuntu/_base/core/tdewebdev/debian/patches/series b/ubuntu/_base/core/tdewebdev/debian/patches/series index 8f8f0bd6b..e69de29bb 100644 --- a/ubuntu/_base/core/tdewebdev/debian/patches/series +++ b/ubuntu/_base/core/tdewebdev/debian/patches/series @@ -1 +0,0 @@ -common/kubuntu_01_kdepot.diff diff --git a/ubuntu/_base/dependencies/akode/debian/control b/ubuntu/_base/dependencies/akode/debian/control index c27d6439d..f183c3510 100644 --- a/ubuntu/_base/dependencies/akode/debian/control +++ b/ubuntu/_base/dependencies/akode/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Isaac Clerencia <isaac@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Adeodato Simó <dato@net.com.org.es> -Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, gawk, libflac-dev (>= 1.1.1-3), libflac-dev, libmad0-dev, libogg-dev, libvorbis-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsamplerate0-dev, libspeex-dev, libpulse-dev, libjack-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, libflac-dev (>= 1.1.1-3), libflac-dev, libmad0-dev, libogg-dev, libvorbis-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsamplerate0-dev, libspeex-dev, libpulse-dev, libjack-dev Standards-Version: 3.7.3 Package: libakode2 diff --git a/ubuntu/_base/dependencies/akode/debian/patches/series b/ubuntu/_base/dependencies/akode/debian/patches/series index 8b1378917..e69de29bb 100644 --- a/ubuntu/_base/dependencies/akode/debian/patches/series +++ b/ubuntu/_base/dependencies/akode/debian/patches/series @@ -1 +0,0 @@ - diff --git a/ubuntu/_base/dependencies/arts/debian/control b/ubuntu/_base/dependencies/arts/debian/control index 3e9e0b15a..5b00ea547 100644 --- a/ubuntu/_base/dependencies/arts/debian/control +++ b/ubuntu/_base/dependencies/arts/debian/control @@ -4,12 +4,12 @@ Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Qt/TDE Maintainers <debian-qt-tde@lists.debian.org> Priority: optional Uploaders: Adeodato Sim <dato@net.com.org.es>, Ana Beatriz Guerrero Lopez <ana@debian.org>, Fathi Boudra <fabo@debian.org>, Modestas Vainius <modestas@vainius.eu> -Build-Depends: cdbs (>= 0.4.48), debhelper (>= 9~), quilt, - docbook-to-man, gawk, sharutils, texinfo, +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, + docbook-to-man, texinfo, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libaudio-dev, libaudiofile-dev, libglib2.0-dev, libmad0-dev, libogg-dev, libtqtinterface-dev, - libvorbis-dev, cmake, libltdl-dev + libvorbis-dev, libltdl-dev Build-Conflicts: libmas-dev Standards-Version: 3.8.4 diff --git a/ubuntu/_base/dependencies/avahi-tqt/debian/cdbs/debian-tde.mk b/ubuntu/_base/dependencies/avahi-tqt/debian/cdbs/debian-tde.mk new file mode 100644 index 000000000..f36e3527c --- /dev/null +++ b/ubuntu/_base/dependencies/avahi-tqt/debian/cdbs/debian-tde.mk @@ -0,0 +1,246 @@ +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2003 Christopher L Cheney <ccheney@debian.org> +# Copyright © 2019 TDE Team +# Description: A class for TDE packages; sets TDE environment variables, etc +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2, or (at +# your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +# 02111-1307 USA. + +ifndef _cdbs_bootstrap +_cdbs_scripts_path ?= /usr/lib/cdbs +_cdbs_rules_path ?= /usr/share/cdbs/1/rules +_cdbs_class_path ?= /usr/share/cdbs/1/class +endif + +ifndef _cdbs_class_debian-qt-kde +_cdbs_class_debian-qt-kde := 1 + +# for dh_icons +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4) + +# Note: This _must_ be included before autotools.mk, or it won't work. +common-configure-arch common-configure-indep:: debian/stamp-cvs-make +debian/stamp-cvs-make: +ifndef _cdbs_class_cmake + cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in +ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" "" + cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh +endif +ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" "" + cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh +endif + $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; +endif + touch debian/stamp-cvs-make + +include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix) + +ifdef _cdbs_tarball_dir +DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE) +else +DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) +endif + +ifndef _cdbs_class_cmake +include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) +endif + +ifdef _cdbs_class_cmake +ifneq "$(wildcard /usr/bin/ninja)" "" +MAKE = ninja -v +DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR) +DEB_MAKE_INSTALL_TARGET = install +DEB_CMAKE_NORMAL_ARGS += -GNinja +endif +endif + +ifndef _cdbs_rules_patchsys_quilt +DEB_PATCHDIRS := debian/patches/common debian/patches +endif + +export kde_cgidir = \$${libdir}/cgi-bin +export kde_confdir = \$${sysconfdir}/trinity +export kde_htmldir = \$${datadir}/doc/tde/HTML + +DEB_KDE_ENABLE_FINAL := yes +DEB_INSTALL_DOCS_ALL := + +DEB_DH_MAKESHLIBS_ARGS_ALL := -V +DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib) + +DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" +DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el + +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + +ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb + ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) + cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,) + else + cdbs_kde_enable_final = + endif +endif + +ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_final = + cdbs_kde_enable_debug = --enable-debug=yes +else + cdbs_kde_enable_debug = --disable-debug +endif + +ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_debug = --enable-debug=full +endif + +DEB_BUILD_PARALLEL ?= true + +cdbs_configure_flags += \ + --with-qt-dir=/usr/share/qt3 \ + --disable-rpath \ + --with-xinerama \ + $(cdbs_kde_enable_final) \ + $(cdbs_kde_enable_debug) + + +# This is a convenience target for calling manually. +# It's not part of the build process. +buildprep: clean apply-patches +ifndef _cdbs_class_cmake + $(MAKE) -f admin/Makefile.common dist +endif + debian/rules clean + +.tdepkginfo: + echo "# TDE package information" >.tdepkginfo + dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo + dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo + date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo + +post-patches:: .tdepkginfo + +common-build-arch:: debian/stamp-man-pages +debian/stamp-man-pages: + if ! test -d debian/man/out; then mkdir -p debian/man/out; fi + for f in $$(find debian/man -name '*.sgml'); do \ + docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \ + done + for f in $$(find debian/man -name '*.man'); do \ + soelim -I debian/man $$f \ + > debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \ + done + touch debian/stamp-man-pages + +common-binary-indep:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_INDEP_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + +common-binary-arch:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_ARCH_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + # update multi-arch path in install files + ls -d debian/* | \ + grep -E "(install|links)$$" | \ + while read a; do \ + [ -d $$a ] || [ -f $$a.arch ] || \ + ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \ + sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \ + done + +clean:: + rm -rf debian/man/out + -rmdir debian/man + rm -f debian/stamp-man-pages + rm -rf debian/shlibs-check + # revert multi-arch path in install files + ls -d debian/* | \ + grep -E "(install|links)$$" | \ + while read a; do \ + [ ! -f $$a.arch ] || \ + mv $$a.arch $$a; \ + done + +$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: + if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi + if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi + if test -e debian/$(cdbs_curpkg).lintian; then \ + install -p -D -m644 debian/$(cdbs_curpkg).lintian \ + debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \ + fi + if test -e debian/$(cdbs_curpkg).presubj; then \ + install -p -D -m644 debian/$(cdbs_curpkg).presubj \ + debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ + fi + +binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: + set -e; \ + for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \ + pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \ + echo Building $$pkg HTML docs...; \ + mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + /opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \ + done + for pkg in $(DOC_HTML_PRUNE) ; do \ + rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + done + +common-build-indep:: debian/stamp-kde-apidox +debian/stamp-kde-apidox: + $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) + touch $@ + +common-install-indep:: common-install-kde-apidox +common-install-kde-apidox:: + $(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox) + +cleanbuilddir:: + -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR)) + +clean:: +ifndef _cdbs_class_cmake + if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \ + cd $(DEB_SRCDIR); \ + find . -name Makefile.in -print | \ + xargs --no-run-if-empty rm -f; \ + rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \ + configure configure.files configure.in stamp-h.in \ + subdirs; \ + fi +endif + rm -f .tdepkginfo + rm -f debian/stamp-kde-apidox + rm -f debian/stamp-cvs-make + +endif diff --git a/ubuntu/_base/dependencies/avahi-tqt/debian/cdbs/versions.pl b/ubuntu/_base/dependencies/avahi-tqt/debian/cdbs/versions.pl new file mode 100644 index 000000000..1b110f7af --- /dev/null +++ b/ubuntu/_base/dependencies/avahi-tqt/debian/cdbs/versions.pl @@ -0,0 +1,19 @@ +#!/usr/bin/env perl + +use strict; +use warnings; + +my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`; +my ($version3, $version3_next); +my ($version2, $version2_next); + +($version3 = $version) =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/; +($version2 = $version3) =~ s/\.[^.]+$//; + +($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e; +($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e; + +print "TDE-Version3=$version3\n"; +print "TDE-Version2=$version2\n"; +print "TDE-Next-Version3=$version3_next\n"; +print "TDE-Next-Version2=$version2_next\n"; diff --git a/ubuntu/_base/dependencies/avahi-tqt/debian/control b/ubuntu/_base/dependencies/avahi-tqt/debian/control index b3b68b176..cb06b6e20 100644 --- a/ubuntu/_base/dependencies/avahi-tqt/debian/control +++ b/ubuntu/_base/dependencies/avahi-tqt/debian/control @@ -3,10 +3,9 @@ Section: net Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> -Build-Depends: debhelper (>= 9~), - cmake, +Build-Depends: cdbs, debhelper (>= 9~), quilt, + cmake, ninja-build, gcc, - cdbs, pkg-config, libtqtinterface-dev, libavahi-common-dev, diff --git a/ubuntu/_base/dependencies/avahi-tqt/debian/patches/series b/ubuntu/_base/dependencies/avahi-tqt/debian/patches/series new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/ubuntu/_base/dependencies/avahi-tqt/debian/patches/series diff --git a/ubuntu/_base/dependencies/avahi-tqt/debian/rules b/ubuntu/_base/dependencies/avahi-tqt/debian/rules index 42b7e8ec6..dc8f0248c 100755 --- a/ubuntu/_base/dependencies/avahi-tqt/debian/rules +++ b/ubuntu/_base/dependencies/avahi-tqt/debian/rules @@ -2,21 +2,12 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk +include debian/cdbs/debian-tde.mk # Ensure at build time that the library has no dependencies on undefined # symbols, and speed up loading. export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,-z,defs -Wl,-O1 -# The default gzip compressor has been changed in dpkg >= 1.17.0. -deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ - sed -e "s|.*version ||" -e "s| .*||" | \ - xargs -r dpkg --compare-versions 1.17.0 lt \ - && echo xz || echo gzip) -ifeq ($(deb_default_compress),gzip) -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) -endif - # Build options DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ diff --git a/ubuntu/_base/dependencies/dbus-1-tqt/debian/control b/ubuntu/_base/dependencies/dbus-1-tqt/debian/control index 01c10d2ba..8bbc68466 100644 --- a/ubuntu/_base/dependencies/dbus-1-tqt/debian/control +++ b/ubuntu/_base/dependencies/dbus-1-tqt/debian/control @@ -2,7 +2,7 @@ Source: dbus-1-tqt Section: devel Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: cdbs (>= 0.4.43), debhelper (>= 9~), quilt, libtqtinterface-dev, libdbus-1-dev (>= 0.90), cmake +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, libtqtinterface-dev, libdbus-1-dev (>= 0.90) Build-Depends-Indep: doxygen, graphviz Standards-Version: 3.8.3 diff --git a/ubuntu/_base/dependencies/dbus-tqt/debian/cdbs/debian-tde.mk b/ubuntu/_base/dependencies/dbus-tqt/debian/cdbs/debian-tde.mk new file mode 100644 index 000000000..f36e3527c --- /dev/null +++ b/ubuntu/_base/dependencies/dbus-tqt/debian/cdbs/debian-tde.mk @@ -0,0 +1,246 @@ +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2003 Christopher L Cheney <ccheney@debian.org> +# Copyright © 2019 TDE Team +# Description: A class for TDE packages; sets TDE environment variables, etc +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2, or (at +# your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +# 02111-1307 USA. + +ifndef _cdbs_bootstrap +_cdbs_scripts_path ?= /usr/lib/cdbs +_cdbs_rules_path ?= /usr/share/cdbs/1/rules +_cdbs_class_path ?= /usr/share/cdbs/1/class +endif + +ifndef _cdbs_class_debian-qt-kde +_cdbs_class_debian-qt-kde := 1 + +# for dh_icons +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4) + +# Note: This _must_ be included before autotools.mk, or it won't work. +common-configure-arch common-configure-indep:: debian/stamp-cvs-make +debian/stamp-cvs-make: +ifndef _cdbs_class_cmake + cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in +ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" "" + cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh +endif +ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" "" + cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh +endif + $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; +endif + touch debian/stamp-cvs-make + +include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix) + +ifdef _cdbs_tarball_dir +DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE) +else +DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) +endif + +ifndef _cdbs_class_cmake +include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) +endif + +ifdef _cdbs_class_cmake +ifneq "$(wildcard /usr/bin/ninja)" "" +MAKE = ninja -v +DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR) +DEB_MAKE_INSTALL_TARGET = install +DEB_CMAKE_NORMAL_ARGS += -GNinja +endif +endif + +ifndef _cdbs_rules_patchsys_quilt +DEB_PATCHDIRS := debian/patches/common debian/patches +endif + +export kde_cgidir = \$${libdir}/cgi-bin +export kde_confdir = \$${sysconfdir}/trinity +export kde_htmldir = \$${datadir}/doc/tde/HTML + +DEB_KDE_ENABLE_FINAL := yes +DEB_INSTALL_DOCS_ALL := + +DEB_DH_MAKESHLIBS_ARGS_ALL := -V +DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib) + +DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" +DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el + +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + +ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb + ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) + cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,) + else + cdbs_kde_enable_final = + endif +endif + +ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_final = + cdbs_kde_enable_debug = --enable-debug=yes +else + cdbs_kde_enable_debug = --disable-debug +endif + +ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_debug = --enable-debug=full +endif + +DEB_BUILD_PARALLEL ?= true + +cdbs_configure_flags += \ + --with-qt-dir=/usr/share/qt3 \ + --disable-rpath \ + --with-xinerama \ + $(cdbs_kde_enable_final) \ + $(cdbs_kde_enable_debug) + + +# This is a convenience target for calling manually. +# It's not part of the build process. +buildprep: clean apply-patches +ifndef _cdbs_class_cmake + $(MAKE) -f admin/Makefile.common dist +endif + debian/rules clean + +.tdepkginfo: + echo "# TDE package information" >.tdepkginfo + dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo + dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo + date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo + +post-patches:: .tdepkginfo + +common-build-arch:: debian/stamp-man-pages +debian/stamp-man-pages: + if ! test -d debian/man/out; then mkdir -p debian/man/out; fi + for f in $$(find debian/man -name '*.sgml'); do \ + docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \ + done + for f in $$(find debian/man -name '*.man'); do \ + soelim -I debian/man $$f \ + > debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \ + done + touch debian/stamp-man-pages + +common-binary-indep:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_INDEP_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + +common-binary-arch:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_ARCH_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + # update multi-arch path in install files + ls -d debian/* | \ + grep -E "(install|links)$$" | \ + while read a; do \ + [ -d $$a ] || [ -f $$a.arch ] || \ + ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \ + sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \ + done + +clean:: + rm -rf debian/man/out + -rmdir debian/man + rm -f debian/stamp-man-pages + rm -rf debian/shlibs-check + # revert multi-arch path in install files + ls -d debian/* | \ + grep -E "(install|links)$$" | \ + while read a; do \ + [ ! -f $$a.arch ] || \ + mv $$a.arch $$a; \ + done + +$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: + if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi + if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi + if test -e debian/$(cdbs_curpkg).lintian; then \ + install -p -D -m644 debian/$(cdbs_curpkg).lintian \ + debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \ + fi + if test -e debian/$(cdbs_curpkg).presubj; then \ + install -p -D -m644 debian/$(cdbs_curpkg).presubj \ + debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ + fi + +binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: + set -e; \ + for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \ + pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \ + echo Building $$pkg HTML docs...; \ + mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + /opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \ + done + for pkg in $(DOC_HTML_PRUNE) ; do \ + rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + done + +common-build-indep:: debian/stamp-kde-apidox +debian/stamp-kde-apidox: + $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) + touch $@ + +common-install-indep:: common-install-kde-apidox +common-install-kde-apidox:: + $(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox) + +cleanbuilddir:: + -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR)) + +clean:: +ifndef _cdbs_class_cmake + if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \ + cd $(DEB_SRCDIR); \ + find . -name Makefile.in -print | \ + xargs --no-run-if-empty rm -f; \ + rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \ + configure configure.files configure.in stamp-h.in \ + subdirs; \ + fi +endif + rm -f .tdepkginfo + rm -f debian/stamp-kde-apidox + rm -f debian/stamp-cvs-make + +endif diff --git a/ubuntu/_base/dependencies/dbus-tqt/debian/cdbs/versions.pl b/ubuntu/_base/dependencies/dbus-tqt/debian/cdbs/versions.pl new file mode 100644 index 000000000..1b110f7af --- /dev/null +++ b/ubuntu/_base/dependencies/dbus-tqt/debian/cdbs/versions.pl @@ -0,0 +1,19 @@ +#!/usr/bin/env perl + +use strict; +use warnings; + +my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`; +my ($version3, $version3_next); +my ($version2, $version2_next); + +($version3 = $version) =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/; +($version2 = $version3) =~ s/\.[^.]+$//; + +($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e; +($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e; + +print "TDE-Version3=$version3\n"; +print "TDE-Version2=$version2\n"; +print "TDE-Next-Version3=$version3_next\n"; +print "TDE-Next-Version2=$version2_next\n"; diff --git a/ubuntu/_base/dependencies/dbus-tqt/debian/control b/ubuntu/_base/dependencies/dbus-tqt/debian/control index 4bd589370..221bd5ca1 100644 --- a/ubuntu/_base/dependencies/dbus-tqt/debian/control +++ b/ubuntu/_base/dependencies/dbus-tqt/debian/control @@ -3,25 +3,9 @@ Section: devel Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> Uploaders: Sjoerd Simons <sjoerd@debian.org>, Sebastian Drge <slomo@ubuntu.com> -Build-Depends: cdbs (>= 0.4.43), debhelper (>= 9~), quilt, libtqtinterface-dev, libdbus-1-dev (>= 0.90), cmake +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, libtqtinterface-dev, libdbus-1-dev (>= 0.90) Standards-Version: 3.8.3 -Package: libdbus-tqt-1-dev -Section: libdevel -Architecture: any -Replaces: libdbus-tqt-1-dev (<< 4:14.0.0~) -Breaks: libdbus-tqt-1-dev (<< 4:14.0.0~) -Depends: libdbus-tqt-1-1c2 (= ${source:Version}), libdbus-1-dev (>= 0.90), libtqtinterface-dev -Conflicts: dbus-tqt-1-dev -Description: simple interprocess messaging system (TQt interface) - D-BUS is a message bus, used for sending messages between applications. - Conceptually, it fits somewhere in between raw sockets and CORBA in - terms of complexity. - . - This package provides a TQt-style interface to D-BUS. - . - See the dbus description for more information about D-BUS in general. - Package: libdbus-tqt-1-1c2 Section: libs Architecture: any @@ -39,3 +23,18 @@ Description: simple interprocess messaging system (TQt-based shared library) . See the dbus description for more information about D-BUS in general. +Package: libdbus-tqt-1-dev +Section: libdevel +Architecture: any +Replaces: libdbus-tqt-1-dev (<< 4:14.0.0~) +Breaks: libdbus-tqt-1-dev (<< 4:14.0.0~) +Depends: libdbus-tqt-1-1c2 (= ${source:Version}), libdbus-1-dev (>= 0.90), libtqtinterface-dev +Conflicts: dbus-tqt-1-dev +Description: simple interprocess messaging system (TQt interface) + D-BUS is a message bus, used for sending messages between applications. + Conceptually, it fits somewhere in between raw sockets and CORBA in + terms of complexity. + . + This package provides a TQt-style interface to D-BUS. + . + See the dbus description for more information about D-BUS in general. diff --git a/ubuntu/_base/dependencies/dbus-tqt/debian/docs b/ubuntu/_base/dependencies/dbus-tqt/debian/docs new file mode 100644 index 000000000..6f83607c1 --- /dev/null +++ b/ubuntu/_base/dependencies/dbus-tqt/debian/docs @@ -0,0 +1,3 @@ +AUTHORS +NEWS +README diff --git a/ubuntu/_base/dependencies/dbus-tqt/debian/rules b/ubuntu/_base/dependencies/dbus-tqt/debian/rules index ee5d0916d..ff4a21c43 100755 --- a/ubuntu/_base/dependencies/dbus-tqt/debian/rules +++ b/ubuntu/_base/dependencies/dbus-tqt/debian/rules @@ -4,19 +4,17 @@ # Copyright © 2006 Sjoerd Simons <sjoerd@debian.org> #include /usr/share/cdbs/1/rules/patchsys-quilt.mk -include /usr/share/cdbs/1/rules/utils.mk include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk +include debian/cdbs/debian-tde.mk # Strict library versioning DEB_DH_MAKESHLIBS_ARGS_ALL := -V -# The default gzip compressor has been changed in dpkg >= 1.17.0. -deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ - sed -e "s|.*version ||" -e "s| .*||" | \ - xargs -r dpkg --compare-versions 1.17.0 lt \ - && echo xz || echo gzip) -ifeq ($(deb_default_compress),gzip) -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) -endif +# Build options +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DWITH_ALL_OPTIONS="ON" diff --git a/ubuntu/_base/dependencies/libart-lgpl/debian/cdbs/debian-tde.mk b/ubuntu/_base/dependencies/libart-lgpl/debian/cdbs/debian-tde.mk new file mode 100644 index 000000000..f36e3527c --- /dev/null +++ b/ubuntu/_base/dependencies/libart-lgpl/debian/cdbs/debian-tde.mk @@ -0,0 +1,246 @@ +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2003 Christopher L Cheney <ccheney@debian.org> +# Copyright © 2019 TDE Team +# Description: A class for TDE packages; sets TDE environment variables, etc +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2, or (at +# your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +# 02111-1307 USA. + +ifndef _cdbs_bootstrap +_cdbs_scripts_path ?= /usr/lib/cdbs +_cdbs_rules_path ?= /usr/share/cdbs/1/rules +_cdbs_class_path ?= /usr/share/cdbs/1/class +endif + +ifndef _cdbs_class_debian-qt-kde +_cdbs_class_debian-qt-kde := 1 + +# for dh_icons +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4) + +# Note: This _must_ be included before autotools.mk, or it won't work. +common-configure-arch common-configure-indep:: debian/stamp-cvs-make +debian/stamp-cvs-make: +ifndef _cdbs_class_cmake + cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in +ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" "" + cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh +endif +ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" "" + cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh +endif + $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; +endif + touch debian/stamp-cvs-make + +include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix) + +ifdef _cdbs_tarball_dir +DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE) +else +DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) +endif + +ifndef _cdbs_class_cmake +include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) +endif + +ifdef _cdbs_class_cmake +ifneq "$(wildcard /usr/bin/ninja)" "" +MAKE = ninja -v +DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR) +DEB_MAKE_INSTALL_TARGET = install +DEB_CMAKE_NORMAL_ARGS += -GNinja +endif +endif + +ifndef _cdbs_rules_patchsys_quilt +DEB_PATCHDIRS := debian/patches/common debian/patches +endif + +export kde_cgidir = \$${libdir}/cgi-bin +export kde_confdir = \$${sysconfdir}/trinity +export kde_htmldir = \$${datadir}/doc/tde/HTML + +DEB_KDE_ENABLE_FINAL := yes +DEB_INSTALL_DOCS_ALL := + +DEB_DH_MAKESHLIBS_ARGS_ALL := -V +DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib) + +DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" +DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el + +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + +ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb + ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) + cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,) + else + cdbs_kde_enable_final = + endif +endif + +ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_final = + cdbs_kde_enable_debug = --enable-debug=yes +else + cdbs_kde_enable_debug = --disable-debug +endif + +ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_debug = --enable-debug=full +endif + +DEB_BUILD_PARALLEL ?= true + +cdbs_configure_flags += \ + --with-qt-dir=/usr/share/qt3 \ + --disable-rpath \ + --with-xinerama \ + $(cdbs_kde_enable_final) \ + $(cdbs_kde_enable_debug) + + +# This is a convenience target for calling manually. +# It's not part of the build process. +buildprep: clean apply-patches +ifndef _cdbs_class_cmake + $(MAKE) -f admin/Makefile.common dist +endif + debian/rules clean + +.tdepkginfo: + echo "# TDE package information" >.tdepkginfo + dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo + dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo + date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo + +post-patches:: .tdepkginfo + +common-build-arch:: debian/stamp-man-pages +debian/stamp-man-pages: + if ! test -d debian/man/out; then mkdir -p debian/man/out; fi + for f in $$(find debian/man -name '*.sgml'); do \ + docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \ + done + for f in $$(find debian/man -name '*.man'); do \ + soelim -I debian/man $$f \ + > debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \ + done + touch debian/stamp-man-pages + +common-binary-indep:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_INDEP_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + +common-binary-arch:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_ARCH_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + # update multi-arch path in install files + ls -d debian/* | \ + grep -E "(install|links)$$" | \ + while read a; do \ + [ -d $$a ] || [ -f $$a.arch ] || \ + ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \ + sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \ + done + +clean:: + rm -rf debian/man/out + -rmdir debian/man + rm -f debian/stamp-man-pages + rm -rf debian/shlibs-check + # revert multi-arch path in install files + ls -d debian/* | \ + grep -E "(install|links)$$" | \ + while read a; do \ + [ ! -f $$a.arch ] || \ + mv $$a.arch $$a; \ + done + +$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: + if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi + if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi + if test -e debian/$(cdbs_curpkg).lintian; then \ + install -p -D -m644 debian/$(cdbs_curpkg).lintian \ + debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \ + fi + if test -e debian/$(cdbs_curpkg).presubj; then \ + install -p -D -m644 debian/$(cdbs_curpkg).presubj \ + debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ + fi + +binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: + set -e; \ + for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \ + pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \ + echo Building $$pkg HTML docs...; \ + mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + /opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \ + done + for pkg in $(DOC_HTML_PRUNE) ; do \ + rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + done + +common-build-indep:: debian/stamp-kde-apidox +debian/stamp-kde-apidox: + $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) + touch $@ + +common-install-indep:: common-install-kde-apidox +common-install-kde-apidox:: + $(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox) + +cleanbuilddir:: + -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR)) + +clean:: +ifndef _cdbs_class_cmake + if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \ + cd $(DEB_SRCDIR); \ + find . -name Makefile.in -print | \ + xargs --no-run-if-empty rm -f; \ + rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \ + configure configure.files configure.in stamp-h.in \ + subdirs; \ + fi +endif + rm -f .tdepkginfo + rm -f debian/stamp-kde-apidox + rm -f debian/stamp-cvs-make + +endif diff --git a/ubuntu/_base/dependencies/libart-lgpl/debian/cdbs/versions.pl b/ubuntu/_base/dependencies/libart-lgpl/debian/cdbs/versions.pl new file mode 100644 index 000000000..1b110f7af --- /dev/null +++ b/ubuntu/_base/dependencies/libart-lgpl/debian/cdbs/versions.pl @@ -0,0 +1,19 @@ +#!/usr/bin/env perl + +use strict; +use warnings; + +my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`; +my ($version3, $version3_next); +my ($version2, $version2_next); + +($version3 = $version) =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/; +($version2 = $version3) =~ s/\.[^.]+$//; + +($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e; +($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e; + +print "TDE-Version3=$version3\n"; +print "TDE-Version2=$version2\n"; +print "TDE-Next-Version3=$version3_next\n"; +print "TDE-Next-Version2=$version2_next\n"; diff --git a/ubuntu/_base/dependencies/libart-lgpl/debian/control b/ubuntu/_base/dependencies/libart-lgpl/debian/control index 2ea76f718..1dd78c111 100644 --- a/ubuntu/_base/dependencies/libart-lgpl/debian/control +++ b/ubuntu/_base/dependencies/libart-lgpl/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Josselin Mouette <joss@debian.org> Standards-Version: 3.8.4 -Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build Package: libart-2.0-2 Architecture: any diff --git a/ubuntu/_base/dependencies/libart-lgpl/debian/docs b/ubuntu/_base/dependencies/libart-lgpl/debian/docs new file mode 100644 index 000000000..6f83607c1 --- /dev/null +++ b/ubuntu/_base/dependencies/libart-lgpl/debian/docs @@ -0,0 +1,3 @@ +AUTHORS +NEWS +README diff --git a/ubuntu/_base/dependencies/libart-lgpl/debian/rules b/ubuntu/_base/dependencies/libart-lgpl/debian/rules index ab3beba75..affcc25c7 100755 --- a/ubuntu/_base/dependencies/libart-lgpl/debian/rules +++ b/ubuntu/_base/dependencies/libart-lgpl/debian/rules @@ -2,21 +2,12 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk +include debian/cdbs/debian-tde.mk libart-2.0-N := $(shell sed -rn 's/^Package:[[:space:]]*(libart-2\.0-[0-9]+)[[:space:]]*$$/\1/p' debian/control) DEB_DH_MAKESHLIBS_ARGS_$(libart-2.0-N) += -V '$(libart-2.0-N)(>= 2.3.18)' -# The default gzip compressor has been changed in dpkg >= 1.17.0. -deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ - sed -e "s|.*version ||" -e "s| .*||" | \ - xargs -r dpkg --compare-versions 1.17.0 lt \ - && echo xz || echo gzip) -ifeq ($(deb_default_compress),gzip) -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) -endif - # Build options DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ diff --git a/ubuntu/_base/dependencies/libcaldav/debian/control b/ubuntu/_base/dependencies/libcaldav/debian/control index 1b11f6d11..441cabae2 100644 --- a/ubuntu/_base/dependencies/libcaldav/debian/control +++ b/ubuntu/_base/dependencies/libcaldav/debian/control @@ -2,7 +2,7 @@ Source: libcaldav Section: graphics Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, libcurl4-gnutls-dev (>= 7.19), libglib2.0-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, libcurl4-gnutls-dev (>= 7.19), libglib2.0-dev Standards-Version: 3.8.3 Package: libcaldav diff --git a/ubuntu/_base/dependencies/libcarddav/debian/control b/ubuntu/_base/dependencies/libcarddav/debian/control index df3429f54..738c0f991 100644 --- a/ubuntu/_base/dependencies/libcarddav/debian/control +++ b/ubuntu/_base/dependencies/libcarddav/debian/control @@ -2,7 +2,7 @@ Source: libcarddav Section: graphics Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, libcurl4-gnutls-dev, libglib2.0-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, libcurl4-gnutls-dev, libglib2.0-dev Standards-Version: 3.8.4 Package: libcarddav diff --git a/ubuntu/_base/dependencies/libr/debian/README.Debian b/ubuntu/_base/dependencies/libr/debian/README.Debian deleted file mode 100644 index 120ea0ed1..000000000 --- a/ubuntu/_base/dependencies/libr/debian/README.Debian +++ /dev/null @@ -1,6 +0,0 @@ -libr for Debian ---------------- - -<possible notes regarding this package - if none, delete this file> - - -- Erich Hoover <ehoover@mines.edu> Tue, 03 Nov 2009 20:26:31 -0700 diff --git a/ubuntu/_base/dependencies/libr/debian/cdbs/debian-tde.mk b/ubuntu/_base/dependencies/libr/debian/cdbs/debian-tde.mk new file mode 100644 index 000000000..f36e3527c --- /dev/null +++ b/ubuntu/_base/dependencies/libr/debian/cdbs/debian-tde.mk @@ -0,0 +1,246 @@ +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2003 Christopher L Cheney <ccheney@debian.org> +# Copyright © 2019 TDE Team +# Description: A class for TDE packages; sets TDE environment variables, etc +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2, or (at +# your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +# 02111-1307 USA. + +ifndef _cdbs_bootstrap +_cdbs_scripts_path ?= /usr/lib/cdbs +_cdbs_rules_path ?= /usr/share/cdbs/1/rules +_cdbs_class_path ?= /usr/share/cdbs/1/class +endif + +ifndef _cdbs_class_debian-qt-kde +_cdbs_class_debian-qt-kde := 1 + +# for dh_icons +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4) + +# Note: This _must_ be included before autotools.mk, or it won't work. +common-configure-arch common-configure-indep:: debian/stamp-cvs-make +debian/stamp-cvs-make: +ifndef _cdbs_class_cmake + cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in +ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" "" + cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh +endif +ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" "" + cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh +endif + $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; +endif + touch debian/stamp-cvs-make + +include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix) + +ifdef _cdbs_tarball_dir +DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE) +else +DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) +endif + +ifndef _cdbs_class_cmake +include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) +endif + +ifdef _cdbs_class_cmake +ifneq "$(wildcard /usr/bin/ninja)" "" +MAKE = ninja -v +DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR) +DEB_MAKE_INSTALL_TARGET = install +DEB_CMAKE_NORMAL_ARGS += -GNinja +endif +endif + +ifndef _cdbs_rules_patchsys_quilt +DEB_PATCHDIRS := debian/patches/common debian/patches +endif + +export kde_cgidir = \$${libdir}/cgi-bin +export kde_confdir = \$${sysconfdir}/trinity +export kde_htmldir = \$${datadir}/doc/tde/HTML + +DEB_KDE_ENABLE_FINAL := yes +DEB_INSTALL_DOCS_ALL := + +DEB_DH_MAKESHLIBS_ARGS_ALL := -V +DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib) + +DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" +DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el + +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + +ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb + ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) + cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,) + else + cdbs_kde_enable_final = + endif +endif + +ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_final = + cdbs_kde_enable_debug = --enable-debug=yes +else + cdbs_kde_enable_debug = --disable-debug +endif + +ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_debug = --enable-debug=full +endif + +DEB_BUILD_PARALLEL ?= true + +cdbs_configure_flags += \ + --with-qt-dir=/usr/share/qt3 \ + --disable-rpath \ + --with-xinerama \ + $(cdbs_kde_enable_final) \ + $(cdbs_kde_enable_debug) + + +# This is a convenience target for calling manually. +# It's not part of the build process. +buildprep: clean apply-patches +ifndef _cdbs_class_cmake + $(MAKE) -f admin/Makefile.common dist +endif + debian/rules clean + +.tdepkginfo: + echo "# TDE package information" >.tdepkginfo + dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo + dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo + date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo + +post-patches:: .tdepkginfo + +common-build-arch:: debian/stamp-man-pages +debian/stamp-man-pages: + if ! test -d debian/man/out; then mkdir -p debian/man/out; fi + for f in $$(find debian/man -name '*.sgml'); do \ + docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \ + done + for f in $$(find debian/man -name '*.man'); do \ + soelim -I debian/man $$f \ + > debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \ + done + touch debian/stamp-man-pages + +common-binary-indep:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_INDEP_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + +common-binary-arch:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_ARCH_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + # update multi-arch path in install files + ls -d debian/* | \ + grep -E "(install|links)$$" | \ + while read a; do \ + [ -d $$a ] || [ -f $$a.arch ] || \ + ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \ + sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \ + done + +clean:: + rm -rf debian/man/out + -rmdir debian/man + rm -f debian/stamp-man-pages + rm -rf debian/shlibs-check + # revert multi-arch path in install files + ls -d debian/* | \ + grep -E "(install|links)$$" | \ + while read a; do \ + [ ! -f $$a.arch ] || \ + mv $$a.arch $$a; \ + done + +$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: + if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi + if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi + if test -e debian/$(cdbs_curpkg).lintian; then \ + install -p -D -m644 debian/$(cdbs_curpkg).lintian \ + debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \ + fi + if test -e debian/$(cdbs_curpkg).presubj; then \ + install -p -D -m644 debian/$(cdbs_curpkg).presubj \ + debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ + fi + +binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: + set -e; \ + for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \ + pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \ + echo Building $$pkg HTML docs...; \ + mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + /opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \ + done + for pkg in $(DOC_HTML_PRUNE) ; do \ + rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + done + +common-build-indep:: debian/stamp-kde-apidox +debian/stamp-kde-apidox: + $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) + touch $@ + +common-install-indep:: common-install-kde-apidox +common-install-kde-apidox:: + $(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox) + +cleanbuilddir:: + -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR)) + +clean:: +ifndef _cdbs_class_cmake + if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \ + cd $(DEB_SRCDIR); \ + find . -name Makefile.in -print | \ + xargs --no-run-if-empty rm -f; \ + rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \ + configure configure.files configure.in stamp-h.in \ + subdirs; \ + fi +endif + rm -f .tdepkginfo + rm -f debian/stamp-kde-apidox + rm -f debian/stamp-cvs-make + +endif diff --git a/ubuntu/_base/dependencies/libr/debian/cdbs/versions.pl b/ubuntu/_base/dependencies/libr/debian/cdbs/versions.pl new file mode 100644 index 000000000..1b110f7af --- /dev/null +++ b/ubuntu/_base/dependencies/libr/debian/cdbs/versions.pl @@ -0,0 +1,19 @@ +#!/usr/bin/env perl + +use strict; +use warnings; + +my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`; +my ($version3, $version3_next); +my ($version2, $version2_next); + +($version3 = $version) =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/; +($version2 = $version3) =~ s/\.[^.]+$//; + +($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e; +($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e; + +print "TDE-Version3=$version3\n"; +print "TDE-Version2=$version2\n"; +print "TDE-Next-Version3=$version3_next\n"; +print "TDE-Next-Version2=$version2_next\n"; diff --git a/ubuntu/_base/dependencies/libr/debian/control b/ubuntu/_base/dependencies/libr/debian/control index 74ad679f8..3b5803d1f 100644 --- a/ubuntu/_base/dependencies/libr/debian/control +++ b/ubuntu/_base/dependencies/libr/debian/control @@ -1,21 +1,21 @@ Source: libr Priority: extra Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: debhelper (>= 9~), cdbs, cmake, quilt, pkg-config, libglade2-dev, binutils-dev, doxygen +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, pkg-config, libglade2-dev, binutils-dev, doxygen Standards-Version: 3.8.4 Section: libs Homepage: http://www.compholio.com/elficon/ -Package: libr-dev -Section: libdevel +Package: libr0 +Section: libs Architecture: any -Depends: libr0 (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends} Description: ELF binary resource library Store and retrieve resources from ELF binaries. -Package: libr0 -Section: libs +Package: libr-dev +Section: libdevel Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: libr0 (= ${binary:Version}) Description: ELF binary resource library Store and retrieve resources from ELF binaries. diff --git a/ubuntu/_base/dependencies/libr/debian/docs b/ubuntu/_base/dependencies/libr/debian/docs index 50bd824bb..6f12db508 100644 --- a/ubuntu/_base/dependencies/libr/debian/docs +++ b/ubuntu/_base/dependencies/libr/debian/docs @@ -1,2 +1,2 @@ -NEWS +AUTHORS README diff --git a/ubuntu/_base/dependencies/libr/debian/rules b/ubuntu/_base/dependencies/libr/debian/rules index 2d7dda386..72e752cf6 100755 --- a/ubuntu/_base/dependencies/libr/debian/rules +++ b/ubuntu/_base/dependencies/libr/debian/rules @@ -2,19 +2,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/rules/utils.mk - -DEB_BUILD_PARALLEL ?= true - -# The default gzip compressor has been changed in dpkg >= 1.17.0. -deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ - sed -e "s|.*version ||" -e "s| .*||" | \ - xargs -r dpkg --compare-versions 1.17.0 lt \ - && echo xz || echo gzip) -ifeq ($(deb_default_compress),gzip) -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) -endif +include debian/cdbs/debian-tde.mk # Build options DEB_CMAKE_EXTRA_FLAGS := \ @@ -22,7 +10,3 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_SKIP_RPATH="OFF" \ -DCMAKE_VERBOSE_MAKEFILE="ON" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo - -clean:: - dh_testdir - rm -fr man/man3 diff --git a/ubuntu/_base/dependencies/tqca-tls/debian/control b/ubuntu/_base/dependencies/tqca-tls/debian/control index 121896f37..1c74ec299 100644 --- a/ubuntu/_base/dependencies/tqca-tls/debian/control +++ b/ubuntu/_base/dependencies/tqca-tls/debian/control @@ -2,7 +2,7 @@ Source: tqca-tls Section: libs Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, libtqca-dev, libssl-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, libtqca-dev, libssl-dev Standards-Version: 3.8.4 Package: tqca-tls diff --git a/ubuntu/_base/dependencies/tqca-tls/debian/patches/series b/ubuntu/_base/dependencies/tqca-tls/debian/patches/series new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/ubuntu/_base/dependencies/tqca-tls/debian/patches/series diff --git a/ubuntu/_base/dependencies/tqca/debian/control b/ubuntu/_base/dependencies/tqca/debian/control index 4b5fdb7cb..df897123b 100644 --- a/ubuntu/_base/dependencies/tqca/debian/control +++ b/ubuntu/_base/dependencies/tqca/debian/control @@ -2,7 +2,7 @@ Source: libtqca Section: libs Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, libtqtinterface-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, libtqtinterface-dev Standards-Version: 3.8.3 Package: libtqca diff --git a/ubuntu/_base/dependencies/tqca/debian/patches/series b/ubuntu/_base/dependencies/tqca/debian/patches/series new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/ubuntu/_base/dependencies/tqca/debian/patches/series diff --git a/ubuntu/_base/dependencies/tqtinterface/debian/cdbs/debian-tde.mk b/ubuntu/_base/dependencies/tqtinterface/debian/cdbs/debian-tde.mk new file mode 100644 index 000000000..f36e3527c --- /dev/null +++ b/ubuntu/_base/dependencies/tqtinterface/debian/cdbs/debian-tde.mk @@ -0,0 +1,246 @@ +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2003 Christopher L Cheney <ccheney@debian.org> +# Copyright © 2019 TDE Team +# Description: A class for TDE packages; sets TDE environment variables, etc +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2, or (at +# your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +# 02111-1307 USA. + +ifndef _cdbs_bootstrap +_cdbs_scripts_path ?= /usr/lib/cdbs +_cdbs_rules_path ?= /usr/share/cdbs/1/rules +_cdbs_class_path ?= /usr/share/cdbs/1/class +endif + +ifndef _cdbs_class_debian-qt-kde +_cdbs_class_debian-qt-kde := 1 + +# for dh_icons +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4) + +# Note: This _must_ be included before autotools.mk, or it won't work. +common-configure-arch common-configure-indep:: debian/stamp-cvs-make +debian/stamp-cvs-make: +ifndef _cdbs_class_cmake + cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in +ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" "" + cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh +endif +ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" "" + cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh +endif + $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; +endif + touch debian/stamp-cvs-make + +include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix) + +ifdef _cdbs_tarball_dir +DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE) +else +DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) +endif + +ifndef _cdbs_class_cmake +include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) +endif + +ifdef _cdbs_class_cmake +ifneq "$(wildcard /usr/bin/ninja)" "" +MAKE = ninja -v +DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR) +DEB_MAKE_INSTALL_TARGET = install +DEB_CMAKE_NORMAL_ARGS += -GNinja +endif +endif + +ifndef _cdbs_rules_patchsys_quilt +DEB_PATCHDIRS := debian/patches/common debian/patches +endif + +export kde_cgidir = \$${libdir}/cgi-bin +export kde_confdir = \$${sysconfdir}/trinity +export kde_htmldir = \$${datadir}/doc/tde/HTML + +DEB_KDE_ENABLE_FINAL := yes +DEB_INSTALL_DOCS_ALL := + +DEB_DH_MAKESHLIBS_ARGS_ALL := -V +DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib) + +DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" +DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el + +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + +ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb + ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) + cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,) + else + cdbs_kde_enable_final = + endif +endif + +ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_final = + cdbs_kde_enable_debug = --enable-debug=yes +else + cdbs_kde_enable_debug = --disable-debug +endif + +ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_debug = --enable-debug=full +endif + +DEB_BUILD_PARALLEL ?= true + +cdbs_configure_flags += \ + --with-qt-dir=/usr/share/qt3 \ + --disable-rpath \ + --with-xinerama \ + $(cdbs_kde_enable_final) \ + $(cdbs_kde_enable_debug) + + +# This is a convenience target for calling manually. +# It's not part of the build process. +buildprep: clean apply-patches +ifndef _cdbs_class_cmake + $(MAKE) -f admin/Makefile.common dist +endif + debian/rules clean + +.tdepkginfo: + echo "# TDE package information" >.tdepkginfo + dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo + dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo + date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo + +post-patches:: .tdepkginfo + +common-build-arch:: debian/stamp-man-pages +debian/stamp-man-pages: + if ! test -d debian/man/out; then mkdir -p debian/man/out; fi + for f in $$(find debian/man -name '*.sgml'); do \ + docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \ + done + for f in $$(find debian/man -name '*.man'); do \ + soelim -I debian/man $$f \ + > debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \ + done + touch debian/stamp-man-pages + +common-binary-indep:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_INDEP_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + +common-binary-arch:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_ARCH_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + # update multi-arch path in install files + ls -d debian/* | \ + grep -E "(install|links)$$" | \ + while read a; do \ + [ -d $$a ] || [ -f $$a.arch ] || \ + ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \ + sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \ + done + +clean:: + rm -rf debian/man/out + -rmdir debian/man + rm -f debian/stamp-man-pages + rm -rf debian/shlibs-check + # revert multi-arch path in install files + ls -d debian/* | \ + grep -E "(install|links)$$" | \ + while read a; do \ + [ ! -f $$a.arch ] || \ + mv $$a.arch $$a; \ + done + +$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: + if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi + if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi + if test -e debian/$(cdbs_curpkg).lintian; then \ + install -p -D -m644 debian/$(cdbs_curpkg).lintian \ + debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \ + fi + if test -e debian/$(cdbs_curpkg).presubj; then \ + install -p -D -m644 debian/$(cdbs_curpkg).presubj \ + debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ + fi + +binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: + set -e; \ + for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \ + pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \ + echo Building $$pkg HTML docs...; \ + mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + /opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \ + done + for pkg in $(DOC_HTML_PRUNE) ; do \ + rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + done + +common-build-indep:: debian/stamp-kde-apidox +debian/stamp-kde-apidox: + $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) + touch $@ + +common-install-indep:: common-install-kde-apidox +common-install-kde-apidox:: + $(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox) + +cleanbuilddir:: + -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR)) + +clean:: +ifndef _cdbs_class_cmake + if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \ + cd $(DEB_SRCDIR); \ + find . -name Makefile.in -print | \ + xargs --no-run-if-empty rm -f; \ + rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \ + configure configure.files configure.in stamp-h.in \ + subdirs; \ + fi +endif + rm -f .tdepkginfo + rm -f debian/stamp-kde-apidox + rm -f debian/stamp-cvs-make + +endif diff --git a/ubuntu/_base/dependencies/tqtinterface/debian/cdbs/versions.pl b/ubuntu/_base/dependencies/tqtinterface/debian/cdbs/versions.pl new file mode 100644 index 000000000..1b110f7af --- /dev/null +++ b/ubuntu/_base/dependencies/tqtinterface/debian/cdbs/versions.pl @@ -0,0 +1,19 @@ +#!/usr/bin/env perl + +use strict; +use warnings; + +my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`; +my ($version3, $version3_next); +my ($version2, $version2_next); + +($version3 = $version) =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/; +($version2 = $version3) =~ s/\.[^.]+$//; + +($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e; +($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e; + +print "TDE-Version3=$version3\n"; +print "TDE-Version2=$version2\n"; +print "TDE-Next-Version3=$version3_next\n"; +print "TDE-Next-Version2=$version2_next\n"; diff --git a/ubuntu/_base/dependencies/tqtinterface/debian/control b/ubuntu/_base/dependencies/tqtinterface/debian/control index 4a404673c..ddd520f2c 100644 --- a/ubuntu/_base/dependencies/tqtinterface/debian/control +++ b/ubuntu/_base/dependencies/tqtinterface/debian/control @@ -2,7 +2,7 @@ Source: libtqtinterface Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: debhelper (>= 9~), quilt, libtqt3-mt-dev, tqt3-apps-dev, cmake, cdbs +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, libtqt3-mt-dev, tqt3-apps-dev Standards-Version: 3.8.4 Package: libtqtinterface diff --git a/ubuntu/_base/dependencies/tqtinterface/debian/docs b/ubuntu/_base/dependencies/tqtinterface/debian/docs index e69de29bb..ca0272abf 100644 --- a/ubuntu/_base/dependencies/tqtinterface/debian/docs +++ b/ubuntu/_base/dependencies/tqtinterface/debian/docs @@ -0,0 +1,3 @@ +AUTHORS +README +TODO diff --git a/ubuntu/_base/dependencies/tqtinterface/debian/rules b/ubuntu/_base/dependencies/tqtinterface/debian/rules index fe114f5e8..5772f17f6 100755 --- a/ubuntu/_base/dependencies/tqtinterface/debian/rules +++ b/ubuntu/_base/dependencies/tqtinterface/debian/rules @@ -1,32 +1,11 @@ #! /usr/bin/make -f -# see debian/rules file for tdesvn for cmake examples include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk -#include /usr/share/cdbs/1/rules/patchsys-quilt.mk -include /usr/share/cdbs/1/rules/utils.mk - -DEB_KDE_APIDOX := yes +include debian/cdbs/debian-tde.mk version=Debian Package $(DEB_VERSION) DEB_OPT_FLAG += -DDEBIAN_VERSION=$(DEB_VERSION) -DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) - -# The default gzip compressor has been changed in dpkg >= 1.17.0. -deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ - sed -e "s|.*version ||" -e "s| .*||" | \ - xargs -r dpkg --compare-versions 1.17.0 lt \ - && echo xz || echo gzip) -ifeq ($(deb_default_compress),gzip) -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) -endif - -# Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to -# never build in parallel, regardless of DEB_BUILD_OPTIONS. -DEB_BUILD_PARALLEL ?= true - -DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ diff --git a/ubuntu/_base/libraries/libkexiv2/debian/control b/ubuntu/_base/libraries/libkexiv2/debian/control index f1096f702..1113e4aa3 100644 --- a/ubuntu/_base/libraries/libkexiv2/debian/control +++ b/ubuntu/_base/libraries/libkexiv2/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org> Uploaders: Achim Bohnet <ach@mpe.mpg.de>, Mark Purcell <msp@debian.org> -Build-Depends: debhelper (>= 9~), cdbs, cmake, libexiv2-dev, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, libexiv2-dev, tdelibs14-trinity-dev Standards-Version: 3.8.4 Homepage: http://www.kipi-plugins.org/ diff --git a/ubuntu/_base/libraries/libkipi/debian/control b/ubuntu/_base/libraries/libkipi/debian/control index 682ac796a..0b7f026cd 100644 --- a/ubuntu/_base/libraries/libkipi/debian/control +++ b/ubuntu/_base/libraries/libkipi/debian/control @@ -3,7 +3,7 @@ Section: libs Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> Uploaders: Achim Bohnet <ach@mpe.mpg.de>, Mark Purcell <msp@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, libexif-dev, tdelibs14-trinity-dev (>= 4:3.4.3-2) +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, libexif-dev, tdelibs14-trinity-dev Standards-Version: 3.8.4 Package: libkipi0-trinity-dev diff --git a/ubuntu/_base/libraries/libtdeldap/debian/control b/ubuntu/_base/libraries/libtdeldap/debian/control index 8a460e48e..730e4392b 100644 --- a/ubuntu/_base/libraries/libtdeldap/debian/control +++ b/ubuntu/_base/libraries/libtdeldap/debian/control @@ -2,7 +2,7 @@ Source: libtdeldap-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, tdelibs14-trinity-dev, libldap2-dev, heimdal-multidev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, libldap2-dev, heimdal-multidev Standards-Version: 3.8.4 Package: libtdeldap-trinity |