Branch: master

07ad41b2 2019-04-02 16:29:58 Slávek Banko
DEB compizconfig-backend-tdeconfig: Switch to cmake.

Signed-off-by: Slávek Banko <slavek.banko@...>
M debian/lenny/applications/compizconfig-backend-tdeconfig/debian/cdbs/debian-qt-kde.mk
M debian/lenny/applications/compizconfig-backend-tdeconfig/debian/cdbs/kde.mk
M debian/lenny/applications/compizconfig-backend-tdeconfig/debian/control
M debian/lenny/applications/compizconfig-backend-tdeconfig/debian/rules
M debian/squeeze/applications/compizconfig-backend-tdeconfig/debian/cdbs/debian-qt-kde.mk
M debian/squeeze/applications/compizconfig-backend-tdeconfig/debian/cdbs/kde.mk
M debian/squeeze/applications/compizconfig-backend-tdeconfig/debian/control
M debian/squeeze/applications/compizconfig-backend-tdeconfig/debian/rules
M ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/cdbs/debian-qt-kde.mk
M ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/cdbs/kde.mk
M ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/control
M ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/rules

debian/lenny/applications/compizconfig-backend-tdeconfig/debian/cdbs/debian-qt-kde.mk

diff --git a/debian/lenny/applications/compizconfig-backend-tdeconfig/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/compizconfig-backend-tdeconfig/debian/cdbs/debian-qt-kde.mk
index 9f8f977..60310a0 100644
--- a/debian/lenny/applications/compizconfig-backend-tdeconfig/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/compizconfig-backend-tdeconfig/debian/cdbs/debian-qt-kde.mk
@@ -10,6 +10,7 @@
 # Note: This _must_ be included before autotools.mk, or it won't work.
 common-configure-arch common-configure-indep:: debian/stamp-cvs-make
 debian/stamp-cvs-make:
+ifndef _cdbs_class_cmake
 	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
 ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
 	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
@@ -18,6 +19,7 @@
 	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
 endif
 	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
+endif
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
@@ -102,6 +104,7 @@
 	done
 
 clean::
+ifndef _cdbs_class_cmake
 	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
 		cd $(DEB_SRCDIR); \
 		find . -name Makefile.in -print | \
@@ -110,6 +113,7 @@
 			configure configure.files configure.in stamp-h.in \
 			subdirs; \
 	fi
+endif
 	rm -f debian/stamp-cvs-make
 
 endif

debian/lenny/applications/compizconfig-backend-tdeconfig/debian/cdbs/kde.mk

diff --git a/debian/lenny/applications/compizconfig-backend-tdeconfig/debian/cdbs/kde.mk b/debian/lenny/applications/compizconfig-backend-tdeconfig/debian/cdbs/kde.mk
index 1ac26c4..80176d6 100644
--- a/debian/lenny/applications/compizconfig-backend-tdeconfig/debian/cdbs/kde.mk
+++ b/debian/lenny/applications/compizconfig-backend-tdeconfig/debian/cdbs/kde.mk
@@ -35,7 +35,9 @@
 DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
 endif
 
+ifndef _cdbs_class_cmake
 include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
+endif
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
@@ -59,7 +61,7 @@
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/lenny/applications/compizconfig-backend-tdeconfig/debian/control

diff --git a/debian/lenny/applications/compizconfig-backend-tdeconfig/debian/control b/debian/lenny/applications/compizconfig-backend-tdeconfig/debian/control
index c806b40..c2d6a31 100644
--- a/debian/lenny/applications/compizconfig-backend-tdeconfig/debian/control
+++ b/debian/lenny/applications/compizconfig-backend-tdeconfig/debian/control
@@ -2,7 +2,7 @@
 Section: libs
 Priority: extra
 Maintainer: Timothy Pearosn <kb9vqf@...>
-Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, compiz-trinity-dev, pkg-config, intltool, tdelibs14-trinity-dev, libcompizconfig0-trinity-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake, compiz-trinity-dev, pkg-config, intltool, tdelibs14-trinity-dev, libcompizconfig0-trinity-dev
 Standards-Version: 3.8.4
 
 Package: compizconfig-backend-tdeconfig-trinity

debian/lenny/applications/compizconfig-backend-tdeconfig/debian/rules

