From 2064c92d78e53c5753ccc22a2b83abfe120fa8cb Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sat, 14 Nov 2020 11:33:55 +0800 Subject: DEB ktechlab: switch to cmake under Ubuntu too. Switch to common TDE cdbs rules. The man page has been moved to the main tree. This is the same as commit e1d60a89d but applied to Ubuntu. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko Signed-off-by: Michele Calgaro --- .../ktechlab/debian/cdbs/debian-tde.mk | 227 +++++++++++++++++++++ .../applications/ktechlab/debian/cdbs/versions.pl | 19 ++ ubuntu/_base/applications/ktechlab/debian/control | 2 +- .../_base/applications/ktechlab/debian/debiandirs | 32 --- ubuntu/_base/applications/ktechlab/debian/install | 1 + .../_base/applications/ktechlab/debian/ktechlab.1 | 151 -------------- ubuntu/_base/applications/ktechlab/debian/manpages | 2 - .../_base/applications/ktechlab/debian/microbe.1 | 162 --------------- ubuntu/_base/applications/ktechlab/debian/rules | 113 ++-------- 9 files changed, 266 insertions(+), 443 deletions(-) create mode 100644 ubuntu/_base/applications/ktechlab/debian/cdbs/debian-tde.mk create mode 100644 ubuntu/_base/applications/ktechlab/debian/cdbs/versions.pl delete mode 100644 ubuntu/_base/applications/ktechlab/debian/debiandirs create mode 100644 ubuntu/_base/applications/ktechlab/debian/install delete mode 100644 ubuntu/_base/applications/ktechlab/debian/ktechlab.1 delete mode 100644 ubuntu/_base/applications/ktechlab/debian/manpages delete mode 100644 ubuntu/_base/applications/ktechlab/debian/microbe.1 (limited to 'ubuntu/_base') diff --git a/ubuntu/_base/applications/ktechlab/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/ktechlab/debian/cdbs/debian-tde.mk new file mode 100644 index 000000000..24191b2cd --- /dev/null +++ b/ubuntu/_base/applications/ktechlab/debian/cdbs/debian-tde.mk @@ -0,0 +1,227 @@ +# -*- 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 + +DEB_BUILD_PARALLEL ?= true + +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 + +.tdepkginfo: + echo "# TDE package information" >.tdepkginfo + dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo + dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo + date +"DateTime: %m/%d/%Y %H:%M" -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo + +post-patches:: .tdepkginfo + +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 ) + # update multi-arch path in install files + ls -d debian/* | \ + grep -E "(install|links)$$" | \ + while read a; do \ + [ -d $$a ] || [ -f $$a.arch ] || \ + ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \ + sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \ + done + +clean:: + rm -rf debian/man/out + -rmdir debian/man + rm -f debian/stamp-man-pages + rm -rf debian/shlibs-check + # revert multi-arch path in install files + ls -d debian/* | \ + grep -E "(install|links)$$" | \ + while read a; do \ + [ ! -f $$a.arch ] || \ + mv $$a.arch $$a; \ + done + +$(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 .tdepkginfo + rm -f debian/stamp-kde-apidox + rm -f debian/stamp-cvs-make + +endif diff --git a/ubuntu/_base/applications/ktechlab/debian/cdbs/versions.pl b/ubuntu/_base/applications/ktechlab/debian/cdbs/versions.pl new file mode 100644 index 000000000..1b110f7af --- /dev/null +++ b/ubuntu/_base/applications/ktechlab/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/ktechlab/debian/control b/ubuntu/_base/applications/ktechlab/debian/control index 9d67caa2a..90eb3a4c2 100644 --- a/ubuntu/_base/applications/ktechlab/debian/control +++ b/ubuntu/_base/applications/ktechlab/debian/control @@ -2,7 +2,7 @@ Source: ktechlab-trinity Section: tde Priority: optional Maintainer: Timothy Pearson -Build-Depends: debhelper (>= 9~), cdbs, quilt, imagemagick, tdelibs14-trinity-dev, gpsim-dev (>= 0.21.11-2), libgtk2.0-dev, libreadline-dev | libreadline6-dev, libopts25-dev, chrpath, libpopt-dev, tdesdk-scripts-trinity, automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>= 9~), cdbs, quilt, cmake, intltool, imagemagick, tdelibs14-trinity-dev, gpsim-dev (>= 0.21.11-2) Standards-Version: 3.8.4 Package: ktechlab-trinity diff --git a/ubuntu/_base/applications/ktechlab/debian/debiandirs b/ubuntu/_base/applications/ktechlab/debian/debiandirs deleted file mode 100644 index f2d481ccf..000000000 --- a/ubuntu/_base/applications/ktechlab/debian/debiandirs +++ /dev/null @@ -1,32 +0,0 @@ -export kde_confdir=/etc/trinity -export kde_prefix=/opt/trinity -export kde_bindir=/opt/trinity/bin -export kde_includedir=/opt/trinity/include/tde -export kde_libdir=/opt/trinity/lib -export kde_cgidir=/opt/trinity/lib/cgi-bin -export kde_moduledir=/opt/trinity/lib/trinity -export kde_appsdir=/opt/trinity/share/applnk -export kde_datadir=/opt/trinity/share/apps -export kde_htmldir=/opt/trinity/share/doc/tde/HTML -export kde_icondir=/opt/trinity/share/icons -export kde_locale=/opt/trinity/share/locale -export kde_mimedir=/opt/trinity/share/mimelnk -export kde_servicesdir=/opt/trinity/share/services -export kde_servicetypesdir=/opt/trinity/share/servicetypes -export kde_sounddir=/opt/trinity/share/sounds -export kde_templatesdir=/opt/trinity/share/templates -export kde_wallpaperdir=/opt/trinity/share/wallpapers -export mandir=/opt/trinity/share/man -export infodir=/opt/trinity/share/info -export sysconfdir=/etc -export QTDIR=/usr/share/qt3 -export IDL=/opt/trinity/bin/cuteidl -export DCOPIDL=/opt/trinity/bin/dcopidl -export DCOPIDL2CPP=/opt/trinity/bin/dcopidl2cpp -export KDB2HTML=/opt/trinity/bin/kdb2html -export MCOPIDL=/opt/trinity/bin/mcopidl -export ARTSCCONFIG=/opt/trinity/bin/artsc-config -export INSTALL_DATA=install -p -c -m 644 -configkde=--disable-debug --disable-rpath --prefix=$(kde_prefix) --libexecdir=$(kde_bindir) --sysconfdir=$(sysconfdir) --libdir=$(kde_libdir) --includedir=$(kde_includedir) --with-qt-includes=/usr/include/qt3 --mandir=$(mandir) --infodir=$(infodir) --with-xinerama -configtdevelop=--disable-debug --disable-rpath --enable-docbase --enable-kdoc2 --libdir=$(kde_libdir) --includedir=$(kde_includedir) --with-qt-includes=/usr/include/qt3 --mandir=$(mandir) --with-tdelibsdoc-dir=/opt/trinity/share/doc/tdelibs3-doc/html --with-xinerama -configtdepim=--disable-debug --disable-rpath --with-extra-includes=/usr/include/libpisock --enable-shared --prefix=$(kde_prefix) --libexecdir=$(kde_bindir) --with-qt-includes=/usr/include/qt3 --mandir=$(mandir) --infodir=$(infodir) --with-xinerama diff --git a/ubuntu/_base/applications/ktechlab/debian/install b/ubuntu/_base/applications/ktechlab/debian/install new file mode 100644 index 000000000..27e314da2 --- /dev/null +++ b/ubuntu/_base/applications/ktechlab/debian/install @@ -0,0 +1 @@ +debian/ktechlab.xpm opt/trinity/share/pixmaps diff --git a/ubuntu/_base/applications/ktechlab/debian/ktechlab.1 b/ubuntu/_base/applications/ktechlab/debian/ktechlab.1 deleted file mode 100644 index bb49c1dab..000000000 --- a/ubuntu/_base/applications/ktechlab/debian/ktechlab.1 +++ /dev/null @@ -1,151 +0,0 @@ -.\" This file was generated by kdemangen.pl -.TH KTECHLAB 1 "Jan 2006" "Trinity Desktop Environment" "An IDE for microcontrollers and electronics" -.SH NAME -ktechlab -\- An IDE for microcontrollers and electronics -.SH SYNOPSIS -ktechlab [Qt\-options] [TDE\-options] [URL] -.SH DESCRIPTION -An IDE for microcontrollers and electronics -.SH OPTIONS -.SS -.SS Arguments: -.TP -.B URL -Document to open. -.SS Generic options: -.TP -.B \-\-help -Show help about options -.TP -.B \-\-help\-qt -Show Qt specific options -.TP -.B \-\-help\-tde -Show TDE specific options -.TP -.B \-\-help\-all -Show all options -.TP -.B \-\-author -Show author information -.TP -.B \-v, \-\-version -Show version information -.TP -.B \-\-license -Show license information -.TP -.B \-\- -End of options -.SS -.SS TDE options: -.TP -.B \-\-caption -Use 'caption' as name in the titlebar -.TP -.B \-\-icon -Use 'icon' as the application icon -.TP -.B \-\-miniicon -Use 'icon' as the icon in the titlebar -.TP -.B \-\-config -Use alternative configuration file -.TP -.B \-\-dcopserver -Use the DCOP Server specified by 'server' -.TP -.B \-\-nocrashhandler -Disable crash handler, to get core dumps -.TP -.B \-\-waitforwm -Waits for a WM_NET compatible windowmanager -.TP -.B \-\-style