From 41e9fcea1cb312d2be8aa9acc7eab1518d21a06e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Thu, 2 Jan 2014 15:50:34 +0100 Subject: Switch konversation to cmake on Debian and Ubuntu --- .../konversation/debian/cdbs/debian-qt-kde.mk | 6 +++++- .../applications/konversation/debian/cdbs/kde.mk | 4 +++- ubuntu/maverick/applications/konversation/debian/control | 2 +- .../konversation/debian/konversation-trinity.install | 2 +- ubuntu/maverick/applications/konversation/debian/rules | 16 +++++++++++++++- 5 files changed, 25 insertions(+), 5 deletions(-) (limited to 'ubuntu/maverick/applications') diff --git a/ubuntu/maverick/applications/konversation/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/konversation/debian/cdbs/debian-qt-kde.mk index c807eed8c..d81e0a12f 100644 --- a/ubuntu/maverick/applications/konversation/debian/cdbs/debian-qt-kde.mk +++ b/ubuntu/maverick/applications/konversation/debian/cdbs/debian-qt-kde.mk @@ -10,13 +10,15 @@ _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 cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh $(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 @@ -98,6 +100,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 | \ @@ -106,6 +109,7 @@ clean:: configure configure.files configure.in stamp-h.in \ subdirs; \ fi +endif rm -f debian/stamp-cvs-make endif diff --git a/ubuntu/maverick/applications/konversation/debian/cdbs/kde.mk b/ubuntu/maverick/applications/konversation/debian/cdbs/kde.mk index 765560c89..023886fc8 100644 --- a/ubuntu/maverick/applications/konversation/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/konversation/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/ubuntu/maverick/applications/konversation/debian/control b/ubuntu/maverick/applications/konversation/debian/control index 7675cfa87..39012ccc5 100644 --- a/ubuntu/maverick/applications/konversation/debian/control +++ b/ubuntu/maverick/applications/konversation/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Debian KDE Extras Team Uploaders: Modestas Vainius -Build-Depends: debhelper (>= 5.0), cdbs (>= 0.4.27-3), tdelibs14-trinity-dev, xsltproc, docbook-xsl, docbook-xml, libxi-dev, quilt (>= 0.40), automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>= 5.0), cdbs (>= 0.4.27-3), cmake, tdelibs14-trinity-dev, xsltproc, docbook-xsl, docbook-xml, libxi-dev, quilt (>= 0.40), automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 DM-Upload-Allowed: yes Homepage: http://konversation.kde.org/ diff --git a/ubuntu/maverick/applications/konversation/debian/konversation-trinity.install b/ubuntu/maverick/applications/konversation/debian/konversation-trinity.install index 6b5aef496..c62ad7db5 100644 --- a/ubuntu/maverick/applications/konversation/debian/konversation-trinity.install +++ b/ubuntu/maverick/applications/konversation/debian/konversation-trinity.install @@ -8,7 +8,7 @@ debian/tmp/opt/trinity/share/apps/konversation/themes/* debian/tmp/opt/trinity/share/config.kcfg/konversation.kcfg debian/tmp/opt/trinity/share/doc/tde/HTML/da/konversation/* debian/tmp/opt/trinity/share/doc/tde/HTML/en/konversation/* -debian/tmp/opt/trinity/share/doc/tde/HTML/es/konversation/* +#debian/tmp/opt/trinity/share/doc/tde/HTML/es/konversation/* debian/tmp/opt/trinity/share/doc/tde/HTML/et/konversation/* debian/tmp/opt/trinity/share/doc/tde/HTML/it/konversation/* debian/tmp/opt/trinity/share/doc/tde/HTML/pt/konversation/* diff --git a/ubuntu/maverick/applications/konversation/debian/rules b/ubuntu/maverick/applications/konversation/debian/rules index f754981ea..e9d9f87b4 100755 --- a/ubuntu/maverick/applications/konversation/debian/rules +++ b/ubuntu/maverick/applications/konversation/debian/rules @@ -1,10 +1,11 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/kde.mk #include /usr/share/cdbs/1/rules/patchsys-quilt.mk -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 @@ -15,12 +16,23 @@ DEB_DH_STRIP_ARGS := --dbg-package=konversation-trinity-dbg DEB_INSTALL_DOCS_ALL = DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -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_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: +ifndef _cdbs_class_cmake ! [ -f /usr/share/libtool/ltmain.sh ] || \ cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh ! [ -f /usr/share/libtool/config/ltmain.sh ] || \ @@ -28,6 +40,7 @@ debian/stamp-bootstrap: cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in make -f admin/Makefile.common cvs +endif touch debian/stamp-bootstrap ### Manpages @@ -40,6 +53,7 @@ DB2MAN = /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl GENERATED_MANPAGES := $(patsubst %.docbook,%,$(wildcard debian/man/*.docbook)) build/konversation-trinity:: $(GENERATED_MANPAGES) clean:: + rm -f debian/stamp-bootstrap -rm -f $(GENERATED_MANPAGES) -rm -f po/*/konversation.gmo -- cgit v1.2.3