From 7172f47cba4087d73fcb204bfd23358fbb1b2f5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Mon, 24 Dec 2018 15:10:26 +0100 Subject: DEB gwenview-i18n: Switch to cmake. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- .../gwenview-i18n/debian/cdbs/debian-qt-kde.mk | 32 ++++++---- .../applications/gwenview-i18n/debian/cdbs/kde.mk | 10 ++-- .../applications/gwenview-i18n/debian/control | 2 +- .../applications/gwenview-i18n/debian/debiandirs | 10 ---- .../lenny/applications/gwenview-i18n/debian/rules | 69 ++++------------------ .../gwenview-i18n/debian/cdbs/debian-qt-kde.mk | 32 ++++++---- .../applications/gwenview-i18n/debian/cdbs/kde.mk | 10 ++-- .../applications/gwenview-i18n/debian/control | 2 +- .../applications/gwenview-i18n/debian/debiandirs | 10 ---- .../applications/gwenview-i18n/debian/rules | 69 ++++------------------ 10 files changed, 80 insertions(+), 166 deletions(-) delete mode 100644 debian/lenny/applications/gwenview-i18n/debian/debiandirs delete mode 100644 debian/squeeze/applications/gwenview-i18n/debian/debiandirs (limited to 'debian') diff --git a/debian/lenny/applications/gwenview-i18n/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/gwenview-i18n/debian/cdbs/debian-qt-kde.mk index 3bd77b8f7..60310a01a 100644 --- a/debian/lenny/applications/gwenview-i18n/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/applications/gwenview-i18n/debian/cdbs/debian-qt-kde.mk @@ -10,6 +10,16 @@ _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 +endif +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) @@ -94,18 +104,16 @@ 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 | \ + xargs --no-run-if-empty rm -f; \ + rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \ + configure configure.files configure.in stamp-h.in \ + subdirs; \ + fi +endif rm -f debian/stamp-cvs-make endif - -common-build-indep:: debian/stamp-kde-apidox -debian/stamp-kde-apidox: - $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) - touch $@ - -common-install-indep:: common-install-kde-apidox -common-install-kde-apidox:: - $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR)) - -clean:: - rm -f debian/stamp-kde-apidox diff --git a/debian/lenny/applications/gwenview-i18n/debian/cdbs/kde.mk b/debian/lenny/applications/gwenview-i18n/debian/cdbs/kde.mk index f5d237249..80176d63e 100644 --- a/debian/lenny/applications/gwenview-i18n/debian/cdbs/kde.mk +++ b/debian/lenny/applications/gwenview-i18n/debian/cdbs/kde.mk @@ -35,7 +35,9 @@ else DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) endif -# include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) +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/" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: @@ -70,12 +72,12 @@ cleanbuilddir:: common-build-arch common-build-indep:: debian/stamp-kde-apidox debian/stamp-kde-apidox: -# $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) + $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) touch $@ common-install-arch common-install-indep:: common-install-kde-apidox common-install-kde-apidox:: -# $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR)) + $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR)) clean:: rm -f debian/stamp-kde-apidox diff --git a/debian/lenny/applications/gwenview-i18n/debian/control b/debian/lenny/applications/gwenview-i18n/debian/control index 0a895fdd8..9510f2c61 100644 --- a/debian/lenny/applications/gwenview-i18n/debian/control +++ b/debian/lenny/applications/gwenview-i18n/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: Timothy Pearson Build-Depends-Indep: tdelibs14-trinity-dev -Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 7.0.50~), quilt, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 7.0.50~), quilt, cmake Standards-Version: 3.8.0 Homepage: http://gwenview.sourceforge.net diff --git a/debian/lenny/applications/gwenview-i18n/debian/debiandirs b/debian/lenny/applications/gwenview-i18n/debian/debiandirs deleted file mode 100644 index 90247b9a0..000000000 --- a/debian/lenny/applications/gwenview-i18n/debian/debiandirs +++ /dev/null @@ -1,10 +0,0 @@ -export kde_prefix=/opt/trinity -export sysconfdir=/etc -export kde_includedir=/opt/trinity/include/tde -export infodir=/opt/trinity/share/info -export mandir=/opt/trinity/share/man -export qtdir=/opt/trinity/share/qt3 -export kde_cgidir=/opt/trinity/lib/cgi-bin -export kde_confdir=/etc/trinity -export kde_htmldir=/opt/trinity/share/doc/tde/HTML -configkde=--disable-debug --disable-rpath --prefix=$(kde_prefix) --sysconfdir=$(sysconfdir) --includedir=$(kde_includedir) --infodir=$(infodir) --mandir=$(mandir) --with-qt-dir=$(qtdir) diff --git a/debian/lenny/applications/gwenview-i18n/debian/rules b/debian/lenny/applications/gwenview-i18n/debian/rules index 325dadb2d..d8d772064 100755 --- a/debian/lenny/applications/gwenview-i18n/debian/rules +++ b/debian/lenny/applications/gwenview-i18n/debian/rules @@ -1,63 +1,20 @@ -#! /usr/bin/make -f - -DEB_PATCHDIRS := debian/patches/common debian/patches +#!/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 -include /usr/share/cdbs/1/rules/utils.mk - --include debian/debiandirs - -ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) - DEB_PARALLEL_JOBS ?= $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) -endif -DEB_MAKE_PARALLEL ?= $(and $(DEB_BUILD_PARALLEL),$(DEB_PARALLEL_JOBS),-j$(DEB_PARALLEL_JOBS)) +include debian/cdbs/debian-qt-kde.mk DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) -DEB_INSTALL_DOCS_ALL := - -DOC_LANGS = da de et fr it nl pl pt ru sv pt_BR - -post-patches:: debian/stamp-bootstrap - -debian/stamp-bootstrap: - dh_testdir - - # Regenerate build system -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 - - autoreconf && automake -f && \ - $(MAKE) -f admin/Makefile.common && \ - ./configure $(configkde) - touch debian/stamp-bootstrap - -build: debian/build-stamp - -debian/build-stamp: - dh_testdir - $(MAKE) $(DEB_MAKE_PARALLEL) - touch debian/build-stamp - -install/gwenview-i18n-trinity:: - dh_testdir - dh_testroot - dh_clean -k - - $(MAKE) install DESTDIR=$(CURDIR)/debian/gwenview-i18n-trinity $(DEB_MAKE_PARALLEL) - - for LANG in $(DOC_LANGS); do \ - cd $(CURDIR)/debian/gwenview-i18n-trinity/$(kde_htmldir)/$$LANG/gwenview; \ - $(kde_prefix)/bin/meinproc $(DEB_DESTDIR)$(kde_htmldir)/$$LANG/gwenview/index.docbook; \ - done +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" \ + -DWITH_ALL_OPTIONS="ON" diff --git a/debian/squeeze/applications/gwenview-i18n/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/gwenview-i18n/debian/cdbs/debian-qt-kde.mk index 3bd77b8f7..60310a01a 100644 --- a/debian/squeeze/applications/gwenview-i18n/debian/cdbs/debian-qt-kde.mk +++ b/debian/squeeze/applications/gwenview-i18n/debian/cdbs/debian-qt-kde.mk @@ -10,6 +10,16 @@ _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 +endif +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) @@ -94,18 +104,16 @@ 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 | \ + xargs --no-run-if-empty rm -f; \ + rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \ + configure configure.files configure.in stamp-h.in \ + subdirs; \ + fi +endif rm -f debian/stamp-cvs-make endif - -common-build-indep:: debian/stamp-kde-apidox -debian/stamp-kde-apidox: - $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) - touch $@ - -common-install-indep:: common-install-kde-apidox -common-install-kde-apidox:: - $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR)) - -clean:: - rm -f debian/stamp-kde-apidox diff --git a/debian/squeeze/applications/gwenview-i18n/debian/cdbs/kde.mk b/debian/squeeze/applications/gwenview-i18n/debian/cdbs/kde.mk index f5d237249..80176d63e 100644 --- a/debian/squeeze/applications/gwenview-i18n/debian/cdbs/kde.mk +++ b/debian/squeeze/applications/gwenview-i18n/debian/cdbs/kde.mk @@ -35,7 +35,9 @@ else DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) endif -# include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) +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/" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: @@ -70,12 +72,12 @@ cleanbuilddir:: common-build-arch common-build-indep:: debian/stamp-kde-apidox debian/stamp-kde-apidox: -# $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) + $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) touch $@ common-install-arch common-install-indep:: common-install-kde-apidox common-install-kde-apidox:: -# $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR)) + $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR)) clean:: rm -f debian/stamp-kde-apidox diff --git a/debian/squeeze/applications/gwenview-i18n/debian/control b/debian/squeeze/applications/gwenview-i18n/debian/control index 0a895fdd8..9510f2c61 100644 --- a/debian/squeeze/applications/gwenview-i18n/debian/control +++ b/debian/squeeze/applications/gwenview-i18n/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: Timothy Pearson Build-Depends-Indep: tdelibs14-trinity-dev -Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 7.0.50~), quilt, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 7.0.50~), quilt, cmake Standards-Version: 3.8.0 Homepage: http://gwenview.sourceforge.net diff --git a/debian/squeeze/applications/gwenview-i18n/debian/debiandirs b/debian/squeeze/applications/gwenview-i18n/debian/debiandirs deleted file mode 100644 index 90247b9a0..000000000 --- a/debian/squeeze/applications/gwenview-i18n/debian/debiandirs +++ /dev/null @@ -1,10 +0,0 @@ -export kde_prefix=/opt/trinity -export sysconfdir=/etc -export kde_includedir=/opt/trinity/include/tde -export infodir=/opt/trinity/share/info -export mandir=/opt/trinity/share/man -export qtdir=/opt/trinity/share/qt3 -export kde_cgidir=/opt/trinity/lib/cgi-bin -export kde_confdir=/etc/trinity -export kde_htmldir=/opt/trinity/share/doc/tde/HTML -configkde=--disable-debug --disable-rpath --prefix=$(kde_prefix) --sysconfdir=$(sysconfdir) --includedir=$(kde_includedir) --infodir=$(infodir) --mandir=$(mandir) --with-qt-dir=$(qtdir) diff --git a/debian/squeeze/applications/gwenview-i18n/debian/rules b/debian/squeeze/applications/gwenview-i18n/debian/rules index 069018570..18b1c07e2 100755 --- a/debian/squeeze/applications/gwenview-i18n/debian/rules +++ b/debian/squeeze/applications/gwenview-i18n/debian/rules @@ -1,63 +1,20 @@ -#! /usr/bin/make -f - -DEB_PATCHDIRS := debian/patches/common debian/patches +#!/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 -include /usr/share/cdbs/1/rules/utils.mk - --include debian/debiandirs - -ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) - DEB_PARALLEL_JOBS ?= $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) -endif -DEB_MAKE_PARALLEL ?= $(and $(DEB_BUILD_PARALLEL),$(DEB_PARALLEL_JOBS),-j$(DEB_PARALLEL_JOBS)) +include debian/cdbs/debian-qt-kde.mk DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) -DEB_INSTALL_DOCS_ALL := - -DOC_LANGS = da de et fr it nl pl pt ru sv pt_BR - -post-patches:: debian/stamp-bootstrap - -debian/stamp-bootstrap: - dh_testdir - - # Regenerate build system -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 - - autoreconf && automake -f && \ - $(MAKE) -f admin/Makefile.common && \ - ./configure $(configkde) - touch debian/stamp-bootstrap - -build: debian/build-stamp - -debian/build-stamp: - dh_testdir - $(MAKE) $(DEB_MAKE_PARALLEL) - touch debian/build-stamp - -install/gwenview-i18n-trinity:: - dh_testdir - dh_testroot - dh_clean -k - - $(MAKE) install DESTDIR=$(CURDIR)/debian/gwenview-i18n-trinity $(DEB_MAKE_PARALLEL) - - for LANG in $(DOC_LANGS); do \ - cd $(CURDIR)/debian/gwenview-i18n-trinity/$(kde_htmldir)/$$LANG/gwenview; \ - $(kde_prefix)/bin/meinproc $(DEB_DESTDIR)$(kde_htmldir)/$$LANG/gwenview/index.docbook; \ - done +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" \ + -DWITH_ALL_OPTIONS="ON" -- cgit v1.2.3