diff --git a/debian/lenny/applications/compizconfig-backend-tdeconfig/debian/rules b/debian/lenny/applications/compizconfig-backend-tdeconfig/debian/rules
index 9ec3176..4a317e3 100755
--- a/debian/lenny/applications/compizconfig-backend-tdeconfig/debian/rules
+++ b/debian/lenny/applications/compizconfig-backend-tdeconfig/debian/rules
@@ -1,35 +1,20 @@
 #!/usr/bin/make -f
-  
+
 include /usr/share/cdbs/1/rules/debhelper.mk
-include debian/cdbs/kde.mk
+include /usr/share/cdbs/1/class/cmake.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
-DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
-DEB_CONFIGURE_PREFIX := /opt/trinity
-DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
-
-cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
-
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
+include debian/cdbs/debian-qt-kde.mk
 
 DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
                                && echo xz || echo bzip2)
 
-post-patches:: debian/stamp-bootstrap
-
-debian/stamp-bootstrap:
-ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" ""
-	cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-	
-	make -f admin/Makefile.common cvs
-	touch debian/stamp-bootstrap
-
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -DCONFIG_INSTALL_DIR="/etc/trinity" \
+ -DSYSCONF_INSTALL_DIR="/etc" \
+ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON"

debian/squeeze/applications/compizconfig-backend-tdeconfig/debian/cdbs/debian-qt-kde.mk

diff --git a/debian/squeeze/applications/compizconfig-backend-tdeconfig/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/compizconfig-backend-tdeconfig/debian/cdbs/debian-qt-kde.mk
index 9f8f977..60310a0 100644
--- a/debian/squeeze/applications/compizconfig-backend-tdeconfig/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/compizconfig-backend-tdeconfig/debian/cdbs/debian-qt-kde.mk
@@ -10,6 +10,7 @@
 # Note: This _must_ be included before autotools.mk, or it won't work.
 common-configure-arch common-configure-indep:: debian/stamp-cvs-make
 debian/stamp-cvs-make:
+ifndef _cdbs_class_cmake
 	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
 ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
 	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
@@ -18,6 +19,7 @@
 	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
 endif
 	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
+endif
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
@@ -102,6 +104,7 @@
 	done
 
 clean::
+ifndef _cdbs_class_cmake
 	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
 		cd $(DEB_SRCDIR); \
 		find . -name Makefile.in -print | \
@@ -110,6 +113,7 @@
 			configure configure.files configure.in stamp-h.in \
 			subdirs; \
 	fi
+endif
 	rm -f debian/stamp-cvs-make
 
 endif

debian/squeeze/applications/compizconfig-backend-tdeconfig/debian/cdbs/kde.mk

diff --git a/debian/squeeze/applications/compizconfig-backend-tdeconfig/debian/cdbs/kde.mk b/debian/squeeze/applications/compizconfig-backend-tdeconfig/debian/cdbs/kde.mk
index 1ac26c4..80176d6 100644
--- a/debian/squeeze/applications/compizconfig-backend-tdeconfig/debian/cdbs/kde.mk
+++ b/debian/squeeze/applications/compizconfig-backend-tdeconfig/debian/cdbs/kde.mk
@@ -35,7 +35,9 @@
 DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
 endif
 
+ifndef _cdbs_class_cmake
 include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
+endif
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
@@ -59,7 +61,7 @@
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/squeeze/applications/compizconfig-backend-tdeconfig/debian/control

diff --git a/debian/squeeze/applications/compizconfig-backend-tdeconfig/debian/control b/debian/squeeze/applications/compizconfig-backend-tdeconfig/debian/control
index c806b40..c2d6a31 100644
--- a/debian/squeeze/applications/compizconfig-backend-tdeconfig/debian/control
+++ b/debian/squeeze/applications/compizconfig-backend-tdeconfig/debian/control
@@ -2,7 +2,7 @@
 Section: libs
 Priority: extra
 Maintainer: Timothy Pearosn <kb9vqf@...>
-Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, compiz-trinity-dev, pkg-config, intltool, tdelibs14-trinity-dev, libcompizconfig0-trinity-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake, compiz-trinity-dev, pkg-config, intltool, tdelibs14-trinity-dev, libcompizconfig0-trinity-dev
 Standards-Version: 3.8.4
 
 Package: compizconfig-backend-tdeconfig-trinity

debian/squeeze/applications/compizconfig-backend-tdeconfig/debian/rules

