From 8ab98a265515d9c509f13a69f6432641867d4526 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sat, 30 Apr 2016 17:24:04 +0200 Subject: Use common build rules for kbfx 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 --- .../applications/kbfx/debian/cdbs/debian-qt-kde.mk | 120 +++++++++++++++++++++ .../maverick/applications/kbfx/debian/cdbs/kde.mk | 99 +++++++++++++++++ .../applications/kbfx/debian/cdbs/versions.pl | 19 ++++ ubuntu/maverick/applications/kbfx/debian/cmake.mk | 76 ------------- .../applications/kbfx/debian/kbfx-trinity.lintian | 5 + .../kbfx/debian/kbfx.lintian-overrides | 5 - ubuntu/maverick/applications/kbfx/debian/rules | 69 +----------- 7 files changed, 245 insertions(+), 148 deletions(-) create mode 100644 ubuntu/maverick/applications/kbfx/debian/cdbs/debian-qt-kde.mk create mode 100644 ubuntu/maverick/applications/kbfx/debian/cdbs/kde.mk create mode 100644 ubuntu/maverick/applications/kbfx/debian/cdbs/versions.pl delete mode 100644 ubuntu/maverick/applications/kbfx/debian/cmake.mk create mode 100644 ubuntu/maverick/applications/kbfx/debian/kbfx-trinity.lintian delete mode 100644 ubuntu/maverick/applications/kbfx/debian/kbfx.lintian-overrides (limited to 'ubuntu') diff --git a/ubuntu/maverick/applications/kbfx/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kbfx/debian/cdbs/debian-qt-kde.mk new file mode 100644 index 000000000..32ba4acfb --- /dev/null +++ b/ubuntu/maverick/applications/kbfx/debian/cdbs/debian-qt-kde.mk @@ -0,0 +1,120 @@ +ifndef _cdbs_bootstrap +_cdbs_scripts_path ?= /usr/lib/cdbs +_cdbs_rules_path ?= /usr/share/cdbs/1/rules +_cdbs_class_path ?= /usr/share/cdbs/1/class +endif + +ifndef _cdbs_class_debian-qt-kde +_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) +#include debian/cdbs/uploaders.mk + +ifndef _cdbs_rules_patchsys_quilt +DEB_PATCHDIRS := debian/patches/common debian/patches +endif + +DEB_KDE_ENABLE_FINAL := yes +DEB_INSTALL_DOCS_ALL := + +DEB_DH_MAKESHLIBS_ARGS_ALL := -V +DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib) + +ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb + ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) + cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,) + else + cdbs_kde_enable_final = + endif +endif + +common-build-arch:: debian/stamp-man-pages +debian/stamp-man-pages: + if ! test -d debian/man/out; then mkdir -p debian/man/out; fi + for f in $$(find debian/man -name '*.sgml'); do \ + docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \ + done + for f in $$(find debian/man -name '*.man'); do \ + soelim -I debian/man $$f \ + > debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \ + done + touch debian/stamp-man-pages + +common-binary-indep:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_INDEP_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + +common-binary-arch:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_ARCH_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + +clean:: + rm -rf debian/man/out + -rmdir debian/man + rm -f debian/stamp-man-pages + rm -rf debian/shlibs-check + +$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: + if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi + if test -e debian/$(cdbs_curpkg).lintian; then \ + install -p -D -m644 debian/$(cdbs_curpkg).lintian \ + debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \ + fi + if test -e debian/$(cdbs_curpkg).presubj; then \ + install -p -D -m644 debian/$(cdbs_curpkg).presubj \ + debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ + fi + +binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: + set -e; \ + for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \ + pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \ + echo Building $$pkg HTML docs...; \ + mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + /opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \ + done + for pkg in $(DOC_HTML_PRUNE) ; do \ + rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + 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 diff --git a/ubuntu/maverick/applications/kbfx/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kbfx/debian/cdbs/kde.mk new file mode 100644 index 000000000..023886fc8 --- /dev/null +++ b/ubuntu/maverick/applications/kbfx/debian/cdbs/kde.mk @@ -0,0 +1,99 @@ +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2003 Christopher L Cheney +# Description: A class for KDE packages; sets KDE environment variables, etc +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2, or (at +# your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +# 02111-1307 USA. + +_cdbs_scripts_path ?= /usr/lib/cdbs +_cdbs_rules_path ?= /usr/share/cdbs/1/rules +_cdbs_class_path ?= /usr/share/cdbs/1/class + +ifndef _cdbs_class_kde +_cdbs_class_kde := 1 + +# for dh_icons +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4) + +include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix) + +ifdef _cdbs_tarball_dir +DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE) +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 +export kde_htmldir = \$${datadir}/doc/tde/HTML + +ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,) +endif + +ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_final = + cdbs_kde_enable_debug = --enable-debug=yes +else + cdbs_kde_enable_debug = --disable-debug +endif + +ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_debug = --enable-debug=full +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_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el + +$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: + if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi + +cleanbuilddir:: + -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR)) + +common-build-arch common-build-indep:: debian/stamp-kde-apidox +debian/stamp-kde-apidox: + $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) + touch $@ + +common-install-prehook-impl:: + mkdir -p po + -XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages + -for file in po/*pot; do \ + sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \ + done + +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)) + +clean:: + rm -f debian/stamp-kde-apidox + rm -rf po/*.pot + +# This is a convenience target for calling manually. It's not part of +# the build process. +buildprep: clean apply-patches + $(MAKE) -f admin/Makefile.common dist + debian/rules clean + +endif diff --git a/ubuntu/maverick/applications/kbfx/debian/cdbs/versions.pl b/ubuntu/maverick/applications/kbfx/debian/cdbs/versions.pl new file mode 100644 index 000000000..1b110f7af --- /dev/null +++ b/ubuntu/maverick/applications/kbfx/debian/cdbs/versions.pl @@ -0,0 +1,19 @@ +#!/usr/bin/env perl + +use strict; +use warnings; + +my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`; +my ($version3, $version3_next); +my ($version2, $version2_next); + +($version3 = $version) =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/; +($version2 = $version3) =~ s/\.[^.]+$//; + +($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e; +($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e; + +print "TDE-Version3=$version3\n"; +print "TDE-Version2=$version2\n"; +print "TDE-Next-Version3=$version3_next\n"; +print "TDE-Next-Version2=$version2_next\n"; diff --git a/ubuntu/maverick/applications/kbfx/debian/cmake.mk b/ubuntu/maverick/applications/kbfx/debian/cmake.mk deleted file mode 100644 index 4c7e2e24c..000000000 --- a/ubuntu/maverick/applications/kbfx/debian/cmake.mk +++ /dev/null @@ -1,76 +0,0 @@ -# -*- mode: makefile; coding: utf-8 -*- -# Copyright (C) 2006 Peter Rockai -# Copyright (C) 2006 Fathi Boudra -# Description: A class for cmake packages -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2, or (at -# your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -# 02111-1307 USA. - -ifndef _cdbs_bootstrap -_cdbs_scripts_path ?= /usr/lib/cdbs -_cdbs_rules_path ?= /usr/share/cdbs/1/rules -_cdbs_class_path ?= /usr/share/cdbs/1/class -endif - -ifndef _cdbs_class_cmake -_cdbs_class_cmake := 1 - -include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix) - -ifdef _cdbs_tarball_dir -DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE) -else -DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) -endif - -DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(DEB_DESTDIR) -DEB_CMAKE_PREFIX =/usr - -# Overriden from makefile-vars.mk -# We pass CFLAGS and friends to ./configure, so no need to pass them to make -DEB_MAKE_INVOKE = $(DEB_MAKE_ENVVARS) $(MAKE) -C $(DEB_BUILDDIR) - -include $(_cdbs_class_path)/makefile.mk$(_cdbs_makefile_suffix) - -ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) -# well, -O0 -endif - -ifneq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) -# semi-debug -else -# final -endif - -ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) -# debug -endif - -#DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el - -common-configure-arch common-configure-indep:: common-configure-impl -common-configure-impl:: $(DEB_BUILDDIR)/CMakeCache.txt -$(DEB_BUILDDIR)/CMakeCache.txt: - cd $(DEB_BUILDDIR) && cmake $(CURDIR)/$(DEB_SRCDIR) \ - -DCMAKE_INSTALL_PREFIX="$(DEB_CMAKE_PREFIX)" \ - $(DEB_CMAKE_EXTRA_FLAGS) -DCMAKE_CXX_FLAGS="$(CXXFLAGS)" \ - -DCMAKE_C_FLAGS="$(CFLAGS)" -DCMAKE_VERBOSE_MAKEFILE=ON - mkdir -p $(DEB_DESTDIR) - -cleanbuilddir:: - -if test "$(DEB_BUILDDIR)" != "$(DEB_SRCDIR)"; then rm -rf $(DEB_BUILDDIR); fi - -endif - diff --git a/ubuntu/maverick/applications/kbfx/debian/kbfx-trinity.lintian b/ubuntu/maverick/applications/kbfx/debian/kbfx-trinity.lintian new file mode 100644 index 000000000..35c40e0a1 --- /dev/null +++ b/ubuntu/maverick/applications/kbfx/debian/kbfx-trinity.lintian @@ -0,0 +1,5 @@ +# It isn't a library or a development package +# and no other packages uses libkbfxcommon and libkbfxdata +kbfx-trinity: no-shlibs-control-file opt/trinity/lib/libkbfxdata.so +kbfx-trinity: no-shlibs-control-file opt/trinity/lib/libkbfxcommon.so +kbfx-trinity: package-name-doesnt-match-sonames libkbfxcommon libkbfxdata diff --git a/ubuntu/maverick/applications/kbfx/debian/kbfx.lintian-overrides b/ubuntu/maverick/applications/kbfx/debian/kbfx.lintian-overrides deleted file mode 100644 index a2ecfe7dc..000000000 --- a/ubuntu/maverick/applications/kbfx/debian/kbfx.lintian-overrides +++ /dev/null @@ -1,5 +0,0 @@ -# It isn't a library or a development package -# and no other packages uses libkbfxcommon and libkbfxdata -kbfx: no-shlibs-control-file usr/lib/libkbfxdata.so -kbfx: no-shlibs-control-file usr/lib/libkbfxcommon.so -kbfx: package-name-doesnt-match-sonames libkbfxcommon libkbfxdata diff --git a/ubuntu/maverick/applications/kbfx/debian/rules b/ubuntu/maverick/applications/kbfx/debian/rules index 5476c4c7f..e30cf9445 100755 --- a/ubuntu/maverick/applications/kbfx/debian/rules +++ b/ubuntu/maverick/applications/kbfx/debian/rules @@ -1,26 +1,15 @@ #!/usr/bin/make -f -FILENAME = $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz -UPFILENAME = $(DEB_SOURCE_PACKAGE)-$(shell echo $(DEB_UPSTREAM_VERSION) | sed 's/~/-/').tar.bz2 -URL = http://www.$(DEB_SOURCE_PACKAGE).org/release/0.4.9/testing/$(UPFILENAME) - -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib - -#CMAKE_LIBRARY_PATH := /opt/trinity/lib -#CMAKE_INCLUDE_PATH := /opt/trinity/include/tde - -include debian/cmake.mk include /usr/share/cdbs/1/rules/debhelper.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 -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 -cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) - DEB_CMAKE_EXTRA_FLAGS =\ -DLIB_SUFFIX="" \ -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" \ @@ -31,57 +20,3 @@ DEB_CMAKE_EXTRA_FLAGS =\ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) - -get-orig-source: - @@dh_testdir - @@[ -d ../tarballs/. ] - @@echo Downloading $(UPFILENAME) from $(URL) ... - @@wget -N -nv -T10 -t3 -O ../tarballs/$(UPFILENAME) $(URL) - @@echo Converting $(UPFILENAME) to $(FILENAME) - @@bzcat ../tarballs/$(UPFILENAME) | gzip -9 > ../tarballs/$(FILENAME) - -print-version: - @@echo DEB_SOURCE_PACKAGE: $(DEB_SOURCE_PACKAGE) - @@echo DEB_VERSION: $(DEB_VERSION) - @@echo DEB_NO_EPOCH_VERSION: $(DEB_NOEPOCH_VERSION) - @@echo DEB_UPSTREAM_VERSION: $(DEB_UPSTREAM_VERSION) - @@echo FILENAME: $(FILENAME) - @@echo URL: $(URL) - -# Build architecture-independent files here. -binary-indep: build -# We have nothing to do by default. - -# Build architecture-dependent files here. -binary-arch: build - mkdir -p debian/kbfx-trinity/opt/trinity/lib64/ - touch debian/kbfx-trinity/opt/trinity/lib64/BLANTDEFILE - mkdir -p debian/kbfx-trinity/opt/trinity/lib/ - cp -Rp debian/kbfx-trinity/opt/trinity/lib64/* debian/kbfx-trinity/opt/trinity/lib/ - rm -rf debian/kbfx-trinity/opt/trinity/lib64/ - rm -f debian/kbfx-trinity/opt/trinity/lib/BLANTDEFILE - dh_testdir - dh_testroot - dh_installexamples - dh_installdirs - dh_installdocs - dh_installmenu - dh_installmime - dh_installcron - dh_installman - dh_desktop - dh_installinfo - dh_installchangelogs - dh_install - dh_link - dh_strip - dh_compress - dh_fixperms - dh_makeshlibs - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb $(DEB_DH_BUILDDEB_ARGS) - -binary: binary-indep binary-arch -- cgit v1.2.3