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)

14 files changed, 0 insertions, 14 deletions

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/dbus-tqt/debian/rules b/ubuntu/_base/dependencies/dbus-tqt/debian/rules
index 9df7771c8..98dff1416 100755
--- a/ubuntu/_base/dependencies/dbus-tqt/debian/rules
+++ b/ubuntu/_base/dependencies/dbus-tqt/debian/rules
@@ -5,7 +5,6 @@
 
 #include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/cmake.mk
 -include /usr/share/cdbs/1/class/tde.mk
 
 # Strict library versioning
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/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/dependencies/tqtinterface/debian/rules b/ubuntu/_base/dependencies/tqtinterface/debian/rules
index cc9398e64..13d3873bb 100755
--- a/ubuntu/_base/dependencies/tqtinterface/debian/rules
+++ b/ubuntu/_base/dependencies/tqtinterface/debian/rules
@@ -1,7 +1,6 @@
 #! /usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/cmake.mk
 -include /usr/share/cdbs/1/class/tde.mk
 
 version=Debian Package $(DEB_VERSION)