From 9fa29fa176a3b1ec1cdcfbc1d6e2f0d4ad5b033c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sun, 12 May 2019 17:41:19 +0200 Subject: DEB kchmviewer: Switch to cmake. Switch to common TDE cdbs rules. The man page has been moved to the main tree. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- .../kchmviewer/debian/additions/kchmviewer.1 | 34 ---- .../kchmviewer/debian/cdbs/debian-tde.mk | 201 +++++++++++++++++++++ .../kchmviewer/debian/cdbs/versions.pl | 19 ++ .../_base/applications/kchmviewer/debian/control | 2 +- .../applications/kchmviewer/debian/debiandirs | 9 - .../debian/kchmviewer-nokde-trinity.manpages | 1 - .../_base/applications/kchmviewer/debian/manpages | 1 - ubuntu/_base/applications/kchmviewer/debian/rules | 128 ++----------- ubuntu/_base/applications/kchmviewer/debian/watch | 2 - 9 files changed, 234 insertions(+), 163 deletions(-) delete mode 100644 ubuntu/_base/applications/kchmviewer/debian/additions/kchmviewer.1 create mode 100644 ubuntu/_base/applications/kchmviewer/debian/cdbs/debian-tde.mk create mode 100644 ubuntu/_base/applications/kchmviewer/debian/cdbs/versions.pl delete mode 100644 ubuntu/_base/applications/kchmviewer/debian/debiandirs delete mode 100644 ubuntu/_base/applications/kchmviewer/debian/kchmviewer-nokde-trinity.manpages delete mode 100644 ubuntu/_base/applications/kchmviewer/debian/manpages delete mode 100644 ubuntu/_base/applications/kchmviewer/debian/watch (limited to 'ubuntu') diff --git a/ubuntu/_base/applications/kchmviewer/debian/additions/kchmviewer.1 b/ubuntu/_base/applications/kchmviewer/debian/additions/kchmviewer.1 deleted file mode 100644 index 5994f536f..000000000 --- a/ubuntu/_base/applications/kchmviewer/debian/additions/kchmviewer.1 +++ /dev/null @@ -1,34 +0,0 @@ -.\" Author: Jose Luis Tallon -.\" -.\" This is free software; you may 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 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 the Debian GNU/Linux system; if not, write to the Free -.\" Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -.\" 02111-1307 USA -.TH kchmviwer "1" "December 2005" -.SH NAME -kchmviewer \- Windows CHM viewer for TDE -.SH SYNOPSIS -kchmviewer -.SH DESCRIPTION -.B kchmviewer -makes it possible to browse native Windows CHM files under TDE. -.PP -Complete documentation can be found in docbook format in -/usr/share/doc/tde/HTML//kchmviewer/ on this system. -.SH AUTHOR - George Yunaev -.PP -This manual page was written by Jose Luis Tallon -.nh - -for the \fBDebian\fP system (but may be used by others). diff --git a/ubuntu/_base/applications/kchmviewer/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kchmviewer/debian/cdbs/debian-tde.mk new file mode 100644 index 000000000..fb8c1b6c3 --- /dev/null +++ b/ubuntu/_base/applications/kchmviewer/debian/cdbs/debian-tde.mk @@ -0,0 +1,201 @@ +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2003 Christopher L Cheney +# Copyright © 2019 TDE Team +# Description: A class for TDE packages; sets TDE 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. + +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 + +# for dh_icons +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4) + +# 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 $(_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 + +ifndef _cdbs_rules_patchsys_quilt +DEB_PATCHDIRS := debian/patches/common debian/patches +endif + +export kde_cgidir = \$${libdir}/cgi-bin +export kde_confdir = \$${sysconfdir}/trinity +export kde_htmldir = \$${datadir}/doc/tde/HTML + +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) + +DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" +DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el + +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 + +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) + + +# This is a convenience target for calling manually. +# It's not part of the build process. +buildprep: clean apply-patches +ifndef _cdbs_class_cmake + $(MAKE) -f admin/Makefile.common dist +endif + debian/rules clean + +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_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi + 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 + +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)) + +cleanbuilddir:: + -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR)) + +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-kde-apidox + rm -f debian/stamp-cvs-make + +endif diff --git a/ubuntu/_base/applications/kchmviewer/debian/cdbs/versions.pl b/ubuntu/_base/applications/kchmviewer/debian/cdbs/versions.pl new file mode 100644 index 000000000..1b110f7af --- /dev/null +++ b/ubuntu/_base/applications/kchmviewer/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/_base/applications/kchmviewer/debian/control b/ubuntu/_base/applications/kchmviewer/debian/control index 59b2717d8..314336c3e 100644 --- a/ubuntu/_base/applications/kchmviewer/debian/control +++ b/ubuntu/_base/applications/kchmviewer/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Jose Luis Tallon -Build-Depends: debhelper (>= 7.0.50~), cdbs, quilt, tdelibs14-trinity-dev, libchm-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>= 7.0.50~), cdbs, quilt, cmake, tdelibs14-trinity-dev, libchm-dev Standards-Version: 3.8.4 Homepage: http://www.kchmviewer.net/ diff --git a/ubuntu/_base/applications/kchmviewer/debian/debiandirs b/ubuntu/_base/applications/kchmviewer/debian/debiandirs deleted file mode 100644 index a190453fb..000000000 --- a/ubuntu/_base/applications/kchmviewer/debian/debiandirs +++ /dev/null @@ -1,9 +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=/usr/share/qt3 -export kde_cgidir=/opt/trinity/lib/cgi-bin -export kde_confdir=/etc/trinity -export kde_htmldir=/opt/trinity/share/doc/tde/HTML diff --git a/ubuntu/_base/applications/kchmviewer/debian/kchmviewer-nokde-trinity.manpages b/ubuntu/_base/applications/kchmviewer/debian/kchmviewer-nokde-trinity.manpages deleted file mode 100644 index eb0e0bf59..000000000 --- a/ubuntu/_base/applications/kchmviewer/debian/kchmviewer-nokde-trinity.manpages +++ /dev/null @@ -1 +0,0 @@ -debian/additions/kchmviewer.1 diff --git a/ubuntu/_base/applications/kchmviewer/debian/manpages b/ubuntu/_base/applications/kchmviewer/debian/manpages deleted file mode 100644 index eb0e0bf59..000000000 --- a/ubuntu/_base/applications/kchmviewer/debian/manpages +++ /dev/null @@ -1 +0,0 @@ -debian/additions/kchmviewer.1 diff --git a/ubuntu/_base/applications/kchmviewer/debian/rules b/ubuntu/_base/applications/kchmviewer/debian/rules index 4766ace5a..cee2a3058 100755 --- a/ubuntu/_base/applications/kchmviewer/debian/rules +++ b/ubuntu/_base/applications/kchmviewer/debian/rules @@ -1,121 +1,19 @@ #!/usr/bin/make -f -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - --include debian/debiandirs - -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) +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/cmake.mk +include debian/cdbs/debian-tde.mk DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) -# These are used for cross-compiling and for saving the configure script -# from having to guess our platform (since we know it already) -DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) - - -CFLAGS = -Wall -g - -CONFIGURE_OPTIONS_TDE = \ - --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \ - --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib \ - --includedir=/opt/trinity/include/tde --mandir=/opt/trinity/share/man \ - --with-qt-dir=$(qtdir) \ - --sysconfdir=$(sysconfdir) \ - --infodir=/opt/trinity/share/info \ - --disable-debug --disable-rpath \ - --with-kde - -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif - -build: debian/build-kde - -debian/build-kde: - dh_testdir -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 - cp -p /usr/share/misc/config.sub admin/config.sub - cp -p /usr/share/misc/config.guess admin/config.guess - - make -f admin/Makefile.common cvs -# automake -# autoconf - - [ -d build-kde ] || mkdir build-kde - cd build-kde && ../configure CFLAGS="$(CFLAGS)" $(CONFIGURE_OPTIONS_TDE) - $(MAKE) -C build-kde - touch debian/build-kde - -clean: - dh_testdir - dh_testroot - $(RM) -f build-stamp - $(RM) -rf debian/kchmviewer - $(RM) -rf build-kde - $(RM) -f debian/build-kde - [ ! -f Makefile ] || $(MAKE) distclean - $(RM) config.sub config.guess - dh_clean - -install: build install-common debian/install-kde -install-common: - dh_testdir - dh_clean -k - dh_installdirs - -debian/install-kde: - dh_testroot - $(MAKE) -C build-kde install DESTDIR=$(CURDIR)/debian/kchmviewer-trinity - $(MAKE) -C build-kde/src/pics install DESTDIR=$(CURDIR)/debian/kchmviewer-trinity - mkdir -p $(CURDIR)/debian/kchmviewer-trinity/opt/trinity/share/man - cp -Rp $(CURDIR)/debian/additions/kchmviewer.1 $(CURDIR)/debian/kchmviewer-trinity/opt/trinity/share/man/kchmviewer.1 - -# Build architecture-independent files here. -binary-indep: build -# We have nothing to do by default. - -# Build architecture-dependent files here. -binary-arch: build install - dh_testdir - dh_testroot - dh_installchangelogs ChangeLog - dh_installdocs - dh_installexamples -# dh_install - dh_installmenu -# dh_installdebconf -# dh_installmime -# dh_installinfo -# dh_installman - 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 -.PHONY: build clean binary-indep binary-arch binary install +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/ubuntu/_base/applications/kchmviewer/debian/watch b/ubuntu/_base/applications/kchmviewer/debian/watch deleted file mode 100644 index e55a5c924..000000000 --- a/ubuntu/_base/applications/kchmviewer/debian/watch +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://sf.net/kchmviewer/kchmviewer-?([\w+\d+\.]+|\d+)(?:\.tar|\.tgz)(?:\.gz|\.bz2|) debian uupdate -- cgit v1.2.3