DEB: Remove direct include for cmake.mk. Now it is automatically included by tde.mk,

or using tde.mk rules for CMake builds with cdbs >= 0.4.177.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 90b6a86d3f8bde42d56277455b397c6fd96af9cc)

17 files changed, 0 insertions, 17 deletions

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/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