diff --git a/debian/squeeze/applications/compizconfig-backend-tdeconfig/debian/rules b/debian/squeeze/applications/compizconfig-backend-tdeconfig/debian/rules
index 462e3d2..e5c16cf 100755
--- a/debian/squeeze/applications/compizconfig-backend-tdeconfig/debian/rules
+++ b/debian/squeeze/applications/compizconfig-backend-tdeconfig/debian/rules
@@ -1,35 +1,20 @@
 #!/usr/bin/make -f
-  
+
 include /usr/share/cdbs/1/rules/debhelper.mk
-include debian/cdbs/kde.mk
+include /usr/share/cdbs/1/class/cmake.mk
 #include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
-DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
-DEB_CONFIGURE_PREFIX := /opt/trinity
-DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
-
-cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
-
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
+include debian/cdbs/debian-qt-kde.mk
 
 DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
                                && echo xz || echo bzip2)
 
-post-patches:: debian/stamp-bootstrap
-
-debian/stamp-bootstrap:
-ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" ""
-	cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-	
-	make -f admin/Makefile.common cvs
-	touch debian/stamp-bootstrap
-
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -DCONFIG_INSTALL_DIR="/etc/trinity" \
+ -DSYSCONF_INSTALL_DIR="/etc" \
+ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON"
** Diff limit reached (max: 250 lines) **
d24bd898 2019-04-02 16:34:31 Slávek Banko
DEB kdbusnotification: Switch to cmake.
Switch to common TDE cdbs rules.

Signed-off-by: Slávek Banko <slavek.banko@...>
M debian/lenny/applications/kdbusnotification/debian/cdbs/debian-qt-kde.mk
M debian/lenny/applications/kdbusnotification/debian/cdbs/kde.mk
M debian/lenny/applications/kdbusnotification/debian/control
M debian/lenny/applications/kdbusnotification/debian/rules
M debian/squeeze/applications/kdbusnotification/debian/cdbs/debian-qt-kde.mk
M debian/squeeze/applications/kdbusnotification/debian/cdbs/kde.mk
M debian/squeeze/applications/kdbusnotification/debian/control
M debian/squeeze/applications/kdbusnotification/debian/rules
M ubuntu/maverick/applications/kdbusnotification/debian/cdbs/debian-qt-kde.mk
M ubuntu/maverick/applications/kdbusnotification/debian/cdbs/kde.mk
M ubuntu/maverick/applications/kdbusnotification/debian/control
M ubuntu/maverick/applications/kdbusnotification/debian/rules
R debian/lenny/applications/kdbusnotification/debian/links
R debian/squeeze/applications/kdbusnotification/debian/links
R ubuntu/maverick/applications/kdbusnotification/debian/links
** Diff limit reached (max: 250 lines) **

Branch: r14.0.x

5d8ed1fa 2019-04-02 16:35:14 Slávek Banko
DEB kdbusnotification: Switch to cmake.
Switch to common TDE cdbs rules.

Signed-off-by: Slávek Banko <slavek.banko@...>
(cherry picked from commit d24bd898174453b586ac90f2ef7a60165fa26fde)
M debian/lenny/applications/kdbusnotification/debian/cdbs/debian-qt-kde.mk
M debian/lenny/applications/kdbusnotification/debian/cdbs/kde.mk
M debian/lenny/applications/kdbusnotification/debian/control
M debian/lenny/applications/kdbusnotification/debian/rules
M debian/squeeze/applications/kdbusnotification/debian/cdbs/debian-qt-kde.mk
M debian/squeeze/applications/kdbusnotification/debian/cdbs/kde.mk
M debian/squeeze/applications/kdbusnotification/debian/control
M debian/squeeze/applications/kdbusnotification/debian/rules
M ubuntu/maverick/applications/kdbusnotification/debian/cdbs/debian-qt-kde.mk
M ubuntu/maverick/applications/kdbusnotification/debian/cdbs/kde.mk
M ubuntu/maverick/applications/kdbusnotification/debian/control
M ubuntu/maverick/applications/kdbusnotification/debian/rules
R debian/lenny/applications/kdbusnotification/debian/links
R debian/squeeze/applications/kdbusnotification/debian/links
R ubuntu/maverick/applications/kdbusnotification/debian/links
** Diff limit reached (max: 250 lines) **