diff options
368 files changed, 109 insertions, 491 deletions
diff --git a/debian/_base/applications/development/kdbg/debian/rules b/debian/_base/applications/development/kdbg/debian/rules index d7cc38091..acfdd3d1b 100755 --- a/debian/_base/applications/development/kdbg/debian/rules +++ b/debian/_base/applications/development/kdbg/debian/rules @@ -2,7 +2,6 @@ # -*- makefile -*- include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/development/kdiff3/debian/rules b/debian/_base/applications/development/kdiff3/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/debian/_base/applications/development/kdiff3/debian/rules +++ b/debian/_base/applications/development/kdiff3/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/development/kpicosim/debian/rules b/debian/_base/applications/development/kpicosim/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/debian/_base/applications/development/kpicosim/debian/rules +++ b/debian/_base/applications/development/kpicosim/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/development/kscope/debian/rules b/debian/_base/applications/development/kscope/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/debian/_base/applications/development/kscope/debian/rules +++ b/debian/_base/applications/development/kscope/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/development/ktechlab/debian/rules b/debian/_base/applications/development/ktechlab/debian/rules index e41807ff4..efae1b07a 100755 --- a/debian/_base/applications/development/ktechlab/debian/rules +++ b/debian/_base/applications/development/ktechlab/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/development/kxmleditor/debian/rules b/debian/_base/applications/development/kxmleditor/debian/rules index 0c83e49d1..b2d712d83 100755 --- a/debian/_base/applications/development/kxmleditor/debian/rules +++ b/debian/_base/applications/development/kxmleditor/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/development/piklab/debian/rules b/debian/_base/applications/development/piklab/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/debian/_base/applications/development/piklab/debian/rules +++ b/debian/_base/applications/development/piklab/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/development/tdesvn/debian/rules b/debian/_base/applications/development/tdesvn/debian/rules index 470c6849a..f7ce81d59 100755 --- a/debian/_base/applications/development/tdesvn/debian/rules +++ b/debian/_base/applications/development/tdesvn/debian/rules @@ -10,7 +10,6 @@ endif export LD_LIBRARY_PATH include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_KDE_APIDOX := yes diff --git a/debian/_base/applications/development/universal-indent-gui-tqt/debian/rules b/debian/_base/applications/development/universal-indent-gui-tqt/debian/rules index b2eece260..871fe5c7a 100755 --- a/debian/_base/applications/development/universal-indent-gui-tqt/debian/rules +++ b/debian/_base/applications/development/universal-indent-gui-tqt/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/games/knights/debian/rules b/debian/_base/applications/games/knights/debian/rules index f97395edc..6f721a63c 100755 --- a/debian/_base/applications/games/knights/debian/rules +++ b/debian/_base/applications/games/knights/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/games/tdeknighttour/debian/rules b/debian/_base/applications/games/tdeknighttour/debian/rules index 0c83e49d1..b2d712d83 100755 --- a/debian/_base/applications/games/tdeknighttour/debian/rules +++ b/debian/_base/applications/games/tdeknighttour/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/games/tdepacman/debian/rules b/debian/_base/applications/games/tdepacman/debian/rules index 0c83e49d1..b2d712d83 100755 --- a/debian/_base/applications/games/tdepacman/debian/rules +++ b/debian/_base/applications/games/tdepacman/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/graphics/digikam/debian/rules b/debian/_base/applications/graphics/digikam/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/debian/_base/applications/graphics/digikam/debian/rules +++ b/debian/_base/applications/graphics/digikam/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/graphics/gwenview-i18n/debian/rules b/debian/_base/applications/graphics/gwenview-i18n/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/debian/_base/applications/graphics/gwenview-i18n/debian/rules +++ b/debian/_base/applications/graphics/gwenview-i18n/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/graphics/gwenview/debian/rules b/debian/_base/applications/graphics/gwenview/debian/rules index 7ee75c209..a40072965 100755 --- a/debian/_base/applications/graphics/gwenview/debian/rules +++ b/debian/_base/applications/graphics/gwenview/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/graphics/ksquirrel/debian/rules b/debian/_base/applications/graphics/ksquirrel/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/debian/_base/applications/graphics/ksquirrel/debian/rules +++ b/debian/_base/applications/graphics/ksquirrel/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/graphics/potracegui/debian/rules b/debian/_base/applications/graphics/potracegui/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/debian/_base/applications/graphics/potracegui/debian/rules +++ b/debian/_base/applications/graphics/potracegui/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/internet/kasablanca/debian/rules b/debian/_base/applications/internet/kasablanca/debian/rules index 0c83e49d1..b2d712d83 100755 --- a/debian/_base/applications/internet/kasablanca/debian/rules +++ b/debian/_base/applications/internet/kasablanca/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/internet/kbiff/debian/rules b/debian/_base/applications/internet/kbiff/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/debian/_base/applications/internet/kbiff/debian/rules +++ b/debian/_base/applications/internet/kbiff/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/internet/kftpgrabber/debian/rules b/debian/_base/applications/internet/kftpgrabber/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/debian/_base/applications/internet/kftpgrabber/debian/rules +++ b/debian/_base/applications/internet/kftpgrabber/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/internet/knmap/debian/rules b/debian/_base/applications/internet/knmap/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/debian/_base/applications/internet/knmap/debian/rules +++ b/debian/_base/applications/internet/knmap/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/internet/konversation/debian/rules b/debian/_base/applications/internet/konversation/debian/rules index 3fae28b38..400973b48 100755 --- a/debian/_base/applications/internet/konversation/debian/rules +++ b/debian/_base/applications/internet/konversation/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_DH_STRIP_ARGS := --dbg-package=konversation-trinity-dbg diff --git a/debian/_base/applications/internet/kopete-otr/debian/rules b/debian/_base/applications/internet/kopete-otr/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/debian/_base/applications/internet/kopete-otr/debian/rules +++ b/debian/_base/applications/internet/kopete-otr/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/internet/kshowmail/debian/rules b/debian/_base/applications/internet/kshowmail/debian/rules index 0c83e49d1..b2d712d83 100755 --- a/debian/_base/applications/internet/kshowmail/debian/rules +++ b/debian/_base/applications/internet/kshowmail/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/internet/kstreamripper/debian/rules b/debian/_base/applications/internet/kstreamripper/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/debian/_base/applications/internet/kstreamripper/debian/rules +++ b/debian/_base/applications/internet/kstreamripper/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/internet/ktorrent/debian/rules b/debian/_base/applications/internet/ktorrent/debian/rules index 7ee75c209..a40072965 100755 --- a/debian/_base/applications/internet/ktorrent/debian/rules +++ b/debian/_base/applications/internet/ktorrent/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/internet/kvpnc/debian/rules b/debian/_base/applications/internet/kvpnc/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/debian/_base/applications/internet/kvpnc/debian/rules +++ b/debian/_base/applications/internet/kvpnc/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/internet/smb4k/debian/rules b/debian/_base/applications/internet/smb4k/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/debian/_base/applications/internet/smb4k/debian/rules +++ b/debian/_base/applications/internet/smb4k/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/internet/tork/debian/rules b/debian/_base/applications/internet/tork/debian/rules index 2d9269d79..9c1db7c8c 100755 --- a/debian/_base/applications/internet/tork/debian/rules +++ b/debian/_base/applications/internet/tork/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/misc/bibletime/debian/rules b/debian/_base/applications/misc/bibletime/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/debian/_base/applications/misc/bibletime/debian/rules +++ b/debian/_base/applications/misc/bibletime/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/misc/compizconfig-backend-tdeconfig/debian/rules b/debian/_base/applications/misc/compizconfig-backend-tdeconfig/debian/rules index 0c83e49d1..b2d712d83 100755 --- a/debian/_base/applications/misc/compizconfig-backend-tdeconfig/debian/rules +++ b/debian/_base/applications/misc/compizconfig-backend-tdeconfig/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/misc/desktop-effects-tde/debian/rules b/debian/_base/applications/misc/desktop-effects-tde/debian/rules index 975701388..8542a64ba 100755 --- a/debian/_base/applications/misc/desktop-effects-tde/debian/rules +++ b/debian/_base/applications/misc/desktop-effects-tde/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/misc/kcmldap/debian/rules b/debian/_base/applications/misc/kcmldap/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/debian/_base/applications/misc/kcmldap/debian/rules +++ b/debian/_base/applications/misc/kcmldap/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/misc/kcmldapcontroller/debian/rules b/debian/_base/applications/misc/kcmldapcontroller/debian/rules index 0c83e49d1..b2d712d83 100755 --- a/debian/_base/applications/misc/kcmldapcontroller/debian/rules +++ b/debian/_base/applications/misc/kcmldapcontroller/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/misc/kcmldapmanager/debian/rules b/debian/_base/applications/misc/kcmldapmanager/debian/rules index 0c83e49d1..b2d712d83 100755 --- a/debian/_base/applications/misc/kcmldapmanager/debian/rules +++ b/debian/_base/applications/misc/kcmldapmanager/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/misc/kerberostray/debian/rules b/debian/_base/applications/misc/kerberostray/debian/rules index 0c83e49d1..b2d712d83 100755 --- a/debian/_base/applications/misc/kerberostray/debian/rules +++ b/debian/_base/applications/misc/kerberostray/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/misc/krecipes/debian/rules b/debian/_base/applications/misc/krecipes/debian/rules index 7ee75c209..a40072965 100755 --- a/debian/_base/applications/misc/krecipes/debian/rules +++ b/debian/_base/applications/misc/krecipes/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/multimedia/amarok/debian/rules b/debian/_base/applications/multimedia/amarok/debian/rules index 20acb4430..f46d2b2dd 100755 --- a/debian/_base/applications/multimedia/amarok/debian/rules +++ b/debian/_base/applications/multimedia/amarok/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/multimedia/codeine/debian/rules b/debian/_base/applications/multimedia/codeine/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/debian/_base/applications/multimedia/codeine/debian/rules +++ b/debian/_base/applications/multimedia/codeine/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/multimedia/k3b-i18n/debian/rules b/debian/_base/applications/multimedia/k3b-i18n/debian/rules index a3b58c891..c2016c2de 100755 --- a/debian/_base/applications/multimedia/k3b-i18n/debian/rules +++ b/debian/_base/applications/multimedia/k3b-i18n/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/multimedia/k3b/debian/rules b/debian/_base/applications/multimedia/k3b/debian/rules index 1ad617b5a..d7869c2ea 100755 --- a/debian/_base/applications/multimedia/k3b/debian/rules +++ b/debian/_base/applications/multimedia/k3b/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_TIME64_API = $(shell echo | cc $(dpkg-buildflags --get CPPFLAGS) -dM -E -x c++ - | grep -q "_TIME_BITS 64" && echo true || false) diff --git a/debian/_base/applications/multimedia/k9copy/debian/rules b/debian/_base/applications/multimedia/k9copy/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/debian/_base/applications/multimedia/k9copy/debian/rules +++ b/debian/_base/applications/multimedia/k9copy/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/multimedia/kaffeine/debian/rules b/debian/_base/applications/multimedia/kaffeine/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/debian/_base/applications/multimedia/kaffeine/debian/rules +++ b/debian/_base/applications/multimedia/kaffeine/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/multimedia/kmplayer/debian/rules b/debian/_base/applications/multimedia/kmplayer/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/debian/_base/applications/multimedia/kmplayer/debian/rules +++ b/debian/_base/applications/multimedia/kmplayer/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/multimedia/kplayer/debian/rules b/debian/_base/applications/multimedia/kplayer/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/debian/_base/applications/multimedia/kplayer/debian/rules +++ b/debian/_base/applications/multimedia/kplayer/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/multimedia/mplayerthumbs/debian/rules b/debian/_base/applications/multimedia/mplayerthumbs/debian/rules index 0c83e49d1..b2d712d83 100755 --- a/debian/_base/applications/multimedia/mplayerthumbs/debian/rules +++ b/debian/_base/applications/multimedia/mplayerthumbs/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/multimedia/rosegarden/debian/rules b/debian/_base/applications/multimedia/rosegarden/debian/rules index f91469a4f..57a056859 100755 --- a/debian/_base/applications/multimedia/rosegarden/debian/rules +++ b/debian/_base/applications/multimedia/rosegarden/debian/rules @@ -5,7 +5,6 @@ #export DH_VERBOSE=1 include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/multimedia/soundkonverter/debian/rules b/debian/_base/applications/multimedia/soundkonverter/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/debian/_base/applications/multimedia/soundkonverter/debian/rules +++ b/debian/_base/applications/multimedia/soundkonverter/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/multimedia/tderadio/debian/rules b/debian/_base/applications/multimedia/tderadio/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/debian/_base/applications/multimedia/tderadio/debian/rules +++ b/debian/_base/applications/multimedia/tderadio/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/office/basket/debian/rules b/debian/_base/applications/office/basket/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/debian/_base/applications/office/basket/debian/rules +++ b/debian/_base/applications/office/basket/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/office/kbibtex/debian/rules b/debian/_base/applications/office/kbibtex/debian/rules index 0c83e49d1..b2d712d83 100755 --- a/debian/_base/applications/office/kbibtex/debian/rules +++ b/debian/_base/applications/office/kbibtex/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/office/kbookreader/debian/rules b/debian/_base/applications/office/kbookreader/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/debian/_base/applications/office/kbookreader/debian/rules +++ b/debian/_base/applications/office/kbookreader/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/office/keximdb/debian/rules b/debian/_base/applications/office/keximdb/debian/rules index 2c49e881d..e40e7d9dc 100755 --- a/debian/_base/applications/office/keximdb/debian/rules +++ b/debian/_base/applications/office/keximdb/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/office/kile/debian/rules b/debian/_base/applications/office/kile/debian/rules index 2a89db0d7..7328c1ce6 100755 --- a/debian/_base/applications/office/kile/debian/rules +++ b/debian/_base/applications/office/kile/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/office/kmymoney/debian/rules b/debian/_base/applications/office/kmymoney/debian/rules index c488addf0..3ba899106 100755 --- a/debian/_base/applications/office/kmymoney/debian/rules +++ b/debian/_base/applications/office/kmymoney/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/office/knowit/debian/rules b/debian/_base/applications/office/knowit/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/debian/_base/applications/office/knowit/debian/rules +++ b/debian/_base/applications/office/knowit/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/office/kpilot/debian/rules b/debian/_base/applications/office/kpilot/debian/rules index 7ee75c209..a40072965 100755 --- a/debian/_base/applications/office/kpilot/debian/rules +++ b/debian/_base/applications/office/kpilot/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/office/tde-ebook-reader/debian/rules b/debian/_base/applications/office/tde-ebook-reader/debian/rules index 6cc91649b..8413cf890 100755 --- a/debian/_base/applications/office/tde-ebook-reader/debian/rules +++ b/debian/_base/applications/office/tde-ebook-reader/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/office/tellico/debian/rules b/debian/_base/applications/office/tellico/debian/rules index d7e330270..e6f5916b6 100755 --- a/debian/_base/applications/office/tellico/debian/rules +++ b/debian/_base/applications/office/tellico/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/settings/kdpkg/debian/rules b/debian/_base/applications/settings/kdpkg/debian/rules index 0c83e49d1..b2d712d83 100755 --- a/debian/_base/applications/settings/kdpkg/debian/rules +++ b/debian/_base/applications/settings/kdpkg/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/settings/kima/debian/rules b/debian/_base/applications/settings/kima/debian/rules index 08f9ee45b..22f1bcdb9 100755 --- a/debian/_base/applications/settings/kima/debian/rules +++ b/debian/_base/applications/settings/kima/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk WITH_NVCONTROL = $(if $(filter $(DEB_HOST_ARCH_CPU),amd64 i386),ON,OFF) diff --git a/debian/_base/applications/settings/kiosktool/debian/rules b/debian/_base/applications/settings/kiosktool/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/debian/_base/applications/settings/kiosktool/debian/rules +++ b/debian/_base/applications/settings/kiosktool/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/settings/kkbswitch/debian/rules b/debian/_base/applications/settings/kkbswitch/debian/rules index cf1c1b4d8..7dffb7fba 100755 --- a/debian/_base/applications/settings/kkbswitch/debian/rules +++ b/debian/_base/applications/settings/kkbswitch/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/settings/klcddimmer/debian/rules b/debian/_base/applications/settings/klcddimmer/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/debian/_base/applications/settings/klcddimmer/debian/rules +++ b/debian/_base/applications/settings/klcddimmer/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/settings/kmyfirewall/debian/rules b/debian/_base/applications/settings/kmyfirewall/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/debian/_base/applications/settings/kmyfirewall/debian/rules +++ b/debian/_base/applications/settings/kmyfirewall/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/settings/tde-guidance/debian/rules b/debian/_base/applications/settings/tde-guidance/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/debian/_base/applications/settings/tde-guidance/debian/rules +++ b/debian/_base/applications/settings/tde-guidance/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/settings/tde-systemsettings/debian/rules b/debian/_base/applications/settings/tde-systemsettings/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/debian/_base/applications/settings/tde-systemsettings/debian/rules +++ b/debian/_base/applications/settings/tde-systemsettings/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/settings/tdealternatives/debian/rules b/debian/_base/applications/settings/tdealternatives/debian/rules index 1f278a80f..ed53a5baa 100755 --- a/debian/_base/applications/settings/tdealternatives/debian/rules +++ b/debian/_base/applications/settings/tdealternatives/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/settings/tdenetworkmanager/debian/rules b/debian/_base/applications/settings/tdenetworkmanager/debian/rules index 0c83e49d1..b2d712d83 100755 --- a/debian/_base/applications/settings/tdenetworkmanager/debian/rules +++ b/debian/_base/applications/settings/tdenetworkmanager/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/settings/tdesudo/debian/rules b/debian/_base/applications/settings/tdesudo/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/debian/_base/applications/settings/tdesudo/debian/rules +++ b/debian/_base/applications/settings/tdesudo/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/settings/wlassistant/debian/rules b/debian/_base/applications/settings/wlassistant/debian/rules index 96332d50c..a9217b088 100755 --- a/debian/_base/applications/settings/wlassistant/debian/rules +++ b/debian/_base/applications/settings/wlassistant/debian/rules @@ -10,7 +10,6 @@ endif export LD_LIBRARY_PATH include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_KDE_APIDOX := yes diff --git a/debian/_base/applications/system/dolphin/debian/rules b/debian/_base/applications/system/dolphin/debian/rules index 4024eed1d..700c81956 100755 --- a/debian/_base/applications/system/dolphin/debian/rules +++ b/debian/_base/applications/system/dolphin/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/system/katapult/debian/rules b/debian/_base/applications/system/katapult/debian/rules index d0ecf54e8..e43332172 100755 --- a/debian/_base/applications/system/katapult/debian/rules +++ b/debian/_base/applications/system/katapult/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/system/kbfx/debian/rules b/debian/_base/applications/system/kbfx/debian/rules index e484db04f..585b34d75 100755 --- a/debian/_base/applications/system/kbfx/debian/rules +++ b/debian/_base/applications/system/kbfx/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS =\ diff --git a/debian/_base/applications/system/kcmautostart/debian/rules b/debian/_base/applications/system/kcmautostart/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/debian/_base/applications/system/kcmautostart/debian/rules +++ b/debian/_base/applications/system/kcmautostart/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/system/kdbusnotification/debian/rules b/debian/_base/applications/system/kdbusnotification/debian/rules index 0c83e49d1..b2d712d83 100755 --- a/debian/_base/applications/system/kdbusnotification/debian/rules +++ b/debian/_base/applications/system/kdbusnotification/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/system/klamav/debian/rules b/debian/_base/applications/system/klamav/debian/rules index 0c83e49d1..b2d712d83 100755 --- a/debian/_base/applications/system/klamav/debian/rules +++ b/debian/_base/applications/system/klamav/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/system/knemo/debian/rules b/debian/_base/applications/system/knemo/debian/rules index 0c83e49d1..b2d712d83 100755 --- a/debian/_base/applications/system/knemo/debian/rules +++ b/debian/_base/applications/system/knemo/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/system/knetload/debian/rules b/debian/_base/applications/system/knetload/debian/rules index 0c83e49d1..b2d712d83 100755 --- a/debian/_base/applications/system/knetload/debian/rules +++ b/debian/_base/applications/system/knetload/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/system/knetstats/debian/rules b/debian/_base/applications/system/knetstats/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/debian/_base/applications/system/knetstats/debian/rules +++ b/debian/_base/applications/system/knetstats/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/system/kooldock/debian/rules b/debian/_base/applications/system/kooldock/debian/rules index 0c83e49d1..b2d712d83 100755 --- a/debian/_base/applications/system/kooldock/debian/rules +++ b/debian/_base/applications/system/kooldock/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/system/krusader/debian/rules b/debian/_base/applications/system/krusader/debian/rules index 915b25925..721d1b856 100755 --- a/debian/_base/applications/system/krusader/debian/rules +++ b/debian/_base/applications/system/krusader/debian/rules @@ -26,7 +26,7 @@ install/krusader-trinity:: install -D -p -m0644 pics/cr32-app-krusader_user.xpm \ $(DEB_DESTDIR)/opt/trinity/share/pixmaps/krusader_user.xpm # install properly tdeio_isorc - install -D -p -m0644 iso/tdeio_isorc \ + install -D -p -m0644 src/iso/tdeio_isorc \ $(DEB_DESTDIR)/opt/trinity/share/config/tdeio_isorc # install lintian override install -D -p -m0644 debian/krusader.lintian-overrides \ diff --git a/debian/_base/applications/system/kshutdown/debian/rules b/debian/_base/applications/system/kshutdown/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/debian/_base/applications/system/kshutdown/debian/rules +++ b/debian/_base/applications/system/kshutdown/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/system/ksystemlog/debian/rules b/debian/_base/applications/system/ksystemlog/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/debian/_base/applications/system/ksystemlog/debian/rules +++ b/debian/_base/applications/system/ksystemlog/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/system/kvkbd/debian/rules b/debian/_base/applications/system/kvkbd/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/debian/_base/applications/system/kvkbd/debian/rules +++ b/debian/_base/applications/system/kvkbd/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/system/polkit-agent-tde/debian/rules b/debian/_base/applications/system/polkit-agent-tde/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/debian/_base/applications/system/polkit-agent-tde/debian/rules +++ b/debian/_base/applications/system/polkit-agent-tde/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/system/smartcardauth/debian/control b/debian/_base/applications/system/smartcardauth/debian/control index 97c6fb93e..d1d2e04eb 100644 --- a/debian/_base/applications/system/smartcardauth/debian/control +++ b/debian/_base/applications/system/smartcardauth/debian/control @@ -2,7 +2,7 @@ Source: smartcardauth Section: tde Priority: extra Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, pkg-config, libpkcs11-helper1-dev, libgnutls-dev | libgnutls28-dev | libgnutls30-dev +Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-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/system/smartcardauth/debian/rules b/debian/_base/applications/system/smartcardauth/debian/rules index 14ccf6018..97c83eb02 100755 --- a/debian/_base/applications/system/smartcardauth/debian/rules +++ b/debian/_base/applications/system/smartcardauth/debian/rules @@ -1,26 +1,13 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk +-include /usr/share/cdbs/1/class/tde.mk DEB_BUILD_OPTIONS := nostrip export DEB_BUILD_OPTIONS = debug nostrip CFLAGS=-g -Wall -fPIC -DEB_MAKE_INSTALL_TARGET := install DESTDIR="$(DEB_DESTDIR)" -DEB_INSTALL_DOCS_ALL := - -# 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_DH_SHLIBDEPS_ARGS_ALL=--dpkg-shlibdeps-params=--ignore-missing-info DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/system/tastymenu/debian/rules b/debian/_base/applications/system/tastymenu/debian/rules index 0c83e49d1..b2d712d83 100755 --- a/debian/_base/applications/system/tastymenu/debian/rules +++ b/debian/_base/applications/system/tastymenu/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/system/tdebluez/debian/rules b/debian/_base/applications/system/tdebluez/debian/rules index 6b4a7ada1..affdcdb09 100755 --- a/debian/_base/applications/system/tdebluez/debian/rules +++ b/debian/_base/applications/system/tdebluez/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_KDE_APIDOX := yes diff --git a/debian/_base/applications/system/tdedocker/debian/rules b/debian/_base/applications/system/tdedocker/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/debian/_base/applications/system/tdedocker/debian/rules +++ b/debian/_base/applications/system/tdedocker/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/system/tdepowersave/debian/rules b/debian/_base/applications/system/tdepowersave/debian/rules index 9336e70bc..42167de41 100755 --- a/debian/_base/applications/system/tdepowersave/debian/rules +++ b/debian/_base/applications/system/tdepowersave/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/system/tdesshaskpass/debian/rules b/debian/_base/applications/system/tdesshaskpass/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/debian/_base/applications/system/tdesshaskpass/debian/rules +++ b/debian/_base/applications/system/tdesshaskpass/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/system/xdg-desktop-portal-tde/debian/rules b/debian/_base/applications/system/xdg-desktop-portal-tde/debian/rules index 0c83e49d1..b2d712d83 100755 --- a/debian/_base/applications/system/xdg-desktop-portal-tde/debian/rules +++ b/debian/_base/applications/system/xdg-desktop-portal-tde/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/system/yakuake/debian/rules b/debian/_base/applications/system/yakuake/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/debian/_base/applications/system/yakuake/debian/rules +++ b/debian/_base/applications/system/yakuake/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/tdeio/tdeio-appinfo/debian/rules b/debian/_base/applications/tdeio/tdeio-appinfo/debian/rules index 2bd25508c..90b978635 100755 --- a/debian/_base/applications/tdeio/tdeio-appinfo/debian/rules +++ b/debian/_base/applications/tdeio/tdeio-appinfo/debian/rules @@ -10,7 +10,6 @@ endif export LD_LIBRARY_PATH include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/tdeio/tdeio-apt/debian/rules b/debian/_base/applications/tdeio/tdeio-apt/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/debian/_base/applications/tdeio/tdeio-apt/debian/rules +++ b/debian/_base/applications/tdeio/tdeio-apt/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/tdeio/tdeio-ftps/debian/rules b/debian/_base/applications/tdeio/tdeio-ftps/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/debian/_base/applications/tdeio/tdeio-ftps/debian/rules +++ b/debian/_base/applications/tdeio/tdeio-ftps/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/tdeio/tdeio-gopher/debian/rules b/debian/_base/applications/tdeio/tdeio-gopher/debian/rules index b0df76110..a393b42cd 100755 --- a/debian/_base/applications/tdeio/tdeio-gopher/debian/rules +++ b/debian/_base/applications/tdeio/tdeio-gopher/debian/rules @@ -10,7 +10,6 @@ endif export LD_LIBRARY_PATH include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_KDE_APIDOX := yes diff --git a/debian/_base/applications/tdeio/tdeio-locate/debian/rules b/debian/_base/applications/tdeio/tdeio-locate/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/debian/_base/applications/tdeio/tdeio-locate/debian/rules +++ b/debian/_base/applications/tdeio/tdeio-locate/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/tdeio/tdeio-sword/debian/rules b/debian/_base/applications/tdeio/tdeio-sword/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/debian/_base/applications/tdeio/tdeio-sword/debian/rules +++ b/debian/_base/applications/tdeio/tdeio-sword/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/tdeio/tdeio-umountwrapper/debian/rules b/debian/_base/applications/tdeio/tdeio-umountwrapper/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/debian/_base/applications/tdeio/tdeio-umountwrapper/debian/rules +++ b/debian/_base/applications/tdeio/tdeio-umountwrapper/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/themes/gtk-qt-engine/debian/rules b/debian/_base/applications/themes/gtk-qt-engine/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/debian/_base/applications/themes/gtk-qt-engine/debian/rules +++ b/debian/_base/applications/themes/gtk-qt-engine/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/themes/gtk3-tqt-engine/debian/rules b/debian/_base/applications/themes/gtk3-tqt-engine/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/debian/_base/applications/themes/gtk3-tqt-engine/debian/rules +++ b/debian/_base/applications/themes/gtk3-tqt-engine/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/themes/kgtk-qt3/debian/rules b/debian/_base/applications/themes/kgtk-qt3/debian/rules index cfcfca0b9..670720090 100755 --- a/debian/_base/applications/themes/kgtk-qt3/debian/rules +++ b/debian/_base/applications/themes/kgtk-qt3/debian/rules @@ -10,7 +10,6 @@ endif export LD_LIBRARY_PATH include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_KDE_APIDOX := yes diff --git a/debian/_base/applications/themes/ksplash-engine-moodin/debian/rules b/debian/_base/applications/themes/ksplash-engine-moodin/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/debian/_base/applications/themes/ksplash-engine-moodin/debian/rules +++ b/debian/_base/applications/themes/ksplash-engine-moodin/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/themes/tde-style-baghira/debian/rules b/debian/_base/applications/themes/tde-style-baghira/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/debian/_base/applications/themes/tde-style-baghira/debian/rules +++ b/debian/_base/applications/themes/tde-style-baghira/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/themes/tde-style-domino/debian/rules b/debian/_base/applications/themes/tde-style-domino/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/debian/_base/applications/themes/tde-style-domino/debian/rules +++ b/debian/_base/applications/themes/tde-style-domino/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/themes/tde-style-ia-ora/debian/rules b/debian/_base/applications/themes/tde-style-ia-ora/debian/rules index 0c83e49d1..b2d712d83 100755 --- a/debian/_base/applications/themes/tde-style-ia-ora/debian/rules +++ b/debian/_base/applications/themes/tde-style-ia-ora/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/themes/tde-style-lipstik/debian/rules b/debian/_base/applications/themes/tde-style-lipstik/debian/rules index 0c83e49d1..b2d712d83 100755 --- a/debian/_base/applications/themes/tde-style-lipstik/debian/rules +++ b/debian/_base/applications/themes/tde-style-lipstik/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/themes/tde-style-polyester/debian/rules b/debian/_base/applications/themes/tde-style-polyester/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/debian/_base/applications/themes/tde-style-polyester/debian/rules +++ b/debian/_base/applications/themes/tde-style-polyester/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/themes/tde-style-qtcurve/debian/rules b/debian/_base/applications/themes/tde-style-qtcurve/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/debian/_base/applications/themes/tde-style-qtcurve/debian/rules +++ b/debian/_base/applications/themes/tde-style-qtcurve/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/themes/tdmtheme/debian/rules b/debian/_base/applications/themes/tdmtheme/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/debian/_base/applications/themes/tdmtheme/debian/rules +++ b/debian/_base/applications/themes/tdmtheme/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/themes/twin-style-crystal/debian/rules b/debian/_base/applications/themes/twin-style-crystal/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/debian/_base/applications/themes/twin-style-crystal/debian/rules +++ b/debian/_base/applications/themes/twin-style-crystal/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/themes/twin-style-dekorator/debian/rules b/debian/_base/applications/themes/twin-style-dekorator/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/debian/_base/applications/themes/twin-style-dekorator/debian/rules +++ b/debian/_base/applications/themes/twin-style-dekorator/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/themes/twin-style-fahrenheit/debian/rules b/debian/_base/applications/themes/twin-style-fahrenheit/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/debian/_base/applications/themes/twin-style-fahrenheit/debian/rules +++ b/debian/_base/applications/themes/twin-style-fahrenheit/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/themes/twin-style-machbunt/debian/rules b/debian/_base/applications/themes/twin-style-machbunt/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/debian/_base/applications/themes/twin-style-machbunt/debian/rules +++ b/debian/_base/applications/themes/twin-style-machbunt/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/themes/twin-style-mallory/debian/rules b/debian/_base/applications/themes/twin-style-mallory/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/debian/_base/applications/themes/twin-style-mallory/debian/rules +++ b/debian/_base/applications/themes/twin-style-mallory/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/themes/twin-style-suse2/debian/rules b/debian/_base/applications/themes/twin-style-suse2/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/debian/_base/applications/themes/twin-style-suse2/debian/rules +++ b/debian/_base/applications/themes/twin-style-suse2/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/utilities/abakus/debian/rules b/debian/_base/applications/utilities/abakus/debian/rules index c366e00cb..411a41a23 100755 --- a/debian/_base/applications/utilities/abakus/debian/rules +++ b/debian/_base/applications/utilities/abakus/debian/rules @@ -10,7 +10,6 @@ endif export LD_LIBRARY_PATH include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_KDE_APIDOX := yes diff --git a/debian/_base/applications/utilities/filelight/debian/rules b/debian/_base/applications/utilities/filelight/debian/rules index 8f1cb4021..c844e6278 100755 --- a/debian/_base/applications/utilities/filelight/debian/rules +++ b/debian/_base/applications/utilities/filelight/debian/rules @@ -5,7 +5,6 @@ # see /usr/share/common-licenses/GPL-2 for details. include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include diff --git a/debian/_base/applications/utilities/kbarcode/debian/rules b/debian/_base/applications/utilities/kbarcode/debian/rules index 0c83e49d1..b2d712d83 100755 --- a/debian/_base/applications/utilities/kbarcode/debian/rules +++ b/debian/_base/applications/utilities/kbarcode/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/utilities/kchmviewer/debian/rules b/debian/_base/applications/utilities/kchmviewer/debian/rules index 0c83e49d1..b2d712d83 100755 --- a/debian/_base/applications/utilities/kchmviewer/debian/rules +++ b/debian/_base/applications/utilities/kchmviewer/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/utilities/kcpuload/debian/rules b/debian/_base/applications/utilities/kcpuload/debian/rules index 3c961a480..f38aa8f52 100755 --- a/debian/_base/applications/utilities/kcpuload/debian/rules +++ b/debian/_base/applications/utilities/kcpuload/debian/rules @@ -3,7 +3,6 @@ # GNU copyright 1997 to 1999 by Joey Hess. include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/utilities/kdirstat/debian/rules b/debian/_base/applications/utilities/kdirstat/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/debian/_base/applications/utilities/kdirstat/debian/rules +++ b/debian/_base/applications/utilities/kdirstat/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/utilities/keep/debian/rules b/debian/_base/applications/utilities/keep/debian/rules index 0c83e49d1..b2d712d83 100755 --- a/debian/_base/applications/utilities/keep/debian/rules +++ b/debian/_base/applications/utilities/keep/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/utilities/knutclient/debian/rules b/debian/_base/applications/utilities/knutclient/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/debian/_base/applications/utilities/knutclient/debian/rules +++ b/debian/_base/applications/utilities/knutclient/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/utilities/kommando/debian/rules b/debian/_base/applications/utilities/kommando/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/debian/_base/applications/utilities/kommando/debian/rules +++ b/debian/_base/applications/utilities/kommando/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/utilities/kompose/debian/rules b/debian/_base/applications/utilities/kompose/debian/rules index 0c83e49d1..b2d712d83 100755 --- a/debian/_base/applications/utilities/kompose/debian/rules +++ b/debian/_base/applications/utilities/kompose/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/utilities/krename/debian/rules b/debian/_base/applications/utilities/krename/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/debian/_base/applications/utilities/krename/debian/rules +++ b/debian/_base/applications/utilities/krename/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/utilities/ksensors/debian/rules b/debian/_base/applications/utilities/ksensors/debian/rules index 9b8770924..a866baea2 100755 --- a/debian/_base/applications/utilities/ksensors/debian/rules +++ b/debian/_base/applications/utilities/ksensors/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/utilities/mathemagics/debian/rules b/debian/_base/applications/utilities/mathemagics/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/debian/_base/applications/utilities/mathemagics/debian/rules +++ b/debian/_base/applications/utilities/mathemagics/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/applications/utilities/qalculate-tde/debian/rules b/debian/_base/applications/utilities/qalculate-tde/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/debian/_base/applications/utilities/qalculate-tde/debian/rules +++ b/debian/_base/applications/utilities/qalculate-tde/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/core/tdeaccessibility/debian/rules b/debian/_base/core/tdeaccessibility/debian/rules index b0099e4d0..8f158ca6e 100755 --- a/debian/_base/core/tdeaccessibility/debian/rules +++ b/debian/_base/core/tdeaccessibility/debian/rules @@ -1,7 +1,6 @@ #! /usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk #DEB_MAKE_CHECK_TARGET = check diff --git a/debian/_base/core/tdeaddons/debian/rules b/debian/_base/core/tdeaddons/debian/rules index 426851e3f..6517d812e 100755 --- a/debian/_base/core/tdeaddons/debian/rules +++ b/debian/_base/core/tdeaddons/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde diff --git a/debian/_base/core/tdeadmin/debian/rules b/debian/_base/core/tdeadmin/debian/rules index 626bc75ce..f29f55372 100755 --- a/debian/_base/core/tdeadmin/debian/rules +++ b/debian/_base/core/tdeadmin/debian/rules @@ -1,7 +1,6 @@ #! /usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_DH_STRIP_ARGS := --dbg-package=tdeadmin-trinity-dbg diff --git a/debian/_base/core/tdeartwork/debian/rules b/debian/_base/core/tdeartwork/debian/rules index 21a7a3033..a18626c89 100755 --- a/debian/_base/core/tdeartwork/debian/rules +++ b/debian/_base/core/tdeartwork/debian/rules @@ -1,7 +1,6 @@ #! /usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/core/tdebase/debian/rules b/debian/_base/core/tdebase/debian/rules index 5b5ac526b..a588088cd 100755 --- a/debian/_base/core/tdebase/debian/rules +++ b/debian/_base/core/tdebase/debian/rules @@ -10,7 +10,6 @@ endif export LD_LIBRARY_PATH include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_KDE_APIDOX := yes diff --git a/debian/_base/core/tdeedu/debian/control b/debian/_base/core/tdeedu/debian/control index 03ab1034c..60d9c7486 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: tde-cdbs, debhelper (>= 10~), quilt, tde-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 +Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libnum-ocaml-dev | ocaml-nox (<< 4.08), libzarith-ocaml-dev, 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/tdeedu/debian/rules b/debian/_base/core/tdeedu/debian/rules index 0a37bb42e..6d19da7b0 100755 --- a/debian/_base/core/tdeedu/debian/rules +++ b/debian/_base/core/tdeedu/debian/rules @@ -1,7 +1,6 @@ #! /usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_INSTALL_DOCS_ALL := diff --git a/debian/_base/core/tdegames/debian/rules b/debian/_base/core/tdegames/debian/rules index b6fb2fcff..a9298f39d 100755 --- a/debian/_base/core/tdegames/debian/rules +++ b/debian/_base/core/tdegames/debian/rules @@ -1,7 +1,6 @@ #! /usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk export kde_bindir = /opt/trinity/games diff --git a/debian/_base/core/tdegraphics/debian/rules b/debian/_base/core/tdegraphics/debian/rules index 532043772..05176711a 100755 --- a/debian/_base/core/tdegraphics/debian/rules +++ b/debian/_base/core/tdegraphics/debian/rules @@ -10,7 +10,6 @@ endif export LD_LIBRARY_PATH include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/core/tdelibs/debian/rules b/debian/_base/core/tdelibs/debian/rules index f81ed2caf..6af9d17d2 100755 --- a/debian/_base/core/tdelibs/debian/rules +++ b/debian/_base/core/tdelibs/debian/rules @@ -10,7 +10,6 @@ endif export LD_LIBRARY_PATH include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_TIME64_API = $(shell echo | cc $(dpkg-buildflags --get CPPFLAGS) -dM -E -x c++ - | grep -q "_TIME_BITS 64" && echo true || false) diff --git a/debian/_base/core/tdemultimedia/debian/rules b/debian/_base/core/tdemultimedia/debian/rules index 7010e9b52..8d4a580e7 100755 --- a/debian/_base/core/tdemultimedia/debian/rules +++ b/debian/_base/core/tdemultimedia/debian/rules @@ -1,6 +1,5 @@ #! /usr/bin/make -f -include /usr/share/cdbs/1/class/cmake.mk include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/tde.mk diff --git a/debian/_base/core/tdenetwork/debian/rules b/debian/_base/core/tdenetwork/debian/rules index 06e2c3b78..33c4b9bf2 100755 --- a/debian/_base/core/tdenetwork/debian/rules +++ b/debian/_base/core/tdenetwork/debian/rules @@ -12,7 +12,6 @@ endif export DH_OPTIONS include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/core/tdepim/debian/rules b/debian/_base/core/tdepim/debian/rules index 66704b8f2..58e1d63da 100755 --- a/debian/_base/core/tdepim/debian/rules +++ b/debian/_base/core/tdepim/debian/rules @@ -10,7 +10,6 @@ endif export LD_LIBRARY_PATH include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_TIME64_API = $(shell echo | cc $(dpkg-buildflags --get CPPFLAGS) -dM -E -x c++ - | grep -q "_TIME_BITS 64" && echo true || false) diff --git a/debian/_base/core/tdesdk/debian/rules b/debian/_base/core/tdesdk/debian/rules index 7e3915b33..d044b50c8 100755 --- a/debian/_base/core/tdesdk/debian/rules +++ b/debian/_base/core/tdesdk/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_DH_STRIP_ARGS := --dbg-package=tdesdk-trinity-dbg diff --git a/debian/_base/core/tdetoys/debian/rules b/debian/_base/core/tdetoys/debian/rules index 0befcfe7d..cbd7532de 100755 --- a/debian/_base/core/tdetoys/debian/rules +++ b/debian/_base/core/tdetoys/debian/rules @@ -1,7 +1,6 @@ #! /usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/core/tdeutils/debian/rules b/debian/_base/core/tdeutils/debian/rules index a7f125c88..455ebd769 100755 --- a/debian/_base/core/tdeutils/debian/rules +++ b/debian/_base/core/tdeutils/debian/rules @@ -1,7 +1,6 @@ #! /usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_KDE_APIDOX := yes diff --git a/debian/_base/core/tdevelop/debian/rules b/debian/_base/core/tdevelop/debian/rules index 75aa86c76..f53abacce 100755 --- a/debian/_base/core/tdevelop/debian/rules +++ b/debian/_base/core/tdevelop/debian/rules @@ -10,7 +10,6 @@ endif export LD_LIBRARY_PATH include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_DH_STRIP_ARGS := --dbg-package=tdevelop-trinity-dbg diff --git a/debian/_base/core/tdewebdev/debian/rules b/debian/_base/core/tdewebdev/debian/rules index 22bf44865..7b4ee3cd9 100755 --- a/debian/_base/core/tdewebdev/debian/rules +++ b/debian/_base/core/tdewebdev/debian/rules @@ -1,7 +1,6 @@ #! /usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_INSTALL_CHANGELOGS_kimagemapeditor-trinity := kimagemapeditor/ChangeLog diff --git a/debian/_base/dependencies/akode/debian/rules b/debian/_base/dependencies/akode/debian/rules index 8e0bb29a7..aa92a8c09 100755 --- a/debian/_base/dependencies/akode/debian/rules +++ b/debian/_base/dependencies/akode/debian/rules @@ -1,7 +1,6 @@ #! /usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_HOST_ARCH_OS = $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) diff --git a/debian/_base/dependencies/arts/debian/rules b/debian/_base/dependencies/arts/debian/rules index 06a80d4cb..0871ce02f 100755 --- a/debian/_base/dependencies/arts/debian/rules +++ b/debian/_base/dependencies/arts/debian/rules @@ -9,7 +9,6 @@ endif export LD_LIBRARY_PATH include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_TIME64_API = $(shell echo | cc $(dpkg-buildflags --get CPPFLAGS) -dM -E -x c++ - | grep -q "_TIME_BITS 64" && echo true || false) diff --git a/debian/_base/dependencies/avahi-tqt/debian/rules b/debian/_base/dependencies/avahi-tqt/debian/rules index 4dfb5de07..ea9c8dbd4 100755 --- a/debian/_base/dependencies/avahi-tqt/debian/rules +++ b/debian/_base/dependencies/avahi-tqt/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk # Ensure at build time that the library has no dependencies on undefined diff --git a/debian/_base/dependencies/dbus-1-tqt/debian/rules b/debian/_base/dependencies/dbus-1-tqt/debian/rules index d59b2580a..ea82ad554 100755 --- a/debian/_base/dependencies/dbus-1-tqt/debian/rules +++ b/debian/_base/dependencies/dbus-1-tqt/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_KDE_APIDOX := yes diff --git a/debian/_base/dependencies/libart-lgpl/debian/rules b/debian/_base/dependencies/libart-lgpl/debian/rules index 47aa40b34..8dcda8fda 100755 --- a/debian/_base/dependencies/libart-lgpl/debian/rules +++ b/debian/_base/dependencies/libart-lgpl/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk libart-2.0-N := $(shell sed -rn 's/^Package:[[:space:]]*(libart-2\.0-[0-9]+)[[:space:]]*$$/\1/p' debian/control) diff --git a/debian/_base/dependencies/libcaldav/debian/rules b/debian/_base/dependencies/libcaldav/debian/rules index 4175ecbbc..899d31ee9 100755 --- a/debian/_base/dependencies/libcaldav/debian/rules +++ b/debian/_base/dependencies/libcaldav/debian/rules @@ -1,7 +1,6 @@ #! /usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_TIME64_API = $(shell echo | cc $(dpkg-buildflags --get CPPFLAGS) -dM -E -x c++ - | grep -q "_TIME_BITS 64" && echo true || false) diff --git a/debian/_base/dependencies/libcarddav/debian/rules b/debian/_base/dependencies/libcarddav/debian/rules index 8b943babc..84d7be9bd 100755 --- a/debian/_base/dependencies/libcarddav/debian/rules +++ b/debian/_base/dependencies/libcarddav/debian/rules @@ -1,7 +1,6 @@ #! /usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_TIME64_API = $(shell echo | cc $(dpkg-buildflags --get CPPFLAGS) -dM -E -x c++ - | grep -q "_TIME_BITS 64" && echo true || false) diff --git a/debian/_base/dependencies/libr/debian/rules b/debian/_base/dependencies/libr/debian/rules index ba83647b4..0b16c81e9 100755 --- a/debian/_base/dependencies/libr/debian/rules +++ b/debian/_base/dependencies/libr/debian/rules @@ -1,7 +1,6 @@ #! /usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk # Build options diff --git a/debian/_base/dependencies/polkit-tqt/debian/rules b/debian/_base/dependencies/polkit-tqt/debian/rules index 3c269765d..c62056e98 100755 --- a/debian/_base/dependencies/polkit-tqt/debian/rules +++ b/debian/_base/dependencies/polkit-tqt/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk ifdef DEB_HOST_MULTIARCH diff --git a/debian/_base/dependencies/tde-cmake/debian/cdbs/cmake-versions.pl b/debian/_base/dependencies/tde-cmake/debian/cdbs/cmake-versions.pl index 6bbbec325..ded0cfa99 100644 --- a/debian/_base/dependencies/tde-cmake/debian/cdbs/cmake-versions.pl +++ b/debian/_base/dependencies/tde-cmake/debian/cdbs/cmake-versions.pl @@ -3,17 +3,21 @@ use strict; use warnings; +# Get real cmake version and package version prefix my $version = `cmake --version | awk '/^cmake version/ {print \$3}' | tr -d '\n'`; +my $packageversion = `dpkg-query -W -f='\${Version}' cmake`; +my ($prefix); my ($version3, $version3_next); my ($version2, $version2_next); +($prefix = $packageversion) =~ s/$version.*//; ($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 "CMake-Version3=$version3\n"; -print "CMake-Version2=$version2\n"; -print "CMake-Next-Version3=$version3_next\n"; -print "CMake-Next-Version2=$version2_next\n"; +print "CMake-Version3=$prefix$version3\n"; +print "CMake-Version2=$prefix$version2\n"; +print "CMake-Next-Version3=$prefix$version3_next\n"; +print "CMake-Next-Version2=$prefix$version2_next\n"; diff --git a/debian/_base/dependencies/tde-cmake/debian/rules b/debian/_base/dependencies/tde-cmake/debian/rules index 01da412e3..615a177d0 100755 --- a/debian/_base/dependencies/tde-cmake/debian/rules +++ b/debian/_base/dependencies/tde-cmake/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/dependencies/tqca/debian/rules b/debian/_base/dependencies/tqca/debian/rules index ed5580cc5..63b656615 100755 --- a/debian/_base/dependencies/tqca/debian/rules +++ b/debian/_base/dependencies/tqca/debian/rules @@ -1,7 +1,6 @@ #! /usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk ifdef DEB_HOST_MULTIARCH diff --git a/debian/_base/dependencies/tqscintilla/debian/rules b/debian/_base/dependencies/tqscintilla/debian/rules index ed5580cc5..63b656615 100755 --- a/debian/_base/dependencies/tqscintilla/debian/rules +++ b/debian/_base/dependencies/tqscintilla/debian/rules @@ -1,7 +1,6 @@ #! /usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk ifdef DEB_HOST_MULTIARCH diff --git a/debian/_base/libraries/libkdcraw/debian/rules b/debian/_base/libraries/libkdcraw/debian/rules index ee75157ea..b528f7025 100755 --- a/debian/_base/libraries/libkdcraw/debian/rules +++ b/debian/_base/libraries/libkdcraw/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk HAVE_OPENMP= $(if $(wildcard /usr/lib/$(DEB_HOST_MULTIARCH)/libomp*.so),ON,OFF) diff --git a/debian/_base/libraries/libkexiv2/debian/rules b/debian/_base/libraries/libkexiv2/debian/rules index 0c83e49d1..b2d712d83 100755 --- a/debian/_base/libraries/libkexiv2/debian/rules +++ b/debian/_base/libraries/libkexiv2/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/libraries/libkipi/debian/rules b/debian/_base/libraries/libkipi/debian/rules index 0c83e49d1..b2d712d83 100755 --- a/debian/_base/libraries/libkipi/debian/rules +++ b/debian/_base/libraries/libkipi/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/libraries/libksquirrel/debian/rules b/debian/_base/libraries/libksquirrel/debian/rules index 2dd53c6ff..85fad4bc5 100755 --- a/debian/_base/libraries/libksquirrel/debian/rules +++ b/debian/_base/libraries/libksquirrel/debian/rules @@ -2,7 +2,6 @@ # -*- makefile -*- include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/libraries/libtdeldap/debian/rules b/debian/_base/libraries/libtdeldap/debian/rules index 0c83e49d1..b2d712d83 100755 --- a/debian/_base/libraries/libtdeldap/debian/rules +++ b/debian/_base/libraries/libtdeldap/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/debian/_base/libraries/pytdeextensions/debian/rules b/debian/_base/libraries/pytdeextensions/debian/rules index 682076665..d4a300abe 100755 --- a/debian/_base/libraries/pytdeextensions/debian/rules +++ b/debian/_base/libraries/pytdeextensions/debian/rules @@ -1,22 +1,14 @@ #!/usr/bin/make -f -DEB_PYTHON3_MODULE_PACKAGES=pytdeextensions-trinity libpythonize0-trinity - -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/python-distutils.mk -include /usr/share/cdbs/1/rules/utils.mk - DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info -DEB_PYTHON_INSTALL_ARGS_ALL += \ +export PYBUILD_INSTALL_ARGS += \ --install-clib=/opt/trinity/lib \ --install-cheaders=/opt/trinity/include -cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) - DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include @@ -30,32 +22,5 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) endif -install/pytdeextensions-trinity:: - # We have no idea if the built product is site-packages or dist-packages - cd debian/tmp/usr/lib/python*/ && mv site-packages/ dist-packages/ || echo "site-packages --> dist-packages" - rm -rf debian/tmp/usr/lib/python*/site-packages/ - - # install lintian overrides - install -D -p -m0644 debian/pytdeextensions-trinity.lintian-overrides \ - debian/pytdeextensions-trinity/usr/share/lintian/overrides/pytdeextensions-trinity - - # fix script-not-executable - find debian -type f -name '*.py' | xargs chmod 0755 - - # remove extra-license-file - find debian -type f -name 'COPYING' | xargs rm -f - - # remove byte-compiled file - find . -type f -name '*.py[co]' | xargs rm -f - -install/libpythonize0-trinity:: - # fix binary-or-shlib-defines-rpath - chrpath -d debian/tmp/opt/trinity/lib/libpythonize.so.* - -clean:: - rm -rf build - rm -f doc/en/*html doc/en/*bz2 - rm -f install_log.txt - - # remove byte-compiled file - find . -type f -name '*.py[co]' | xargs rm -f +%: + dh $@ --buildsystem=pybuild diff --git a/debian/_base/metapackages/tde-cdbs/tde.mk b/debian/_base/metapackages/tde-cdbs/tde.mk index 01b23943e..2dcaa9c28 100644 --- a/debian/_base/metapackages/tde-cdbs/tde.mk +++ b/debian/_base/metapackages/tde-cdbs/tde.mk @@ -27,13 +27,22 @@ endif ifndef _cdbs_class_tde _cdbs_class_tde := 1 +# automatically select build system +ifneq "$(wildcard CMakeLists.txt)" "" + _tde_build_cmake := 1 +else ifneq "$(wildcard Makefile.am)" "" + _tde_build_automake := 1 +else ifneq "$(wildcard Makefile.am.in)" "" + _tde_build_automake := 1 +endif + # 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 +ifdef _tde_build_automake 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 @@ -59,17 +68,46 @@ 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 +ifdef _tde_build_cmake + -include $(_cdbs_class_path)/cmake.mk$(_cdbs_makefile_suffix) + ifndef _cdbs_class_cmake + include $(_cdbs_class_path)/makefile.mk$(_cdbs_makefile_suffix) + DEB_MAKE_EXTRA_ARGS = $(DEB_MAKE_PARALLEL) + DEB_MAKE_INSTALL_TARGET ?= install DESTDIR=$(DEB_DESTDIR) + CMAKE ?= cmake + DEB_CMAKE_INSTALL_PREFIX ?= /usr + DEB_CMAKE_CFLAGS ?= $(CFLAGS) $(CPPFLAGS) + DEB_CMAKE_CXXFLAGS ?= $(CXXFLAGS) $(CPPFLAGS) + DEB_CMAKE_LDFLAGS ?= $(LDFLAGS) + DEB_CMAKE_NORMAL_ARGS ?= \ + -DCMAKE_INSTALL_PREFIX="$(DEB_CMAKE_INSTALL_PREFIX)" \ + -DCMAKE_C_COMPILER:FILEPATH="$(CC)" \ + -DCMAKE_CXX_COMPILER:FILEPATH="$(CXX)" \ + -DCMAKE_C_FLAGS="$(DEB_CMAKE_CFLAGS)" \ + -DCMAKE_CXX_FLAGS="$(DEB_CMAKE_CXXFLAGS)" \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DCMAKE_EXE_LINKER_FLAGS="$(DEB_CMAKE_LDFLAGS)" \ + -DCMAKE_MODULE_LINKER_FLAGS="$(DEB_CMAKE_LDFLAGS)" \ + -DCMAKE_SHARED_LINKER_FLAGS="$(DEB_CMAKE_LDFLAGS)" + _cdbs_cmake_system_name_linux = Linux + _cdbs_cmake_system_name_kfreebsd = FreeBSD + _cdbs_cmake_system_name_hurd = GNU + DEB_CMAKE_CROSS_ARGS ?= \ + $(patsubst %,-DCMAKE_SYSTEM_NAME=%,\ + $(_cdbs_cmake_system_name_$(DEB_HOST_ARCH_OS))) \ + -DCMAKE_SYSTEM_PROCESSOR=$(DEB_HOST_GNU_CPU) \ + -DCMAKE_INSTALL_LIBDIR=lib/$(DEB_HOST_MULTIARCH) \ + -DPKG_CONFIG_EXECUTABLE=/usr/bin/$(DEB_HOST_GNU_TYPE)-pkg-config + endif + 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 +else ifdef _tde_build_automake + include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) endif ifndef _cdbs_rules_patchsys_quilt @@ -90,6 +128,8 @@ DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el +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| .*||" | \ @@ -100,6 +140,7 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) endif +ifdef _tde_build_automake 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))) @@ -120,20 +161,19 @@ 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) +endif # This is a convenience target for calling manually. # It's not part of the build process. buildprep: clean apply-patches -ifndef _cdbs_class_cmake +ifdef _tde_build_automake $(MAKE) -f admin/Makefile.common dist endif debian/rules clean @@ -146,6 +186,20 @@ endif post-patches:: .tdepkginfo +ifdef _tde_build_cmake +ifndef _cdbs_class_cmake +common-configure-arch common-configure-indep:: common-configure-impl +common-configure-impl:: $(DEB_BUILDDIR)/CMakeCache.txt +$(DEB_BUILDDIR)/CMakeCache.txt: + $(strip cd $(DEB_BUILDDIR) && \ + $(CMAKE) $(CURDIR)/$(DEB_SRCDIR) \ + $(DEB_CMAKE_NORMAL_ARGS) \ + $(if $(cdbs_crossbuild),\ + $(DEB_CMAKE_CROSS_ARGS)) \ + $(DEB_CMAKE_EXTRA_FLAGS)) +endif +endif + common-build-arch:: debian/stamp-man-pages debian/stamp-man-pages: if ! test -d debian/man/out; then mkdir -p debian/man/out; fi @@ -242,7 +296,7 @@ cleanbuilddir:: -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR)) clean:: -ifndef _cdbs_class_cmake +ifdef _tde_build_automake if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \ cd $(DEB_SRCDIR); \ find . -name Makefile.in -print | \ diff --git a/dilos/core/tdeaccessibility/debian/rules b/dilos/core/tdeaccessibility/debian/rules index 94f8800de..a64e978a4 100755 --- a/dilos/core/tdeaccessibility/debian/rules +++ b/dilos/core/tdeaccessibility/debian/rules @@ -1,7 +1,6 @@ #! /usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_DH_SHLIBDEPS_ARGS += --dpkg-shlibdeps-params=--ignore-missing-info diff --git a/dilos/core/tdeaddons/debian/rules b/dilos/core/tdeaddons/debian/rules index 445af3550..2b61126b7 100755 --- a/dilos/core/tdeaddons/debian/rules +++ b/dilos/core/tdeaddons/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CONFIGURE_INCLUDEDIR := /usr/include/tde diff --git a/dilos/core/tdeadmin/debian/rules b/dilos/core/tdeadmin/debian/rules index 47b5c55c7..d79086f1b 100755 --- a/dilos/core/tdeadmin/debian/rules +++ b/dilos/core/tdeadmin/debian/rules @@ -1,7 +1,6 @@ #! /usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CONFIGURE_INCLUDEDIR := /usr/include diff --git a/dilos/core/tdeartwork/debian/rules b/dilos/core/tdeartwork/debian/rules index d0ed5575b..659c8505c 100755 --- a/dilos/core/tdeartwork/debian/rules +++ b/dilos/core/tdeartwork/debian/rules @@ -1,7 +1,6 @@ #! /usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CONFIGURE_INCLUDEDIR := /usr/include diff --git a/dilos/core/tdebase/debian/rules b/dilos/core/tdebase/debian/rules index 280b39e53..59b703f85 100755 --- a/dilos/core/tdebase/debian/rules +++ b/dilos/core/tdebase/debian/rules @@ -10,7 +10,6 @@ endif export LD_LIBRARY_PATH include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_KDE_APIDOX := yes diff --git a/dilos/core/tdeedu/debian/control b/dilos/core/tdeedu/debian/control index e97905115..cf6a353ac 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: tde-cdbs, debhelper (>= 10~), quilt, tde-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 +Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libnum-ocaml-dev | ocaml-nox (<< 4.08), libzarith-ocaml-dev, 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/tdeedu/debian/rules b/dilos/core/tdeedu/debian/rules index 406867b3e..9bddcdd32 100755 --- a/dilos/core/tdeedu/debian/rules +++ b/dilos/core/tdeedu/debian/rules @@ -1,7 +1,6 @@ #! /usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_INSTALL_DOCS_ALL := diff --git a/dilos/core/tdegames/debian/rules b/dilos/core/tdegames/debian/rules index 7cf7a1901..5829f1efa 100755 --- a/dilos/core/tdegames/debian/rules +++ b/dilos/core/tdegames/debian/rules @@ -1,7 +1,6 @@ #! /usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk export kde_bindir = /usr/games diff --git a/dilos/core/tdegraphics/debian/rules b/dilos/core/tdegraphics/debian/rules index 7a327708f..afc8eb239 100755 --- a/dilos/core/tdegraphics/debian/rules +++ b/dilos/core/tdegraphics/debian/rules @@ -10,7 +10,6 @@ endif export LD_LIBRARY_PATH include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/dilos/core/tdelibs/debian/rules b/dilos/core/tdelibs/debian/rules index 53dae6da7..24ec272a3 100755 --- a/dilos/core/tdelibs/debian/rules +++ b/dilos/core/tdelibs/debian/rules @@ -10,7 +10,6 @@ endif export LD_LIBRARY_PATH include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_TIME64_API = $(shell echo | cc $(dpkg-buildflags --get CPPFLAGS) -dM -E -x c++ - | grep -q "_TIME_BITS 64" && echo true || false) diff --git a/dilos/core/tdemultimedia/debian/rules b/dilos/core/tdemultimedia/debian/rules index d66062850..66175015c 100755 --- a/dilos/core/tdemultimedia/debian/rules +++ b/dilos/core/tdemultimedia/debian/rules @@ -1,6 +1,5 @@ #! /usr/bin/make -f -include /usr/share/cdbs/1/class/cmake.mk include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/tde.mk diff --git a/dilos/core/tdenetwork/debian/rules b/dilos/core/tdenetwork/debian/rules index a81e24c36..1faa8a422 100755 --- a/dilos/core/tdenetwork/debian/rules +++ b/dilos/core/tdenetwork/debian/rules @@ -12,7 +12,6 @@ endif export DH_OPTIONS include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CONFIGURE_INCLUDEDIR := /usr/include diff --git a/dilos/core/tdepim/debian/rules b/dilos/core/tdepim/debian/rules index 829ecc36e..7013201a1 100755 --- a/dilos/core/tdepim/debian/rules +++ b/dilos/core/tdepim/debian/rules @@ -10,7 +10,6 @@ endif export LD_LIBRARY_PATH include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_TIME64_API = $(shell echo | cc $(dpkg-buildflags --get CPPFLAGS) -dM -E -x c++ - | grep -q "_TIME_BITS 64" && echo true || false) diff --git a/dilos/core/tdesdk/debian/rules b/dilos/core/tdesdk/debian/rules index 5906e39d3..20bdef999 100755 --- a/dilos/core/tdesdk/debian/rules +++ b/dilos/core/tdesdk/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CONFIGURE_INCLUDEDIR := /usr/include diff --git a/dilos/core/tdetoys/debian/rules b/dilos/core/tdetoys/debian/rules index e26c1affa..73ad35457 100755 --- a/dilos/core/tdetoys/debian/rules +++ b/dilos/core/tdetoys/debian/rules @@ -1,7 +1,6 @@ #! /usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CONFIGURE_INCLUDEDIR := /usr/include diff --git a/dilos/core/tdeutils/debian/rules b/dilos/core/tdeutils/debian/rules index a3537d0a5..0d85e5f3c 100755 --- a/dilos/core/tdeutils/debian/rules +++ b/dilos/core/tdeutils/debian/rules @@ -1,7 +1,6 @@ #! /usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CONFIGURE_INCLUDEDIR := /usr/include diff --git a/dilos/core/tdevelop/debian/rules b/dilos/core/tdevelop/debian/rules index ff5a744b0..eee4441ca 100755 --- a/dilos/core/tdevelop/debian/rules +++ b/dilos/core/tdevelop/debian/rules @@ -10,7 +10,6 @@ endif export LD_LIBRARY_PATH include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_DH_STRIP_ARGS := --dbg-package=tdevelop-trinity-dbg \ diff --git a/dilos/dependencies/arts/debian/rules b/dilos/dependencies/arts/debian/rules index 89c24f521..3de069b50 100755 --- a/dilos/dependencies/arts/debian/rules +++ b/dilos/dependencies/arts/debian/rules @@ -9,7 +9,6 @@ #export LD_LIBRARY_PATH include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_TIME64_API = $(shell echo | cc $(dpkg-buildflags --get CPPFLAGS) -dM -E -x c++ - | grep -q "_TIME_BITS 64" && echo true || false) diff --git a/dilos/dependencies/avahi-tqt/debian/rules b/dilos/dependencies/avahi-tqt/debian/rules index 6a514345b..0f226c7b6 100755 --- a/dilos/dependencies/avahi-tqt/debian/rules +++ b/dilos/dependencies/avahi-tqt/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk # Ensure at build time that the library has no dependencies on undefined diff --git a/dilos/dependencies/dbus-1-tqt/debian/rules b/dilos/dependencies/dbus-1-tqt/debian/rules index 2d7497075..728eddf1b 100755 --- a/dilos/dependencies/dbus-1-tqt/debian/rules +++ b/dilos/dependencies/dbus-1-tqt/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_KDE_APIDOX := yes diff --git a/dilos/dependencies/libart-lgpl/debian/rules b/dilos/dependencies/libart-lgpl/debian/rules index 23ffc8039..8988dc726 100755 --- a/dilos/dependencies/libart-lgpl/debian/rules +++ b/dilos/dependencies/libart-lgpl/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk libart-2.0-N := $(shell sed -rn 's/^Package:[[:space:]]*(libart-2\.0-[0-9]+)[[:space:]]*$$/\1/p' debian/control) diff --git a/dilos/dependencies/tde-cmake/debian/cdbs/cmake-versions.pl b/dilos/dependencies/tde-cmake/debian/cdbs/cmake-versions.pl index 6bbbec325..ded0cfa99 100644 --- a/dilos/dependencies/tde-cmake/debian/cdbs/cmake-versions.pl +++ b/dilos/dependencies/tde-cmake/debian/cdbs/cmake-versions.pl @@ -3,17 +3,21 @@ use strict; use warnings; +# Get real cmake version and package version prefix my $version = `cmake --version | awk '/^cmake version/ {print \$3}' | tr -d '\n'`; +my $packageversion = `dpkg-query -W -f='\${Version}' cmake`; +my ($prefix); my ($version3, $version3_next); my ($version2, $version2_next); +($prefix = $packageversion) =~ s/$version.*//; ($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 "CMake-Version3=$version3\n"; -print "CMake-Version2=$version2\n"; -print "CMake-Next-Version3=$version3_next\n"; -print "CMake-Next-Version2=$version2_next\n"; +print "CMake-Version3=$prefix$version3\n"; +print "CMake-Version2=$prefix$version2\n"; +print "CMake-Next-Version3=$prefix$version3_next\n"; +print "CMake-Next-Version2=$prefix$version2_next\n"; diff --git a/dilos/dependencies/tde-cmake/debian/rules b/dilos/dependencies/tde-cmake/debian/rules index 01da412e3..615a177d0 100755 --- a/dilos/dependencies/tde-cmake/debian/rules +++ b/dilos/dependencies/tde-cmake/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/dilos/dependencies/tqca/debian/rules b/dilos/dependencies/tqca/debian/rules index ed5580cc5..63b656615 100755 --- a/dilos/dependencies/tqca/debian/rules +++ b/dilos/dependencies/tqca/debian/rules @@ -1,7 +1,6 @@ #! /usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk ifdef DEB_HOST_MULTIARCH diff --git a/dilos/dependencies/tqscintilla/debian/rules b/dilos/dependencies/tqscintilla/debian/rules index ed5580cc5..63b656615 100755 --- a/dilos/dependencies/tqscintilla/debian/rules +++ b/dilos/dependencies/tqscintilla/debian/rules @@ -1,7 +1,6 @@ #! /usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk ifdef DEB_HOST_MULTIARCH diff --git a/dilos/libraries/libtdeldap/debian/rules b/dilos/libraries/libtdeldap/debian/rules index 2671cfe9e..5d6237e91 100755 --- a/dilos/libraries/libtdeldap/debian/rules +++ b/dilos/libraries/libtdeldap/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CONFIGURE_INCLUDEDIR := /usr/include diff --git a/gentoo b/gentoo -Subproject 40545d581ffb066aa24ae9b55050b184538f749 +Subproject 199f50c5bba3bb362486192c1b946121d7aca27 diff --git a/ubuntu/_base/applications/development/kdbg/debian/rules b/ubuntu/_base/applications/development/kdbg/debian/rules index d7cc38091..acfdd3d1b 100755 --- a/ubuntu/_base/applications/development/kdbg/debian/rules +++ b/ubuntu/_base/applications/development/kdbg/debian/rules @@ -2,7 +2,6 @@ # -*- makefile -*- include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/development/kdiff3/debian/rules b/ubuntu/_base/applications/development/kdiff3/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/ubuntu/_base/applications/development/kdiff3/debian/rules +++ b/ubuntu/_base/applications/development/kdiff3/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/development/kpicosim/debian/rules b/ubuntu/_base/applications/development/kpicosim/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/ubuntu/_base/applications/development/kpicosim/debian/rules +++ b/ubuntu/_base/applications/development/kpicosim/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/development/kscope/debian/rules b/ubuntu/_base/applications/development/kscope/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/ubuntu/_base/applications/development/kscope/debian/rules +++ b/ubuntu/_base/applications/development/kscope/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/development/ktechlab/debian/rules b/ubuntu/_base/applications/development/ktechlab/debian/rules index e41807ff4..efae1b07a 100755 --- a/ubuntu/_base/applications/development/ktechlab/debian/rules +++ b/ubuntu/_base/applications/development/ktechlab/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/development/kxmleditor/debian/rules b/ubuntu/_base/applications/development/kxmleditor/debian/rules index 0c83e49d1..b2d712d83 100755 --- a/ubuntu/_base/applications/development/kxmleditor/debian/rules +++ b/ubuntu/_base/applications/development/kxmleditor/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/development/piklab/debian/rules b/ubuntu/_base/applications/development/piklab/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/ubuntu/_base/applications/development/piklab/debian/rules +++ b/ubuntu/_base/applications/development/piklab/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/development/tdesvn/debian/rules b/ubuntu/_base/applications/development/tdesvn/debian/rules index 470c6849a..f7ce81d59 100755 --- a/ubuntu/_base/applications/development/tdesvn/debian/rules +++ b/ubuntu/_base/applications/development/tdesvn/debian/rules @@ -10,7 +10,6 @@ endif export LD_LIBRARY_PATH include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_KDE_APIDOX := yes diff --git a/ubuntu/_base/applications/development/universal-indent-gui-tqt/debian/rules b/ubuntu/_base/applications/development/universal-indent-gui-tqt/debian/rules index b2eece260..871fe5c7a 100755 --- a/ubuntu/_base/applications/development/universal-indent-gui-tqt/debian/rules +++ b/ubuntu/_base/applications/development/universal-indent-gui-tqt/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/games/knights/debian/rules b/ubuntu/_base/applications/games/knights/debian/rules index f97395edc..6f721a63c 100755 --- a/ubuntu/_base/applications/games/knights/debian/rules +++ b/ubuntu/_base/applications/games/knights/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/games/tdeknighttour/debian/rules b/ubuntu/_base/applications/games/tdeknighttour/debian/rules index 0c83e49d1..b2d712d83 100755 --- a/ubuntu/_base/applications/games/tdeknighttour/debian/rules +++ b/ubuntu/_base/applications/games/tdeknighttour/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/games/tdepacman/debian/rules b/ubuntu/_base/applications/games/tdepacman/debian/rules index 0c83e49d1..b2d712d83 100755 --- a/ubuntu/_base/applications/games/tdepacman/debian/rules +++ b/ubuntu/_base/applications/games/tdepacman/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/graphics/digikam/debian/rules b/ubuntu/_base/applications/graphics/digikam/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/ubuntu/_base/applications/graphics/digikam/debian/rules +++ b/ubuntu/_base/applications/graphics/digikam/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/graphics/gwenview-i18n/debian/rules b/ubuntu/_base/applications/graphics/gwenview-i18n/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/ubuntu/_base/applications/graphics/gwenview-i18n/debian/rules +++ b/ubuntu/_base/applications/graphics/gwenview-i18n/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/graphics/gwenview/debian/rules b/ubuntu/_base/applications/graphics/gwenview/debian/rules index 7ee75c209..a40072965 100755 --- a/ubuntu/_base/applications/graphics/gwenview/debian/rules +++ b/ubuntu/_base/applications/graphics/gwenview/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/graphics/ksquirrel/debian/rules b/ubuntu/_base/applications/graphics/ksquirrel/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/ubuntu/_base/applications/graphics/ksquirrel/debian/rules +++ b/ubuntu/_base/applications/graphics/ksquirrel/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/graphics/potracegui/debian/rules b/ubuntu/_base/applications/graphics/potracegui/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/ubuntu/_base/applications/graphics/potracegui/debian/rules +++ b/ubuntu/_base/applications/graphics/potracegui/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/internet/kasablanca/debian/rules b/ubuntu/_base/applications/internet/kasablanca/debian/rules index 0c83e49d1..b2d712d83 100755 --- a/ubuntu/_base/applications/internet/kasablanca/debian/rules +++ b/ubuntu/_base/applications/internet/kasablanca/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/internet/kbiff/debian/rules b/ubuntu/_base/applications/internet/kbiff/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/ubuntu/_base/applications/internet/kbiff/debian/rules +++ b/ubuntu/_base/applications/internet/kbiff/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/internet/kftpgrabber/debian/rules b/ubuntu/_base/applications/internet/kftpgrabber/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/ubuntu/_base/applications/internet/kftpgrabber/debian/rules +++ b/ubuntu/_base/applications/internet/kftpgrabber/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/internet/knmap/debian/rules b/ubuntu/_base/applications/internet/knmap/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/ubuntu/_base/applications/internet/knmap/debian/rules +++ b/ubuntu/_base/applications/internet/knmap/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/internet/konversation/debian/rules b/ubuntu/_base/applications/internet/konversation/debian/rules index 3fae28b38..400973b48 100755 --- a/ubuntu/_base/applications/internet/konversation/debian/rules +++ b/ubuntu/_base/applications/internet/konversation/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_DH_STRIP_ARGS := --dbg-package=konversation-trinity-dbg diff --git a/ubuntu/_base/applications/internet/kopete-otr/debian/rules b/ubuntu/_base/applications/internet/kopete-otr/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/ubuntu/_base/applications/internet/kopete-otr/debian/rules +++ b/ubuntu/_base/applications/internet/kopete-otr/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/internet/kshowmail/debian/rules b/ubuntu/_base/applications/internet/kshowmail/debian/rules index 0c83e49d1..b2d712d83 100755 --- a/ubuntu/_base/applications/internet/kshowmail/debian/rules +++ b/ubuntu/_base/applications/internet/kshowmail/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/internet/kstreamripper/debian/rules b/ubuntu/_base/applications/internet/kstreamripper/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/ubuntu/_base/applications/internet/kstreamripper/debian/rules +++ b/ubuntu/_base/applications/internet/kstreamripper/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/internet/ktorrent/debian/rules b/ubuntu/_base/applications/internet/ktorrent/debian/rules index 7ee75c209..a40072965 100755 --- a/ubuntu/_base/applications/internet/ktorrent/debian/rules +++ b/ubuntu/_base/applications/internet/ktorrent/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/internet/kvpnc/debian/rules b/ubuntu/_base/applications/internet/kvpnc/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/ubuntu/_base/applications/internet/kvpnc/debian/rules +++ b/ubuntu/_base/applications/internet/kvpnc/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/internet/smb4k/debian/rules b/ubuntu/_base/applications/internet/smb4k/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/ubuntu/_base/applications/internet/smb4k/debian/rules +++ b/ubuntu/_base/applications/internet/smb4k/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/internet/tork/debian/rules b/ubuntu/_base/applications/internet/tork/debian/rules index 2d9269d79..9c1db7c8c 100755 --- a/ubuntu/_base/applications/internet/tork/debian/rules +++ b/ubuntu/_base/applications/internet/tork/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/misc/bibletime/debian/rules b/ubuntu/_base/applications/misc/bibletime/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/ubuntu/_base/applications/misc/bibletime/debian/rules +++ b/ubuntu/_base/applications/misc/bibletime/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/misc/compizconfig-backend-tdeconfig/debian/rules b/ubuntu/_base/applications/misc/compizconfig-backend-tdeconfig/debian/rules index 0c83e49d1..b2d712d83 100755 --- a/ubuntu/_base/applications/misc/compizconfig-backend-tdeconfig/debian/rules +++ b/ubuntu/_base/applications/misc/compizconfig-backend-tdeconfig/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/misc/desktop-effects-tde/debian/rules b/ubuntu/_base/applications/misc/desktop-effects-tde/debian/rules index 975701388..8542a64ba 100755 --- a/ubuntu/_base/applications/misc/desktop-effects-tde/debian/rules +++ b/ubuntu/_base/applications/misc/desktop-effects-tde/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/misc/kcmldap/debian/rules b/ubuntu/_base/applications/misc/kcmldap/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/ubuntu/_base/applications/misc/kcmldap/debian/rules +++ b/ubuntu/_base/applications/misc/kcmldap/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/misc/kcmldapcontroller/debian/rules b/ubuntu/_base/applications/misc/kcmldapcontroller/debian/rules index 0c83e49d1..b2d712d83 100755 --- a/ubuntu/_base/applications/misc/kcmldapcontroller/debian/rules +++ b/ubuntu/_base/applications/misc/kcmldapcontroller/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/misc/kcmldapmanager/debian/rules b/ubuntu/_base/applications/misc/kcmldapmanager/debian/rules index 0c83e49d1..b2d712d83 100755 --- a/ubuntu/_base/applications/misc/kcmldapmanager/debian/rules +++ b/ubuntu/_base/applications/misc/kcmldapmanager/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/misc/kerberostray/debian/rules b/ubuntu/_base/applications/misc/kerberostray/debian/rules index 0c83e49d1..b2d712d83 100755 --- a/ubuntu/_base/applications/misc/kerberostray/debian/rules +++ b/ubuntu/_base/applications/misc/kerberostray/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/misc/krecipes/debian/rules b/ubuntu/_base/applications/misc/krecipes/debian/rules index 7ee75c209..a40072965 100755 --- a/ubuntu/_base/applications/misc/krecipes/debian/rules +++ b/ubuntu/_base/applications/misc/krecipes/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/multimedia/amarok/debian/rules b/ubuntu/_base/applications/multimedia/amarok/debian/rules index 20acb4430..f46d2b2dd 100755 --- a/ubuntu/_base/applications/multimedia/amarok/debian/rules +++ b/ubuntu/_base/applications/multimedia/amarok/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/multimedia/codeine/debian/rules b/ubuntu/_base/applications/multimedia/codeine/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/ubuntu/_base/applications/multimedia/codeine/debian/rules +++ b/ubuntu/_base/applications/multimedia/codeine/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/multimedia/k3b-i18n/debian/rules b/ubuntu/_base/applications/multimedia/k3b-i18n/debian/rules index a3b58c891..c2016c2de 100755 --- a/ubuntu/_base/applications/multimedia/k3b-i18n/debian/rules +++ b/ubuntu/_base/applications/multimedia/k3b-i18n/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/multimedia/k3b/debian/rules b/ubuntu/_base/applications/multimedia/k3b/debian/rules index 1ad617b5a..d7869c2ea 100755 --- a/ubuntu/_base/applications/multimedia/k3b/debian/rules +++ b/ubuntu/_base/applications/multimedia/k3b/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_TIME64_API = $(shell echo | cc $(dpkg-buildflags --get CPPFLAGS) -dM -E -x c++ - | grep -q "_TIME_BITS 64" && echo true || false) diff --git a/ubuntu/_base/applications/multimedia/k9copy/debian/rules b/ubuntu/_base/applications/multimedia/k9copy/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/ubuntu/_base/applications/multimedia/k9copy/debian/rules +++ b/ubuntu/_base/applications/multimedia/k9copy/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/multimedia/kaffeine/debian/rules b/ubuntu/_base/applications/multimedia/kaffeine/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/ubuntu/_base/applications/multimedia/kaffeine/debian/rules +++ b/ubuntu/_base/applications/multimedia/kaffeine/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/multimedia/kmplayer/debian/rules b/ubuntu/_base/applications/multimedia/kmplayer/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/ubuntu/_base/applications/multimedia/kmplayer/debian/rules +++ b/ubuntu/_base/applications/multimedia/kmplayer/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/multimedia/kplayer/debian/rules b/ubuntu/_base/applications/multimedia/kplayer/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/ubuntu/_base/applications/multimedia/kplayer/debian/rules +++ b/ubuntu/_base/applications/multimedia/kplayer/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/multimedia/mplayerthumbs/debian/rules b/ubuntu/_base/applications/multimedia/mplayerthumbs/debian/rules index 0c83e49d1..b2d712d83 100755 --- a/ubuntu/_base/applications/multimedia/mplayerthumbs/debian/rules +++ b/ubuntu/_base/applications/multimedia/mplayerthumbs/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/multimedia/rosegarden/debian/rules b/ubuntu/_base/applications/multimedia/rosegarden/debian/rules index f91469a4f..57a056859 100755 --- a/ubuntu/_base/applications/multimedia/rosegarden/debian/rules +++ b/ubuntu/_base/applications/multimedia/rosegarden/debian/rules @@ -5,7 +5,6 @@ #export DH_VERBOSE=1 include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/multimedia/soundkonverter/debian/rules b/ubuntu/_base/applications/multimedia/soundkonverter/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/ubuntu/_base/applications/multimedia/soundkonverter/debian/rules +++ b/ubuntu/_base/applications/multimedia/soundkonverter/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/multimedia/tderadio/debian/rules b/ubuntu/_base/applications/multimedia/tderadio/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/ubuntu/_base/applications/multimedia/tderadio/debian/rules +++ b/ubuntu/_base/applications/multimedia/tderadio/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/office/basket/debian/rules b/ubuntu/_base/applications/office/basket/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/ubuntu/_base/applications/office/basket/debian/rules +++ b/ubuntu/_base/applications/office/basket/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/office/kbibtex/debian/rules b/ubuntu/_base/applications/office/kbibtex/debian/rules index 0c83e49d1..b2d712d83 100755 --- a/ubuntu/_base/applications/office/kbibtex/debian/rules +++ b/ubuntu/_base/applications/office/kbibtex/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/office/kbookreader/debian/rules b/ubuntu/_base/applications/office/kbookreader/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/ubuntu/_base/applications/office/kbookreader/debian/rules +++ b/ubuntu/_base/applications/office/kbookreader/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/office/keximdb/debian/rules b/ubuntu/_base/applications/office/keximdb/debian/rules index 2c49e881d..e40e7d9dc 100755 --- a/ubuntu/_base/applications/office/keximdb/debian/rules +++ b/ubuntu/_base/applications/office/keximdb/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/office/kile/debian/rules b/ubuntu/_base/applications/office/kile/debian/rules index 2a89db0d7..7328c1ce6 100755 --- a/ubuntu/_base/applications/office/kile/debian/rules +++ b/ubuntu/_base/applications/office/kile/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/office/kmymoney/debian/rules b/ubuntu/_base/applications/office/kmymoney/debian/rules index c488addf0..3ba899106 100755 --- a/ubuntu/_base/applications/office/kmymoney/debian/rules +++ b/ubuntu/_base/applications/office/kmymoney/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/office/knowit/debian/rules b/ubuntu/_base/applications/office/knowit/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/ubuntu/_base/applications/office/knowit/debian/rules +++ b/ubuntu/_base/applications/office/knowit/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/office/kpilot/debian/rules b/ubuntu/_base/applications/office/kpilot/debian/rules index 7ee75c209..a40072965 100755 --- a/ubuntu/_base/applications/office/kpilot/debian/rules +++ b/ubuntu/_base/applications/office/kpilot/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/office/tde-ebook-reader/debian/rules b/ubuntu/_base/applications/office/tde-ebook-reader/debian/rules index 6cc91649b..8413cf890 100755 --- a/ubuntu/_base/applications/office/tde-ebook-reader/debian/rules +++ b/ubuntu/_base/applications/office/tde-ebook-reader/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/office/tellico/debian/rules b/ubuntu/_base/applications/office/tellico/debian/rules index d7e330270..e6f5916b6 100755 --- a/ubuntu/_base/applications/office/tellico/debian/rules +++ b/ubuntu/_base/applications/office/tellico/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/settings/kdpkg/debian/rules b/ubuntu/_base/applications/settings/kdpkg/debian/rules index 0c83e49d1..b2d712d83 100755 --- a/ubuntu/_base/applications/settings/kdpkg/debian/rules +++ b/ubuntu/_base/applications/settings/kdpkg/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/settings/kima/debian/rules b/ubuntu/_base/applications/settings/kima/debian/rules index 08f9ee45b..22f1bcdb9 100755 --- a/ubuntu/_base/applications/settings/kima/debian/rules +++ b/ubuntu/_base/applications/settings/kima/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk WITH_NVCONTROL = $(if $(filter $(DEB_HOST_ARCH_CPU),amd64 i386),ON,OFF) diff --git a/ubuntu/_base/applications/settings/kiosktool/debian/rules b/ubuntu/_base/applications/settings/kiosktool/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/ubuntu/_base/applications/settings/kiosktool/debian/rules +++ b/ubuntu/_base/applications/settings/kiosktool/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/settings/kkbswitch/debian/rules b/ubuntu/_base/applications/settings/kkbswitch/debian/rules index cf1c1b4d8..7dffb7fba 100755 --- a/ubuntu/_base/applications/settings/kkbswitch/debian/rules +++ b/ubuntu/_base/applications/settings/kkbswitch/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/settings/klcddimmer/debian/rules b/ubuntu/_base/applications/settings/klcddimmer/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/ubuntu/_base/applications/settings/klcddimmer/debian/rules +++ b/ubuntu/_base/applications/settings/klcddimmer/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/settings/kmyfirewall/debian/rules b/ubuntu/_base/applications/settings/kmyfirewall/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/ubuntu/_base/applications/settings/kmyfirewall/debian/rules +++ b/ubuntu/_base/applications/settings/kmyfirewall/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/settings/tde-guidance/debian/rules b/ubuntu/_base/applications/settings/tde-guidance/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/ubuntu/_base/applications/settings/tde-guidance/debian/rules +++ b/ubuntu/_base/applications/settings/tde-guidance/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/settings/tde-systemsettings/debian/rules b/ubuntu/_base/applications/settings/tde-systemsettings/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/ubuntu/_base/applications/settings/tde-systemsettings/debian/rules +++ b/ubuntu/_base/applications/settings/tde-systemsettings/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/settings/tdealternatives/debian/rules b/ubuntu/_base/applications/settings/tdealternatives/debian/rules index 1f278a80f..ed53a5baa 100755 --- a/ubuntu/_base/applications/settings/tdealternatives/debian/rules +++ b/ubuntu/_base/applications/settings/tdealternatives/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/settings/tdenetworkmanager/debian/rules b/ubuntu/_base/applications/settings/tdenetworkmanager/debian/rules index 0c83e49d1..b2d712d83 100755 --- a/ubuntu/_base/applications/settings/tdenetworkmanager/debian/rules +++ b/ubuntu/_base/applications/settings/tdenetworkmanager/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/settings/tdesudo/debian/rules b/ubuntu/_base/applications/settings/tdesudo/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/ubuntu/_base/applications/settings/tdesudo/debian/rules +++ b/ubuntu/_base/applications/settings/tdesudo/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/settings/wlassistant/debian/rules b/ubuntu/_base/applications/settings/wlassistant/debian/rules index 96332d50c..a9217b088 100755 --- a/ubuntu/_base/applications/settings/wlassistant/debian/rules +++ b/ubuntu/_base/applications/settings/wlassistant/debian/rules @@ -10,7 +10,6 @@ endif export LD_LIBRARY_PATH include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_KDE_APIDOX := yes diff --git a/ubuntu/_base/applications/system/dolphin/debian/rules b/ubuntu/_base/applications/system/dolphin/debian/rules index 4024eed1d..700c81956 100755 --- a/ubuntu/_base/applications/system/dolphin/debian/rules +++ b/ubuntu/_base/applications/system/dolphin/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/system/katapult/debian/rules b/ubuntu/_base/applications/system/katapult/debian/rules index d0ecf54e8..e43332172 100755 --- a/ubuntu/_base/applications/system/katapult/debian/rules +++ b/ubuntu/_base/applications/system/katapult/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/system/kbfx/debian/rules b/ubuntu/_base/applications/system/kbfx/debian/rules index e484db04f..585b34d75 100755 --- a/ubuntu/_base/applications/system/kbfx/debian/rules +++ b/ubuntu/_base/applications/system/kbfx/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS =\ diff --git a/ubuntu/_base/applications/system/kcmautostart/debian/rules b/ubuntu/_base/applications/system/kcmautostart/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/ubuntu/_base/applications/system/kcmautostart/debian/rules +++ b/ubuntu/_base/applications/system/kcmautostart/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/system/kdbusnotification/debian/rules b/ubuntu/_base/applications/system/kdbusnotification/debian/rules index 0c83e49d1..b2d712d83 100755 --- a/ubuntu/_base/applications/system/kdbusnotification/debian/rules +++ b/ubuntu/_base/applications/system/kdbusnotification/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/system/klamav/debian/rules b/ubuntu/_base/applications/system/klamav/debian/rules index 0c83e49d1..b2d712d83 100755 --- a/ubuntu/_base/applications/system/klamav/debian/rules +++ b/ubuntu/_base/applications/system/klamav/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/system/knemo/debian/rules b/ubuntu/_base/applications/system/knemo/debian/rules index 0c83e49d1..b2d712d83 100755 --- a/ubuntu/_base/applications/system/knemo/debian/rules +++ b/ubuntu/_base/applications/system/knemo/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/system/knetload/debian/rules b/ubuntu/_base/applications/system/knetload/debian/rules index 0c83e49d1..b2d712d83 100755 --- a/ubuntu/_base/applications/system/knetload/debian/rules +++ b/ubuntu/_base/applications/system/knetload/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/system/knetstats/debian/rules b/ubuntu/_base/applications/system/knetstats/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/ubuntu/_base/applications/system/knetstats/debian/rules +++ b/ubuntu/_base/applications/system/knetstats/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/system/kooldock/debian/rules b/ubuntu/_base/applications/system/kooldock/debian/rules index 0c83e49d1..b2d712d83 100755 --- a/ubuntu/_base/applications/system/kooldock/debian/rules +++ b/ubuntu/_base/applications/system/kooldock/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/system/krusader/debian/rules b/ubuntu/_base/applications/system/krusader/debian/rules index 915b25925..721d1b856 100755 --- a/ubuntu/_base/applications/system/krusader/debian/rules +++ b/ubuntu/_base/applications/system/krusader/debian/rules @@ -26,7 +26,7 @@ install/krusader-trinity:: install -D -p -m0644 pics/cr32-app-krusader_user.xpm \ $(DEB_DESTDIR)/opt/trinity/share/pixmaps/krusader_user.xpm # install properly tdeio_isorc - install -D -p -m0644 iso/tdeio_isorc \ + install -D -p -m0644 src/iso/tdeio_isorc \ $(DEB_DESTDIR)/opt/trinity/share/config/tdeio_isorc # install lintian override install -D -p -m0644 debian/krusader.lintian-overrides \ diff --git a/ubuntu/_base/applications/system/kshutdown/debian/rules b/ubuntu/_base/applications/system/kshutdown/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/ubuntu/_base/applications/system/kshutdown/debian/rules +++ b/ubuntu/_base/applications/system/kshutdown/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/system/ksystemlog/debian/rules b/ubuntu/_base/applications/system/ksystemlog/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/ubuntu/_base/applications/system/ksystemlog/debian/rules +++ b/ubuntu/_base/applications/system/ksystemlog/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/system/kvkbd/debian/rules b/ubuntu/_base/applications/system/kvkbd/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/ubuntu/_base/applications/system/kvkbd/debian/rules +++ b/ubuntu/_base/applications/system/kvkbd/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/system/polkit-agent-tde/debian/rules b/ubuntu/_base/applications/system/polkit-agent-tde/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/ubuntu/_base/applications/system/polkit-agent-tde/debian/rules +++ b/ubuntu/_base/applications/system/polkit-agent-tde/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/system/smartcardauth/debian/control b/ubuntu/_base/applications/system/smartcardauth/debian/control index 97c6fb93e..d1d2e04eb 100644 --- a/ubuntu/_base/applications/system/smartcardauth/debian/control +++ b/ubuntu/_base/applications/system/smartcardauth/debian/control @@ -2,7 +2,7 @@ Source: smartcardauth Section: tde Priority: extra Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, pkg-config, libpkcs11-helper1-dev, libgnutls-dev | libgnutls28-dev | libgnutls30-dev +Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-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/system/smartcardauth/debian/rules b/ubuntu/_base/applications/system/smartcardauth/debian/rules index 14ccf6018..97c83eb02 100755 --- a/ubuntu/_base/applications/system/smartcardauth/debian/rules +++ b/ubuntu/_base/applications/system/smartcardauth/debian/rules @@ -1,26 +1,13 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk +-include /usr/share/cdbs/1/class/tde.mk DEB_BUILD_OPTIONS := nostrip export DEB_BUILD_OPTIONS = debug nostrip CFLAGS=-g -Wall -fPIC -DEB_MAKE_INSTALL_TARGET := install DESTDIR="$(DEB_DESTDIR)" -DEB_INSTALL_DOCS_ALL := - -# 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_DH_SHLIBDEPS_ARGS_ALL=--dpkg-shlibdeps-params=--ignore-missing-info DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/system/tastymenu/debian/rules b/ubuntu/_base/applications/system/tastymenu/debian/rules index 0c83e49d1..b2d712d83 100755 --- a/ubuntu/_base/applications/system/tastymenu/debian/rules +++ b/ubuntu/_base/applications/system/tastymenu/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/system/tdebluez/debian/rules b/ubuntu/_base/applications/system/tdebluez/debian/rules index 6b4a7ada1..affdcdb09 100755 --- a/ubuntu/_base/applications/system/tdebluez/debian/rules +++ b/ubuntu/_base/applications/system/tdebluez/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_KDE_APIDOX := yes diff --git a/ubuntu/_base/applications/system/tdedocker/debian/rules b/ubuntu/_base/applications/system/tdedocker/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/ubuntu/_base/applications/system/tdedocker/debian/rules +++ b/ubuntu/_base/applications/system/tdedocker/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/system/tdepowersave/debian/rules b/ubuntu/_base/applications/system/tdepowersave/debian/rules index 9336e70bc..42167de41 100755 --- a/ubuntu/_base/applications/system/tdepowersave/debian/rules +++ b/ubuntu/_base/applications/system/tdepowersave/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/system/tdesshaskpass/debian/rules b/ubuntu/_base/applications/system/tdesshaskpass/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/ubuntu/_base/applications/system/tdesshaskpass/debian/rules +++ b/ubuntu/_base/applications/system/tdesshaskpass/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/system/xdg-desktop-portal-tde/debian/rules b/ubuntu/_base/applications/system/xdg-desktop-portal-tde/debian/rules index 0c83e49d1..b2d712d83 100755 --- a/ubuntu/_base/applications/system/xdg-desktop-portal-tde/debian/rules +++ b/ubuntu/_base/applications/system/xdg-desktop-portal-tde/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/system/yakuake/debian/rules b/ubuntu/_base/applications/system/yakuake/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/ubuntu/_base/applications/system/yakuake/debian/rules +++ b/ubuntu/_base/applications/system/yakuake/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/rules b/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/rules index 2bd25508c..90b978635 100755 --- a/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/rules +++ b/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/rules @@ -10,7 +10,6 @@ endif export LD_LIBRARY_PATH include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/tdeio/tdeio-apt/debian/rules b/ubuntu/_base/applications/tdeio/tdeio-apt/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/ubuntu/_base/applications/tdeio/tdeio-apt/debian/rules +++ b/ubuntu/_base/applications/tdeio/tdeio-apt/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/tdeio/tdeio-ftps/debian/rules b/ubuntu/_base/applications/tdeio/tdeio-ftps/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/ubuntu/_base/applications/tdeio/tdeio-ftps/debian/rules +++ b/ubuntu/_base/applications/tdeio/tdeio-ftps/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/rules b/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/rules index b0df76110..a393b42cd 100755 --- a/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/rules +++ b/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/rules @@ -10,7 +10,6 @@ endif export LD_LIBRARY_PATH include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_KDE_APIDOX := yes diff --git a/ubuntu/_base/applications/tdeio/tdeio-locate/debian/rules b/ubuntu/_base/applications/tdeio/tdeio-locate/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/ubuntu/_base/applications/tdeio/tdeio-locate/debian/rules +++ b/ubuntu/_base/applications/tdeio/tdeio-locate/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/tdeio/tdeio-sword/debian/rules b/ubuntu/_base/applications/tdeio/tdeio-sword/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/ubuntu/_base/applications/tdeio/tdeio-sword/debian/rules +++ b/ubuntu/_base/applications/tdeio/tdeio-sword/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/rules b/ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/rules +++ b/ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/themes/gtk-qt-engine/debian/rules b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/ubuntu/_base/applications/themes/gtk-qt-engine/debian/rules +++ b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/themes/gtk3-tqt-engine/debian/rules b/ubuntu/_base/applications/themes/gtk3-tqt-engine/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/ubuntu/_base/applications/themes/gtk3-tqt-engine/debian/rules +++ b/ubuntu/_base/applications/themes/gtk3-tqt-engine/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/themes/kgtk-qt3/debian/rules b/ubuntu/_base/applications/themes/kgtk-qt3/debian/rules index cfcfca0b9..670720090 100755 --- a/ubuntu/_base/applications/themes/kgtk-qt3/debian/rules +++ b/ubuntu/_base/applications/themes/kgtk-qt3/debian/rules @@ -10,7 +10,6 @@ endif export LD_LIBRARY_PATH include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_KDE_APIDOX := yes diff --git a/ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/rules b/ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/rules +++ b/ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/themes/tde-style-baghira/debian/rules b/ubuntu/_base/applications/themes/tde-style-baghira/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/ubuntu/_base/applications/themes/tde-style-baghira/debian/rules +++ b/ubuntu/_base/applications/themes/tde-style-baghira/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/themes/tde-style-domino/debian/rules b/ubuntu/_base/applications/themes/tde-style-domino/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/ubuntu/_base/applications/themes/tde-style-domino/debian/rules +++ b/ubuntu/_base/applications/themes/tde-style-domino/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/themes/tde-style-ia-ora/debian/rules b/ubuntu/_base/applications/themes/tde-style-ia-ora/debian/rules index 0c83e49d1..b2d712d83 100755 --- a/ubuntu/_base/applications/themes/tde-style-ia-ora/debian/rules +++ b/ubuntu/_base/applications/themes/tde-style-ia-ora/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/themes/tde-style-lipstik/debian/rules b/ubuntu/_base/applications/themes/tde-style-lipstik/debian/rules index 0c83e49d1..b2d712d83 100755 --- a/ubuntu/_base/applications/themes/tde-style-lipstik/debian/rules +++ b/ubuntu/_base/applications/themes/tde-style-lipstik/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/themes/tde-style-polyester/debian/rules b/ubuntu/_base/applications/themes/tde-style-polyester/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/ubuntu/_base/applications/themes/tde-style-polyester/debian/rules +++ b/ubuntu/_base/applications/themes/tde-style-polyester/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/themes/tde-style-qtcurve/debian/rules b/ubuntu/_base/applications/themes/tde-style-qtcurve/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/ubuntu/_base/applications/themes/tde-style-qtcurve/debian/rules +++ b/ubuntu/_base/applications/themes/tde-style-qtcurve/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/themes/tdmtheme/debian/rules b/ubuntu/_base/applications/themes/tdmtheme/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/ubuntu/_base/applications/themes/tdmtheme/debian/rules +++ b/ubuntu/_base/applications/themes/tdmtheme/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/themes/twin-style-crystal/debian/rules b/ubuntu/_base/applications/themes/twin-style-crystal/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/ubuntu/_base/applications/themes/twin-style-crystal/debian/rules +++ b/ubuntu/_base/applications/themes/twin-style-crystal/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/themes/twin-style-dekorator/debian/rules b/ubuntu/_base/applications/themes/twin-style-dekorator/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/ubuntu/_base/applications/themes/twin-style-dekorator/debian/rules +++ b/ubuntu/_base/applications/themes/twin-style-dekorator/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/themes/twin-style-fahrenheit/debian/rules b/ubuntu/_base/applications/themes/twin-style-fahrenheit/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/ubuntu/_base/applications/themes/twin-style-fahrenheit/debian/rules +++ b/ubuntu/_base/applications/themes/twin-style-fahrenheit/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/themes/twin-style-machbunt/debian/rules b/ubuntu/_base/applications/themes/twin-style-machbunt/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/ubuntu/_base/applications/themes/twin-style-machbunt/debian/rules +++ b/ubuntu/_base/applications/themes/twin-style-machbunt/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/themes/twin-style-mallory/debian/rules b/ubuntu/_base/applications/themes/twin-style-mallory/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/ubuntu/_base/applications/themes/twin-style-mallory/debian/rules +++ b/ubuntu/_base/applications/themes/twin-style-mallory/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/themes/twin-style-suse2/debian/rules b/ubuntu/_base/applications/themes/twin-style-suse2/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/ubuntu/_base/applications/themes/twin-style-suse2/debian/rules +++ b/ubuntu/_base/applications/themes/twin-style-suse2/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/utilities/abakus/debian/rules b/ubuntu/_base/applications/utilities/abakus/debian/rules index c366e00cb..411a41a23 100755 --- a/ubuntu/_base/applications/utilities/abakus/debian/rules +++ b/ubuntu/_base/applications/utilities/abakus/debian/rules @@ -10,7 +10,6 @@ endif export LD_LIBRARY_PATH include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_KDE_APIDOX := yes diff --git a/ubuntu/_base/applications/utilities/filelight/debian/rules b/ubuntu/_base/applications/utilities/filelight/debian/rules index 04c7865bc..acec209eb 100755 --- a/ubuntu/_base/applications/utilities/filelight/debian/rules +++ b/ubuntu/_base/applications/utilities/filelight/debian/rules @@ -5,7 +5,6 @@ # see /usr/share/common-licenses/GPL-2 for details. include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_DH_ALWAYS_EXCLUDE=.svn diff --git a/ubuntu/_base/applications/utilities/kbarcode/debian/rules b/ubuntu/_base/applications/utilities/kbarcode/debian/rules index 0c83e49d1..b2d712d83 100755 --- a/ubuntu/_base/applications/utilities/kbarcode/debian/rules +++ b/ubuntu/_base/applications/utilities/kbarcode/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/utilities/kchmviewer/debian/rules b/ubuntu/_base/applications/utilities/kchmviewer/debian/rules index 0c83e49d1..b2d712d83 100755 --- a/ubuntu/_base/applications/utilities/kchmviewer/debian/rules +++ b/ubuntu/_base/applications/utilities/kchmviewer/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/utilities/kcpuload/debian/rules b/ubuntu/_base/applications/utilities/kcpuload/debian/rules index 3c961a480..f38aa8f52 100755 --- a/ubuntu/_base/applications/utilities/kcpuload/debian/rules +++ b/ubuntu/_base/applications/utilities/kcpuload/debian/rules @@ -3,7 +3,6 @@ # GNU copyright 1997 to 1999 by Joey Hess. include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/utilities/kdirstat/debian/rules b/ubuntu/_base/applications/utilities/kdirstat/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/ubuntu/_base/applications/utilities/kdirstat/debian/rules +++ b/ubuntu/_base/applications/utilities/kdirstat/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/utilities/keep/debian/rules b/ubuntu/_base/applications/utilities/keep/debian/rules index 0c83e49d1..b2d712d83 100755 --- a/ubuntu/_base/applications/utilities/keep/debian/rules +++ b/ubuntu/_base/applications/utilities/keep/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/utilities/knutclient/debian/rules b/ubuntu/_base/applications/utilities/knutclient/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/ubuntu/_base/applications/utilities/knutclient/debian/rules +++ b/ubuntu/_base/applications/utilities/knutclient/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/utilities/kommando/debian/rules b/ubuntu/_base/applications/utilities/kommando/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/ubuntu/_base/applications/utilities/kommando/debian/rules +++ b/ubuntu/_base/applications/utilities/kommando/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/utilities/kompose/debian/rules b/ubuntu/_base/applications/utilities/kompose/debian/rules index 0c83e49d1..b2d712d83 100755 --- a/ubuntu/_base/applications/utilities/kompose/debian/rules +++ b/ubuntu/_base/applications/utilities/kompose/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/utilities/krename/debian/rules b/ubuntu/_base/applications/utilities/krename/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/ubuntu/_base/applications/utilities/krename/debian/rules +++ b/ubuntu/_base/applications/utilities/krename/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/utilities/ksensors/debian/rules b/ubuntu/_base/applications/utilities/ksensors/debian/rules index 9b8770924..a866baea2 100755 --- a/ubuntu/_base/applications/utilities/ksensors/debian/rules +++ b/ubuntu/_base/applications/utilities/ksensors/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/utilities/mathemagics/debian/rules b/ubuntu/_base/applications/utilities/mathemagics/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/ubuntu/_base/applications/utilities/mathemagics/debian/rules +++ b/ubuntu/_base/applications/utilities/mathemagics/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/applications/utilities/qalculate-tde/debian/rules b/ubuntu/_base/applications/utilities/qalculate-tde/debian/rules index a4bcfd0ff..d8f798f1c 100755 --- a/ubuntu/_base/applications/utilities/qalculate-tde/debian/rules +++ b/ubuntu/_base/applications/utilities/qalculate-tde/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/core/tdeaccessibility/debian/rules b/ubuntu/_base/core/tdeaccessibility/debian/rules index b0099e4d0..8f158ca6e 100755 --- a/ubuntu/_base/core/tdeaccessibility/debian/rules +++ b/ubuntu/_base/core/tdeaccessibility/debian/rules @@ -1,7 +1,6 @@ #! /usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk #DEB_MAKE_CHECK_TARGET = check diff --git a/ubuntu/_base/core/tdeaddons/debian/rules b/ubuntu/_base/core/tdeaddons/debian/rules index aac0a6284..9f60552e2 100755 --- a/ubuntu/_base/core/tdeaddons/debian/rules +++ b/ubuntu/_base/core/tdeaddons/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/core/tdeadmin/debian/rules b/ubuntu/_base/core/tdeadmin/debian/rules index 626bc75ce..f29f55372 100755 --- a/ubuntu/_base/core/tdeadmin/debian/rules +++ b/ubuntu/_base/core/tdeadmin/debian/rules @@ -1,7 +1,6 @@ #! /usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_DH_STRIP_ARGS := --dbg-package=tdeadmin-trinity-dbg diff --git a/ubuntu/_base/core/tdeartwork/debian/rules b/ubuntu/_base/core/tdeartwork/debian/rules index 21a7a3033..a18626c89 100755 --- a/ubuntu/_base/core/tdeartwork/debian/rules +++ b/ubuntu/_base/core/tdeartwork/debian/rules @@ -1,7 +1,6 @@ #! /usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/core/tdebase/debian/rules b/ubuntu/_base/core/tdebase/debian/rules index 34cd51ec6..677ef4dff 100755 --- a/ubuntu/_base/core/tdebase/debian/rules +++ b/ubuntu/_base/core/tdebase/debian/rules @@ -10,7 +10,6 @@ endif export LD_LIBRARY_PATH include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_KDE_APIDOX := yes diff --git a/ubuntu/_base/core/tdeedu/debian/control b/ubuntu/_base/core/tdeedu/debian/control index 889c9da40..b5d153b0c 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: tde-cdbs, debhelper (>= 10~), quilt, tde-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 +Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libnum-ocaml-dev | ocaml-nox (<< 4.08), libzarith-ocaml-dev, 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/tdeedu/debian/rules b/ubuntu/_base/core/tdeedu/debian/rules index 0a37bb42e..6d19da7b0 100755 --- a/ubuntu/_base/core/tdeedu/debian/rules +++ b/ubuntu/_base/core/tdeedu/debian/rules @@ -1,7 +1,6 @@ #! /usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_INSTALL_DOCS_ALL := diff --git a/ubuntu/_base/core/tdegames/debian/rules b/ubuntu/_base/core/tdegames/debian/rules index b6fb2fcff..a9298f39d 100755 --- a/ubuntu/_base/core/tdegames/debian/rules +++ b/ubuntu/_base/core/tdegames/debian/rules @@ -1,7 +1,6 @@ #! /usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk export kde_bindir = /opt/trinity/games diff --git a/ubuntu/_base/core/tdegraphics/debian/rules b/ubuntu/_base/core/tdegraphics/debian/rules index 532043772..05176711a 100755 --- a/ubuntu/_base/core/tdegraphics/debian/rules +++ b/ubuntu/_base/core/tdegraphics/debian/rules @@ -10,7 +10,6 @@ endif export LD_LIBRARY_PATH include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/core/tdelibs/debian/rules b/ubuntu/_base/core/tdelibs/debian/rules index 18d02c681..8ac64a31b 100755 --- a/ubuntu/_base/core/tdelibs/debian/rules +++ b/ubuntu/_base/core/tdelibs/debian/rules @@ -10,7 +10,6 @@ endif export LD_LIBRARY_PATH include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_TIME64_API = $(shell echo | cc $(dpkg-buildflags --get CPPFLAGS) -dM -E -x c++ - | grep -q "_TIME_BITS 64" && echo true || false) diff --git a/ubuntu/_base/core/tdemultimedia/debian/rules b/ubuntu/_base/core/tdemultimedia/debian/rules index 7010e9b52..8d4a580e7 100755 --- a/ubuntu/_base/core/tdemultimedia/debian/rules +++ b/ubuntu/_base/core/tdemultimedia/debian/rules @@ -1,6 +1,5 @@ #! /usr/bin/make -f -include /usr/share/cdbs/1/class/cmake.mk include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/tde.mk diff --git a/ubuntu/_base/core/tdenetwork/debian/rules b/ubuntu/_base/core/tdenetwork/debian/rules index 06e2c3b78..33c4b9bf2 100755 --- a/ubuntu/_base/core/tdenetwork/debian/rules +++ b/ubuntu/_base/core/tdenetwork/debian/rules @@ -12,7 +12,6 @@ endif export DH_OPTIONS include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/core/tdepim/debian/rules b/ubuntu/_base/core/tdepim/debian/rules index 66704b8f2..58e1d63da 100755 --- a/ubuntu/_base/core/tdepim/debian/rules +++ b/ubuntu/_base/core/tdepim/debian/rules @@ -10,7 +10,6 @@ endif export LD_LIBRARY_PATH include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_TIME64_API = $(shell echo | cc $(dpkg-buildflags --get CPPFLAGS) -dM -E -x c++ - | grep -q "_TIME_BITS 64" && echo true || false) diff --git a/ubuntu/_base/core/tdesdk/debian/rules b/ubuntu/_base/core/tdesdk/debian/rules index 7e3915b33..d044b50c8 100755 --- a/ubuntu/_base/core/tdesdk/debian/rules +++ b/ubuntu/_base/core/tdesdk/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_DH_STRIP_ARGS := --dbg-package=tdesdk-trinity-dbg diff --git a/ubuntu/_base/core/tdetoys/debian/rules b/ubuntu/_base/core/tdetoys/debian/rules index 0befcfe7d..cbd7532de 100755 --- a/ubuntu/_base/core/tdetoys/debian/rules +++ b/ubuntu/_base/core/tdetoys/debian/rules @@ -1,7 +1,6 @@ #! /usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/core/tdeutils/debian/rules b/ubuntu/_base/core/tdeutils/debian/rules index a7f125c88..455ebd769 100755 --- a/ubuntu/_base/core/tdeutils/debian/rules +++ b/ubuntu/_base/core/tdeutils/debian/rules @@ -1,7 +1,6 @@ #! /usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_KDE_APIDOX := yes diff --git a/ubuntu/_base/core/tdevelop/debian/rules b/ubuntu/_base/core/tdevelop/debian/rules index 75aa86c76..f53abacce 100755 --- a/ubuntu/_base/core/tdevelop/debian/rules +++ b/ubuntu/_base/core/tdevelop/debian/rules @@ -10,7 +10,6 @@ endif export LD_LIBRARY_PATH include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_DH_STRIP_ARGS := --dbg-package=tdevelop-trinity-dbg diff --git a/ubuntu/_base/core/tdewebdev/debian/rules b/ubuntu/_base/core/tdewebdev/debian/rules index 22bf44865..7b4ee3cd9 100755 --- a/ubuntu/_base/core/tdewebdev/debian/rules +++ b/ubuntu/_base/core/tdewebdev/debian/rules @@ -1,7 +1,6 @@ #! /usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_INSTALL_CHANGELOGS_kimagemapeditor-trinity := kimagemapeditor/ChangeLog diff --git a/ubuntu/_base/dependencies/akode/debian/rules b/ubuntu/_base/dependencies/akode/debian/rules index 8e0bb29a7..aa92a8c09 100755 --- a/ubuntu/_base/dependencies/akode/debian/rules +++ b/ubuntu/_base/dependencies/akode/debian/rules @@ -1,7 +1,6 @@ #! /usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_HOST_ARCH_OS = $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) diff --git a/ubuntu/_base/dependencies/arts/debian/rules b/ubuntu/_base/dependencies/arts/debian/rules index 06a80d4cb..0871ce02f 100755 --- a/ubuntu/_base/dependencies/arts/debian/rules +++ b/ubuntu/_base/dependencies/arts/debian/rules @@ -9,7 +9,6 @@ endif export LD_LIBRARY_PATH include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_TIME64_API = $(shell echo | cc $(dpkg-buildflags --get CPPFLAGS) -dM -E -x c++ - | grep -q "_TIME_BITS 64" && echo true || false) diff --git a/ubuntu/_base/dependencies/avahi-tqt/debian/rules b/ubuntu/_base/dependencies/avahi-tqt/debian/rules index 4dfb5de07..ea9c8dbd4 100755 --- a/ubuntu/_base/dependencies/avahi-tqt/debian/rules +++ b/ubuntu/_base/dependencies/avahi-tqt/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk # Ensure at build time that the library has no dependencies on undefined diff --git a/ubuntu/_base/dependencies/dbus-1-tqt/debian/rules b/ubuntu/_base/dependencies/dbus-1-tqt/debian/rules index d59b2580a..ea82ad554 100755 --- a/ubuntu/_base/dependencies/dbus-1-tqt/debian/rules +++ b/ubuntu/_base/dependencies/dbus-1-tqt/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_KDE_APIDOX := yes diff --git a/ubuntu/_base/dependencies/libart-lgpl/debian/rules b/ubuntu/_base/dependencies/libart-lgpl/debian/rules index 47aa40b34..8dcda8fda 100755 --- a/ubuntu/_base/dependencies/libart-lgpl/debian/rules +++ b/ubuntu/_base/dependencies/libart-lgpl/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk libart-2.0-N := $(shell sed -rn 's/^Package:[[:space:]]*(libart-2\.0-[0-9]+)[[:space:]]*$$/\1/p' debian/control) diff --git a/ubuntu/_base/dependencies/libcaldav/debian/rules b/ubuntu/_base/dependencies/libcaldav/debian/rules index 4175ecbbc..899d31ee9 100755 --- a/ubuntu/_base/dependencies/libcaldav/debian/rules +++ b/ubuntu/_base/dependencies/libcaldav/debian/rules @@ -1,7 +1,6 @@ #! /usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_TIME64_API = $(shell echo | cc $(dpkg-buildflags --get CPPFLAGS) -dM -E -x c++ - | grep -q "_TIME_BITS 64" && echo true || false) diff --git a/ubuntu/_base/dependencies/libcarddav/debian/rules b/ubuntu/_base/dependencies/libcarddav/debian/rules index 8b943babc..84d7be9bd 100755 --- a/ubuntu/_base/dependencies/libcarddav/debian/rules +++ b/ubuntu/_base/dependencies/libcarddav/debian/rules @@ -1,7 +1,6 @@ #! /usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_TIME64_API = $(shell echo | cc $(dpkg-buildflags --get CPPFLAGS) -dM -E -x c++ - | grep -q "_TIME_BITS 64" && echo true || false) diff --git a/ubuntu/_base/dependencies/libr/debian/rules b/ubuntu/_base/dependencies/libr/debian/rules index ba83647b4..0b16c81e9 100755 --- a/ubuntu/_base/dependencies/libr/debian/rules +++ b/ubuntu/_base/dependencies/libr/debian/rules @@ -1,7 +1,6 @@ #! /usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk # Build options diff --git a/ubuntu/_base/dependencies/polkit-tqt/debian/rules b/ubuntu/_base/dependencies/polkit-tqt/debian/rules index 3c269765d..c62056e98 100755 --- a/ubuntu/_base/dependencies/polkit-tqt/debian/rules +++ b/ubuntu/_base/dependencies/polkit-tqt/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk ifdef DEB_HOST_MULTIARCH diff --git a/ubuntu/_base/dependencies/tde-cmake/debian/cdbs/cmake-versions.pl b/ubuntu/_base/dependencies/tde-cmake/debian/cdbs/cmake-versions.pl index 6bbbec325..ded0cfa99 100644 --- a/ubuntu/_base/dependencies/tde-cmake/debian/cdbs/cmake-versions.pl +++ b/ubuntu/_base/dependencies/tde-cmake/debian/cdbs/cmake-versions.pl @@ -3,17 +3,21 @@ use strict; use warnings; +# Get real cmake version and package version prefix my $version = `cmake --version | awk '/^cmake version/ {print \$3}' | tr -d '\n'`; +my $packageversion = `dpkg-query -W -f='\${Version}' cmake`; +my ($prefix); my ($version3, $version3_next); my ($version2, $version2_next); +($prefix = $packageversion) =~ s/$version.*//; ($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 "CMake-Version3=$version3\n"; -print "CMake-Version2=$version2\n"; -print "CMake-Next-Version3=$version3_next\n"; -print "CMake-Next-Version2=$version2_next\n"; +print "CMake-Version3=$prefix$version3\n"; +print "CMake-Version2=$prefix$version2\n"; +print "CMake-Next-Version3=$prefix$version3_next\n"; +print "CMake-Next-Version2=$prefix$version2_next\n"; diff --git a/ubuntu/_base/dependencies/tde-cmake/debian/rules b/ubuntu/_base/dependencies/tde-cmake/debian/rules index 01da412e3..615a177d0 100755 --- a/ubuntu/_base/dependencies/tde-cmake/debian/rules +++ b/ubuntu/_base/dependencies/tde-cmake/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/dependencies/tqca/debian/rules b/ubuntu/_base/dependencies/tqca/debian/rules index ed5580cc5..63b656615 100755 --- a/ubuntu/_base/dependencies/tqca/debian/rules +++ b/ubuntu/_base/dependencies/tqca/debian/rules @@ -1,7 +1,6 @@ #! /usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk ifdef DEB_HOST_MULTIARCH diff --git a/ubuntu/_base/dependencies/tqscintilla/debian/rules b/ubuntu/_base/dependencies/tqscintilla/debian/rules index ed5580cc5..63b656615 100755 --- a/ubuntu/_base/dependencies/tqscintilla/debian/rules +++ b/ubuntu/_base/dependencies/tqscintilla/debian/rules @@ -1,7 +1,6 @@ #! /usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk ifdef DEB_HOST_MULTIARCH diff --git a/ubuntu/_base/libraries/libkdcraw/debian/rules b/ubuntu/_base/libraries/libkdcraw/debian/rules index ee75157ea..b528f7025 100755 --- a/ubuntu/_base/libraries/libkdcraw/debian/rules +++ b/ubuntu/_base/libraries/libkdcraw/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk HAVE_OPENMP= $(if $(wildcard /usr/lib/$(DEB_HOST_MULTIARCH)/libomp*.so),ON,OFF) diff --git a/ubuntu/_base/libraries/libkexiv2/debian/rules b/ubuntu/_base/libraries/libkexiv2/debian/rules index 0c83e49d1..b2d712d83 100755 --- a/ubuntu/_base/libraries/libkexiv2/debian/rules +++ b/ubuntu/_base/libraries/libkexiv2/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/libraries/libkipi/debian/rules b/ubuntu/_base/libraries/libkipi/debian/rules index 0c83e49d1..b2d712d83 100755 --- a/ubuntu/_base/libraries/libkipi/debian/rules +++ b/ubuntu/_base/libraries/libkipi/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/libraries/libksquirrel/debian/rules b/ubuntu/_base/libraries/libksquirrel/debian/rules index 2dd53c6ff..85fad4bc5 100755 --- a/ubuntu/_base/libraries/libksquirrel/debian/rules +++ b/ubuntu/_base/libraries/libksquirrel/debian/rules @@ -2,7 +2,6 @@ # -*- makefile -*- include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/libraries/libtdeldap/debian/rules b/ubuntu/_base/libraries/libtdeldap/debian/rules index 0c83e49d1..b2d712d83 100755 --- a/ubuntu/_base/libraries/libtdeldap/debian/rules +++ b/ubuntu/_base/libraries/libtdeldap/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/class/tde.mk DEB_CMAKE_EXTRA_FLAGS := \ diff --git a/ubuntu/_base/libraries/pytdeextensions/debian/rules b/ubuntu/_base/libraries/pytdeextensions/debian/rules index 682076665..d4a300abe 100755 --- a/ubuntu/_base/libraries/pytdeextensions/debian/rules +++ b/ubuntu/_base/libraries/pytdeextensions/debian/rules @@ -1,22 +1,14 @@ #!/usr/bin/make -f -DEB_PYTHON3_MODULE_PACKAGES=pytdeextensions-trinity libpythonize0-trinity - -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/python-distutils.mk -include /usr/share/cdbs/1/rules/utils.mk - DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info -DEB_PYTHON_INSTALL_ARGS_ALL += \ +export PYBUILD_INSTALL_ARGS += \ --install-clib=/opt/trinity/lib \ --install-cheaders=/opt/trinity/include -cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) - DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include @@ -30,32 +22,5 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) endif -install/pytdeextensions-trinity:: - # We have no idea if the built product is site-packages or dist-packages - cd debian/tmp/usr/lib/python*/ && mv site-packages/ dist-packages/ || echo "site-packages --> dist-packages" - rm -rf debian/tmp/usr/lib/python*/site-packages/ - - # install lintian overrides - install -D -p -m0644 debian/pytdeextensions-trinity.lintian-overrides \ - debian/pytdeextensions-trinity/usr/share/lintian/overrides/pytdeextensions-trinity - - # fix script-not-executable - find debian -type f -name '*.py' | xargs chmod 0755 - - # remove extra-license-file - find debian -type f -name 'COPYING' | xargs rm -f - - # remove byte-compiled file - find . -type f -name '*.py[co]' | xargs rm -f - -install/libpythonize0-trinity:: - # fix binary-or-shlib-defines-rpath - chrpath -d debian/tmp/opt/trinity/lib/libpythonize.so.* - -clean:: - rm -rf build - rm -f doc/en/*html doc/en/*bz2 - rm -f install_log.txt - - # remove byte-compiled file - find . -type f -name '*.py[co]' | xargs rm -f +%: + dh $@ --buildsystem=pybuild |