From 6c9a00a16267e6e069715b5ca7d87f2f4c470c4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Mon, 14 Mar 2016 23:19:39 +0100 Subject: Switch tdegames to cmake on Debian and Ubuntu MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- debian/lenny/tdegames/debian/atlantik-trinity-dev.install | 4 ++-- debian/lenny/tdegames/debian/cdbs/debian-qt-kde.mk | 6 +++++- debian/lenny/tdegames/debian/cdbs/kde.mk | 4 +++- debian/lenny/tdegames/debian/control | 2 +- debian/lenny/tdegames/debian/kolf-trinity-dev.install | 2 +- .../lenny/tdegames/debian/libtdegames-trinity-dev.install | 4 ++-- debian/lenny/tdegames/debian/rules | 14 +++++++++++++- .../squeeze/tdegames/debian/atlantik-trinity-dev.install | 4 ++-- debian/squeeze/tdegames/debian/cdbs/debian-qt-kde.mk | 6 +++++- debian/squeeze/tdegames/debian/cdbs/kde.mk | 4 +++- debian/squeeze/tdegames/debian/control | 2 +- debian/squeeze/tdegames/debian/kolf-trinity-dev.install | 2 +- .../tdegames/debian/libtdegames-trinity-dev.install | 4 ++-- debian/squeeze/tdegames/debian/rules | 14 +++++++++++++- 14 files changed, 54 insertions(+), 18 deletions(-) (limited to 'debian') diff --git a/debian/lenny/tdegames/debian/atlantik-trinity-dev.install b/debian/lenny/tdegames/debian/atlantik-trinity-dev.install index b7dea632a..2dee85dd3 100644 --- a/debian/lenny/tdegames/debian/atlantik-trinity-dev.install +++ b/debian/lenny/tdegames/debian/atlantik-trinity-dev.install @@ -1,5 +1,5 @@ -/opt/trinity/include/tde/atlantik -/opt/trinity/include/tde/atlantic +/opt/trinity/include/atlantik +/opt/trinity/include/atlantic /opt/trinity/lib/libatlantic.so /opt/trinity/lib/libatlantikclient.so /opt/trinity/lib/libatlantikui.so diff --git a/debian/lenny/tdegames/debian/cdbs/debian-qt-kde.mk b/debian/lenny/tdegames/debian/cdbs/debian-qt-kde.mk index 61f3ab2dc..60ccb9eef 100644 --- a/debian/lenny/tdegames/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/tdegames/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,10 +19,11 @@ 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) -include debian/cdbs/uploaders.mk +#include debian/cdbs/uploaders.mk ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches @@ -103,6 +105,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 | \ @@ -111,6 +114,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/tdegames/debian/cdbs/kde.mk b/debian/lenny/tdegames/debian/cdbs/kde.mk index 765560c89..023886fc8 100644 --- a/debian/lenny/tdegames/debian/cdbs/kde.mk +++ b/debian/lenny/tdegames/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/tdegames/debian/control b/debian/lenny/tdegames/debian/control index 7e2f1ec72..68a0ae7fb 100644 --- a/debian/lenny/tdegames/debian/control +++ b/debian/lenny/tdegames/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Debian Qt/KDE Maintainers Uploaders: Ana Beatriz Guerrero Lopez , Christopher Martin , Daniel Schepler , Sune Vuorela -Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, autotools-dev, gawk, gettext, tdelibs14-trinity-dev, tdemultimedia-trinity-dev, libtool, groff-base, sharutils, bzip2, sharutils, libogg-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, cmake, autotools-dev, gawk, gettext, tdelibs14-trinity-dev, tdemultimedia-trinity-dev, libtool, groff-base, sharutils, bzip2, sharutils, libogg-dev, automake, autoconf, libtool, libltdl-dev Build-Depends-Indep: doxygen, graphviz, gsfonts-x11, libtqtinterface-doc, tdelibs14-trinity-doc Standards-Version: 3.8.4 diff --git a/debian/lenny/tdegames/debian/kolf-trinity-dev.install b/debian/lenny/tdegames/debian/kolf-trinity-dev.install index ff0a2b177..601759f5b 100644 --- a/debian/lenny/tdegames/debian/kolf-trinity-dev.install +++ b/debian/lenny/tdegames/debian/kolf-trinity-dev.install @@ -1,2 +1,2 @@ -/opt/trinity/include/tde/kolf +/opt/trinity/include/kolf /opt/trinity/lib/libkolf.so diff --git a/debian/lenny/tdegames/debian/libtdegames-trinity-dev.install b/debian/lenny/tdegames/debian/libtdegames-trinity-dev.install index eca00d487..9640a4bc8 100644 --- a/debian/lenny/tdegames/debian/libtdegames-trinity-dev.install +++ b/debian/lenny/tdegames/debian/libtdegames-trinity-dev.install @@ -1,4 +1,4 @@ -/opt/trinity/include/tde/*.h -/opt/trinity/include/tde/kgame +/opt/trinity/include/*.h +/opt/trinity/include/kgame /opt/trinity/lib/libtdegames.so /opt/trinity/lib/libtdegames.la diff --git a/debian/lenny/tdegames/debian/rules b/debian/lenny/tdegames/debian/rules index 7f682874f..211ac46fb 100755 --- a/debian/lenny/tdegames/debian/rules +++ b/debian/lenny/tdegames/debian/rules @@ -1,13 +1,14 @@ #! /usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/rules/utils.mk export kde_bindir = /opt/trinity/games -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde +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 @@ -18,6 +19,17 @@ DEB_KDE_APIDOX := yes DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -DBIN_INSTALL_DIR="/opt/trinity/games" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DBUILD_ALL="ON" + DEB_DH_INSTALL_SOURCEDIR := $(DEB_DESTDIR) DEB_INSTALL_DOCS_ALL := diff --git a/debian/squeeze/tdegames/debian/atlantik-trinity-dev.install b/debian/squeeze/tdegames/debian/atlantik-trinity-dev.install index b7dea632a..2dee85dd3 100644 --- a/debian/squeeze/tdegames/debian/atlantik-trinity-dev.install +++ b/debian/squeeze/tdegames/debian/atlantik-trinity-dev.install @@ -1,5 +1,5 @@ -/opt/trinity/include/tde/atlantik -/opt/trinity/include/tde/atlantic +/opt/trinity/include/atlantik +/opt/trinity/include/atlantic /opt/trinity/lib/libatlantic.so /opt/trinity/lib/libatlantikclient.so /opt/trinity/lib/libatlantikui.so diff --git a/debian/squeeze/tdegames/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/tdegames/debian/cdbs/debian-qt-kde.mk index 61f3ab2dc..60ccb9eef 100644 --- a/debian/squeeze/tdegames/debian/cdbs/debian-qt-kde.mk +++ b/debian/squeeze/tdegames/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,10 +19,11 @@ 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) -include debian/cdbs/uploaders.mk +#include debian/cdbs/uploaders.mk ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches @@ -103,6 +105,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 | \ @@ -111,6 +114,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/tdegames/debian/cdbs/kde.mk b/debian/squeeze/tdegames/debian/cdbs/kde.mk index 765560c89..023886fc8 100644 --- a/debian/squeeze/tdegames/debian/cdbs/kde.mk +++ b/debian/squeeze/tdegames/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/tdegames/debian/control b/debian/squeeze/tdegames/debian/control index 7e2f1ec72..68a0ae7fb 100644 --- a/debian/squeeze/tdegames/debian/control +++ b/debian/squeeze/tdegames/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Debian Qt/KDE Maintainers Uploaders: Ana Beatriz Guerrero Lopez , Christopher Martin , Daniel Schepler , Sune Vuorela -Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, autotools-dev, gawk, gettext, tdelibs14-trinity-dev, tdemultimedia-trinity-dev, libtool, groff-base, sharutils, bzip2, sharutils, libogg-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, cmake, autotools-dev, gawk, gettext, tdelibs14-trinity-dev, tdemultimedia-trinity-dev, libtool, groff-base, sharutils, bzip2, sharutils, libogg-dev, automake, autoconf, libtool, libltdl-dev Build-Depends-Indep: doxygen, graphviz, gsfonts-x11, libtqtinterface-doc, tdelibs14-trinity-doc Standards-Version: 3.8.4 diff --git a/debian/squeeze/tdegames/debian/kolf-trinity-dev.install b/debian/squeeze/tdegames/debian/kolf-trinity-dev.install index ff0a2b177..601759f5b 100644 --- a/debian/squeeze/tdegames/debian/kolf-trinity-dev.install +++ b/debian/squeeze/tdegames/debian/kolf-trinity-dev.install @@ -1,2 +1,2 @@ -/opt/trinity/include/tde/kolf +/opt/trinity/include/kolf /opt/trinity/lib/libkolf.so diff --git a/debian/squeeze/tdegames/debian/libtdegames-trinity-dev.install b/debian/squeeze/tdegames/debian/libtdegames-trinity-dev.install index eca00d487..9640a4bc8 100644 --- a/debian/squeeze/tdegames/debian/libtdegames-trinity-dev.install +++ b/debian/squeeze/tdegames/debian/libtdegames-trinity-dev.install @@ -1,4 +1,4 @@ -/opt/trinity/include/tde/*.h -/opt/trinity/include/tde/kgame +/opt/trinity/include/*.h +/opt/trinity/include/kgame /opt/trinity/lib/libtdegames.so /opt/trinity/lib/libtdegames.la diff --git a/debian/squeeze/tdegames/debian/rules b/debian/squeeze/tdegames/debian/rules index 995e94c46..c49a0c0c4 100755 --- a/debian/squeeze/tdegames/debian/rules +++ b/debian/squeeze/tdegames/debian/rules @@ -1,13 +1,14 @@ #! /usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-qt-kde.mk #include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/rules/utils.mk export kde_bindir = /opt/trinity/games -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde +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 @@ -18,6 +19,17 @@ DEB_KDE_APIDOX := yes DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -DBIN_INSTALL_DIR="/opt/trinity/games" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DBUILD_ALL="ON" + DEB_DH_INSTALL_SOURCEDIR := $(DEB_DESTDIR) DEB_INSTALL_DOCS_ALL := -- cgit v1.2.3