diff options
author | Slávek Banko <slavek.banko@axis.cz> | 2019-05-13 22:59:54 +0200 |
---|---|---|
committer | Slávek Banko <slavek.banko@axis.cz> | 2019-05-13 23:00:50 +0200 |
commit | 8d12e9d981e44c0768c00deebd3c8818d0bad656 (patch) | |
tree | 2bcab92baf96b918fcedefb6d39b7278370e623d /ubuntu | |
parent | cd4b16e21cb092927da19aa84b357a1f138ebb35 (diff) | |
download | tde-packaging-8d12e9d981e44c0768c00deebd3c8818d0bad656.tar.gz tde-packaging-8d12e9d981e44c0768c00deebd3c8818d0bad656.zip |
DEB kdpkg: Switch to cmake.
Switch to common TDE cdbs rules.
The man page has been moved to the main tree.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit f928a20a7c8b5bb8342871450d658addcf4f7fc8)
Diffstat (limited to 'ubuntu')
-rw-r--r-- | ubuntu/_base/applications/kdpkg/debian/cdbs/debian-tde.mk | 201 | ||||
-rw-r--r-- | ubuntu/_base/applications/kdpkg/debian/cdbs/versions.pl | 19 | ||||
-rw-r--r-- | ubuntu/_base/applications/kdpkg/debian/control | 2 | ||||
-rw-r--r-- | ubuntu/_base/applications/kdpkg/debian/docs | 1 | ||||
-rw-r--r-- | ubuntu/_base/applications/kdpkg/debian/kdpkg-install.1 | 34 | ||||
-rw-r--r-- | ubuntu/_base/applications/kdpkg/debian/kdpkg.1 | 34 | ||||
-rw-r--r-- | ubuntu/_base/applications/kdpkg/debian/manpages | 2 | ||||
-rwxr-xr-x | ubuntu/_base/applications/kdpkg/debian/rules | 42 |
8 files changed, 235 insertions, 100 deletions
diff --git a/ubuntu/_base/applications/kdpkg/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kdpkg/debian/cdbs/debian-tde.mk new file mode 100644 index 000000000..fb8c1b6c3 --- /dev/null +++ b/ubuntu/_base/applications/kdpkg/debian/cdbs/debian-tde.mk @@ -0,0 +1,201 @@ +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2003 Christopher L Cheney <ccheney@debian.org> +# 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/kdpkg/debian/cdbs/versions.pl b/ubuntu/_base/applications/kdpkg/debian/cdbs/versions.pl new file mode 100644 index 000000000..1b110f7af --- /dev/null +++ b/ubuntu/_base/applications/kdpkg/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/kdpkg/debian/control b/ubuntu/_base/applications/kdpkg/debian/control index 876bd2bf0..2c367e892 100644 --- a/ubuntu/_base/applications/kdpkg/debian/control +++ b/ubuntu/_base/applications/kdpkg/debian/control @@ -3,7 +3,7 @@ Section: admin Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> XSBC-Original-Maintainer: Alexander Kopf <kopf-alexander@gmx.de> -Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, tdelibs14-trinity-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake, tdelibs14-trinity-dev Standards-Version: 3.8.4 Package: kdpkg-trinity diff --git a/ubuntu/_base/applications/kdpkg/debian/docs b/ubuntu/_base/applications/kdpkg/debian/docs new file mode 100644 index 000000000..62deb0497 --- /dev/null +++ b/ubuntu/_base/applications/kdpkg/debian/docs @@ -0,0 +1 @@ +AUTHORS diff --git a/ubuntu/_base/applications/kdpkg/debian/kdpkg-install.1 b/ubuntu/_base/applications/kdpkg/debian/kdpkg-install.1 deleted file mode 100644 index c49586d4e..000000000 --- a/ubuntu/_base/applications/kdpkg/debian/kdpkg-install.1 +++ /dev/null @@ -1,34 +0,0 @@ -'\" -*- coding: us-ascii -*- -.if \n(.g .ds T< \\FC -.if \n(.g .ds T> \\F[\n[.fam]] -.de URL -\\$2 \(la\\$1\(ra\\$3 -.. -.if \n(.g .mso www.tmac -.TH kdpkg 1 2008-07-03 "" "" -.SH NAME -kdpkg \- TDE frontend for dpkg -.SH SYNOPSIS -'nh -.fi -.ad l -\fBkdpkg\fR \kx -.if (\nx>(\n(.l/2)) .nr x (\n(.l/5) -'in \n(.iu+\nxu -'in \n(.iu-\nxu -.ad b -'hy -.SH DESCRIPTION -If you klick on a .deb file kdpkg starts automatically for installing it. -It works like gdebi with the difference that kdpkg is a TDE application -.SH COPYRIGHT -This manual page was written by Alexander Kopf -<\*(T<kopf\-alexander@gmx.de\*(T>> for the -Ubuntu system (but may be used by others). -Permission is granted to copy, distribute and/or modify this document -under the terms of the GNU General Public License, -Version 2 or any later version published by the Free Software Foundation. -.PP -On Debian systems, the complete text of the GNU General Public -License can be found in -\*(T<\fI/usr/share/common\-licenses/GPL\-2\fR\*(T>. diff --git a/ubuntu/_base/applications/kdpkg/debian/kdpkg.1 b/ubuntu/_base/applications/kdpkg/debian/kdpkg.1 deleted file mode 100644 index c49586d4e..000000000 --- a/ubuntu/_base/applications/kdpkg/debian/kdpkg.1 +++ /dev/null @@ -1,34 +0,0 @@ -'\" -*- coding: us-ascii -*- -.if \n(.g .ds T< \\FC -.if \n(.g .ds T> \\F[\n[.fam]] -.de URL -\\$2 \(la\\$1\(ra\\$3 -.. -.if \n(.g .mso www.tmac -.TH kdpkg 1 2008-07-03 "" "" -.SH NAME -kdpkg \- TDE frontend for dpkg -.SH SYNOPSIS -'nh -.fi -.ad l -\fBkdpkg\fR \kx -.if (\nx>(\n(.l/2)) .nr x (\n(.l/5) -'in \n(.iu+\nxu -'in \n(.iu-\nxu -.ad b -'hy -.SH DESCRIPTION -If you klick on a .deb file kdpkg starts automatically for installing it. -It works like gdebi with the difference that kdpkg is a TDE application -.SH COPYRIGHT -This manual page was written by Alexander Kopf -<\*(T<kopf\-alexander@gmx.de\*(T>> for the -Ubuntu system (but may be used by others). -Permission is granted to copy, distribute and/or modify this document -under the terms of the GNU General Public License, -Version 2 or any later version published by the Free Software Foundation. -.PP -On Debian systems, the complete text of the GNU General Public -License can be found in -\*(T<\fI/usr/share/common\-licenses/GPL\-2\fR\*(T>. diff --git a/ubuntu/_base/applications/kdpkg/debian/manpages b/ubuntu/_base/applications/kdpkg/debian/manpages deleted file mode 100644 index 7835ccb72..000000000 --- a/ubuntu/_base/applications/kdpkg/debian/manpages +++ /dev/null @@ -1,2 +0,0 @@ -debian/kdpkg.1 -debian/kdpkg-install.1 diff --git a/ubuntu/_base/applications/kdpkg/debian/rules b/ubuntu/_base/applications/kdpkg/debian/rules index fc6797244..cee2a3058 100755 --- a/ubuntu/_base/applications/kdpkg/debian/rules +++ b/ubuntu/_base/applications/kdpkg/debian/rules @@ -1,35 +1,19 @@ #!/usr/bin/make -f - -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/autotools.mk -#include /usr/share/cdbs/1/rules/patchsys-quilt.mk - -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) -post-patches:: debian/stamp-bootstrap - -debian/stamp-bootstrap: -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 - - make -f admin/Makefile.common cvs - touch debian/stamp-bootstrap - -binary-install/kdpkg-trinity:: - mv debian/kdpkg-trinity/usr/share/man debian/kdpkg-trinity/opt/trinity/share/ +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" |