summaryrefslogtreecommitdiffstats
path: root/debian
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2019-04-02 18:29:58 +0200
committerSlávek Banko <slavek.banko@axis.cz>2019-04-02 18:30:35 +0200
commit8c48ec0b95ce4133f916372eeb90ea507a7fa888 (patch)
treed5eeeba11c30fe027daa47b4476a2085d2d2e005 /debian
parent884b6921b572aa96d6619de3db6f43aae4caa38e (diff)
downloadtde-packaging-8c48ec0b95ce4133f916372eeb90ea507a7fa888.tar.gz
tde-packaging-8c48ec0b95ce4133f916372eeb90ea507a7fa888.zip
DEB compizconfig-backend-tdeconfig: Switch to cmake.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz> (cherry picked from commit 07ad41b23fff30a21be87252d68dbb2f0585a8ab)
Diffstat (limited to 'debian')
-rw-r--r--debian/lenny/applications/compizconfig-backend-tdeconfig/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--debian/lenny/applications/compizconfig-backend-tdeconfig/debian/cdbs/kde.mk4
-rw-r--r--debian/lenny/applications/compizconfig-backend-tdeconfig/debian/control2
-rwxr-xr-xdebian/lenny/applications/compizconfig-backend-tdeconfig/debian/rules41
-rw-r--r--debian/squeeze/applications/compizconfig-backend-tdeconfig/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--debian/squeeze/applications/compizconfig-backend-tdeconfig/debian/cdbs/kde.mk4
-rw-r--r--debian/squeeze/applications/compizconfig-backend-tdeconfig/debian/control2
-rwxr-xr-xdebian/squeeze/applications/compizconfig-backend-tdeconfig/debian/rules41
8 files changed, 42 insertions, 60 deletions
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 9f8f97776..60310a01a 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 @@ _cdbs_class_debian-qt-kde := 1
# 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 @@ ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
endif
$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
+endif
touch debian/stamp-cvs-make
include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
@@ -102,6 +104,7 @@ binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
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 @@ clean::
configure configure.files configure.in stamp-h.in \
subdirs; \
fi
+endif
rm -f debian/stamp-cvs-make
endif
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 1ac26c4b7..80176d63e 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 @@ else
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 @@ endif
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/%:
diff --git a/debian/lenny/applications/compizconfig-backend-tdeconfig/debian/control b/debian/lenny/applications/compizconfig-backend-tdeconfig/debian/control
index c806b403d..c2d6a31d9 100644
--- a/debian/lenny/applications/compizconfig-backend-tdeconfig/debian/control
+++ b/debian/lenny/applications/compizconfig-backend-tdeconfig/debian/control
@@ -2,7 +2,7 @@ Source: compizconfig-backend-tdeconfig-trinity
Section: libs
Priority: extra
Maintainer: Timothy Pearosn <kb9vqf@pearsoncomputing.net>
-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
diff --git a/debian/lenny/applications/compizconfig-backend-tdeconfig/debian/rules b/debian/lenny/applications/compizconfig-backend-tdeconfig/debian/rules
index 9ec3176fb..4a317e325 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"
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 9f8f97776..60310a01a 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 @@ _cdbs_class_debian-qt-kde := 1
# 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 @@ ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
endif
$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
+endif
touch debian/stamp-cvs-make
include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
@@ -102,6 +104,7 @@ binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
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 @@ clean::
configure configure.files configure.in stamp-h.in \
subdirs; \
fi
+endif
rm -f debian/stamp-cvs-make
endif
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 1ac26c4b7..80176d63e 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 @@ else
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 @@ endif
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/%:
diff --git a/debian/squeeze/applications/compizconfig-backend-tdeconfig/debian/control b/debian/squeeze/applications/compizconfig-backend-tdeconfig/debian/control
index c806b403d..c2d6a31d9 100644
--- a/debian/squeeze/applications/compizconfig-backend-tdeconfig/debian/control
+++ b/debian/squeeze/applications/compizconfig-backend-tdeconfig/debian/control
@@ -2,7 +2,7 @@ Source: compizconfig-backend-tdeconfig-trinity
Section: libs
Priority: extra
Maintainer: Timothy Pearosn <kb9vqf@pearsoncomputing.net>
-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
diff --git a/debian/squeeze/applications/compizconfig-backend-tdeconfig/debian/rules b/debian/squeeze/applications/compizconfig-backend-tdeconfig/debian/rules
index 462e3d2a5..e5c16cf8a 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"