From 601868147dd1542390ecb71e3a4736307b24216d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Tue, 7 Apr 2020 03:09:18 +0200 Subject: DEB basket: 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 (cherry picked from commit 1d43f94ba10626be3b49c0bf82a1c885497ecf32) --- .../basket/debian/basket-trinity.install | 145 ++------------ debian/_base/applications/basket/debian/basket.1 | 171 ---------------- .../applications/basket/debian/cdbs/debian-tde.mk | 218 +++++++++++++++++++++ .../applications/basket/debian/cdbs/versions.pl | 19 ++ debian/_base/applications/basket/debian/control | 2 +- debian/_base/applications/basket/debian/rules | 121 ++---------- debian/_base/applications/basket/debian/watch | 2 - 7 files changed, 270 insertions(+), 408 deletions(-) delete mode 100644 debian/_base/applications/basket/debian/basket.1 create mode 100644 debian/_base/applications/basket/debian/cdbs/debian-tde.mk create mode 100644 debian/_base/applications/basket/debian/cdbs/versions.pl delete mode 100644 debian/_base/applications/basket/debian/watch (limited to 'debian') diff --git a/debian/_base/applications/basket/debian/basket-trinity.install b/debian/_base/applications/basket/debian/basket-trinity.install index 127381a59..f968dddd3 100644 --- a/debian/_base/applications/basket/debian/basket-trinity.install +++ b/debian/_base/applications/basket/debian/basket-trinity.install @@ -1,133 +1,26 @@ etc/trinity/magic/basket.magic etc/trinity/magic/basket.magic.mgc -opt/trinity/share/applications/tde/basket.desktop -opt/trinity/share/apps/basket/icons/crystalsvg/16x16/actions/tag_preference_excelent.png -opt/trinity/share/apps/basket/icons/crystalsvg/16x16/actions/tag_for_later.png -opt/trinity/share/apps/basket/icons/crystalsvg/16x16/actions/tag_preference_good.png -opt/trinity/share/apps/basket/icons/crystalsvg/16x16/actions/tag_priority_high.png -opt/trinity/share/apps/basket/icons/crystalsvg/16x16/actions/tag_progress_050.png -opt/trinity/share/apps/basket/icons/crystalsvg/16x16/actions/tag_important.png -opt/trinity/share/apps/basket/icons/crystalsvg/16x16/actions/tag_checkbox_checked.png -opt/trinity/share/apps/basket/icons/crystalsvg/16x16/actions/tag_progress_025.png -opt/trinity/share/apps/basket/icons/crystalsvg/16x16/actions/tag_preference_bad.png -opt/trinity/share/apps/basket/icons/crystalsvg/16x16/actions/tag_priority_low.png -opt/trinity/share/apps/basket/icons/crystalsvg/16x16/actions/tag_checkbox.png -opt/trinity/share/apps/basket/icons/crystalsvg/16x16/actions/tag_priority_medium.png -opt/trinity/share/apps/basket/icons/crystalsvg/16x16/actions/tag_progress_000.png -opt/trinity/share/apps/basket/icons/crystalsvg/16x16/actions/tag_fun.png -opt/trinity/share/apps/basket/icons/crystalsvg/16x16/actions/tag_progress_075.png -opt/trinity/share/apps/basket/icons/crystalsvg/16x16/actions/tag_progress_100.png -opt/trinity/share/apps/basket/backgrounds/green-curves.png -opt/trinity/share/apps/basket/backgrounds/todo.png -opt/trinity/share/apps/basket/backgrounds/previews/green-curves.png -opt/trinity/share/apps/basket/backgrounds/previews/todo.png -opt/trinity/share/apps/basket/backgrounds/previews/strings.png -opt/trinity/share/apps/basket/backgrounds/previews/abstract.png -opt/trinity/share/apps/basket/backgrounds/previews/pins.png -opt/trinity/share/apps/basket/backgrounds/previews/painting.png -opt/trinity/share/apps/basket/backgrounds/previews/basket-title.png -opt/trinity/share/apps/basket/backgrounds/previews/working.png -opt/trinity/share/apps/basket/backgrounds/previews/rounds-line.png -opt/trinity/share/apps/basket/backgrounds/previews/alien-artifact.png -opt/trinity/share/apps/basket/backgrounds/previews/light.png -opt/trinity/share/apps/basket/backgrounds/previews/pens.png -opt/trinity/share/apps/basket/backgrounds/previews/rainbow-balls.png -opt/trinity/share/apps/basket/backgrounds/strings.png -opt/trinity/share/apps/basket/backgrounds/abstract.png -opt/trinity/share/apps/basket/backgrounds/pins.png -opt/trinity/share/apps/basket/backgrounds/painting.png -opt/trinity/share/apps/basket/backgrounds/basket-title.png -opt/trinity/share/apps/basket/backgrounds/working.png -opt/trinity/share/apps/basket/backgrounds/rounds-line.png -opt/trinity/share/apps/basket/backgrounds/alien-artifact.png.config -opt/trinity/share/apps/basket/backgrounds/alien-artifact.png -opt/trinity/share/apps/basket/backgrounds/light.png -opt/trinity/share/apps/basket/backgrounds/pens.png -opt/trinity/share/apps/basket/backgrounds/rainbow-balls.png -opt/trinity/share/apps/basket/images/tag_export_on_every_lines_help.png -opt/trinity/share/apps/basket/images/tag_export_help.png -opt/trinity/share/apps/basket/images/insertion_help.png -opt/trinity/share/apps/basket/basket_part.rc -opt/trinity/share/apps/basket/basketui.rc -opt/trinity/share/apps/basket/welcome/Welcome_fr.baskets -opt/trinity/share/apps/basket/welcome/Welcome_en_US.baskets -opt/trinity/share/apps/basket/welcome/Welcome_nn.baskets -opt/trinity/share/apps/basket/welcome/Welcome_de.baskets -opt/trinity/share/apps/basket/welcome/Welcome_ru.baskets -opt/trinity/share/apps/basket/welcome/Welcome_pt.baskets -opt/trinity/share/apps/basket/welcome/Welcome_ja.baskets -opt/trinity/share/apps/basket/welcome/Welcome_it.baskets -opt/trinity/share/icons/crystalsvg/scalable/apps/basket.svg -opt/trinity/share/icons/crystalsvg/22x22/apps/basket.png -opt/trinity/share/icons/crystalsvg/22x22/mimetypes/baskett.png -opt/trinity/share/icons/crystalsvg/22x22/mimetypes/baskets.png -opt/trinity/share/icons/crystalsvg/32x32/apps/basket.png -opt/trinity/share/icons/crystalsvg/32x32/mimetypes/baskett.png -opt/trinity/share/icons/crystalsvg/32x32/mimetypes/baskets.png -opt/trinity/share/icons/crystalsvg/64x64/apps/basket.png -opt/trinity/share/icons/crystalsvg/64x64/mimetypes/baskett.png -opt/trinity/share/icons/crystalsvg/64x64/mimetypes/baskets.png -opt/trinity/share/icons/crystalsvg/128x128/apps/basket.png -opt/trinity/share/icons/crystalsvg/128x128/mimetypes/baskett.png -opt/trinity/share/icons/crystalsvg/128x128/mimetypes/baskets.png -opt/trinity/share/icons/crystalsvg/16x16/apps/basket.png -opt/trinity/share/icons/crystalsvg/16x16/mimetypes/baskett.png -opt/trinity/share/icons/crystalsvg/16x16/mimetypes/baskets.png -opt/trinity/share/icons/crystalsvg/16x16/actions/likeback_dislike.png -opt/trinity/share/icons/crystalsvg/16x16/actions/tag_preference_excelent.png -opt/trinity/share/icons/crystalsvg/16x16/actions/tag_for_later.png -opt/trinity/share/icons/crystalsvg/16x16/actions/tag_preference_good.png -opt/trinity/share/icons/crystalsvg/16x16/actions/tag_priority_high.png -opt/trinity/share/icons/crystalsvg/16x16/actions/tag_progress_050.png -opt/trinity/share/icons/crystalsvg/16x16/actions/tag_important.png -opt/trinity/share/icons/crystalsvg/16x16/actions/tag_checkbox_checked.png -opt/trinity/share/icons/crystalsvg/16x16/actions/tag_progress_025.png -opt/trinity/share/icons/crystalsvg/16x16/actions/likeback_like.png -opt/trinity/share/icons/crystalsvg/16x16/actions/tag_preference_bad.png -opt/trinity/share/icons/crystalsvg/16x16/actions/tag_priority_low.png -opt/trinity/share/icons/crystalsvg/16x16/actions/likeback_feature.png -opt/trinity/share/icons/crystalsvg/16x16/actions/tag_checkbox.png -opt/trinity/share/icons/crystalsvg/16x16/actions/tag_priority_medium.png -opt/trinity/share/icons/crystalsvg/16x16/actions/likeback_bug.png -opt/trinity/share/icons/crystalsvg/16x16/actions/tag_progress_000.png -opt/trinity/share/icons/crystalsvg/16x16/actions/tag_fun.png -opt/trinity/share/icons/crystalsvg/16x16/actions/tag_progress_075.png -opt/trinity/share/icons/crystalsvg/16x16/actions/tag_progress_100.png -opt/trinity/share/icons/crystalsvg/48x48/apps/basket.png -opt/trinity/share/icons/crystalsvg/48x48/mimetypes/baskett.png -opt/trinity/share/icons/crystalsvg/48x48/mimetypes/baskets.png -opt/trinity/share/mimelnk/application/x-basket-template.desktop -opt/trinity/share/mimelnk/application/x-basket-archive.desktop -opt/trinity/share/services/basket_config_new_notes.desktop -opt/trinity/share/services/basket_config_general.desktop -opt/trinity/share/services/basketthumbcreator.desktop -opt/trinity/share/services/basket_config_notes_appearance.desktop -opt/trinity/share/services/basket_part.desktop -opt/trinity/share/services/basket_config_baskets.desktop -opt/trinity/share/services/basket_config_apps.desktop -opt/trinity/share/locale/es/LC_MESSAGES/basket.mo -opt/trinity/share/locale/zh_CN/LC_MESSAGES/basket.mo -opt/trinity/share/locale/pt/LC_MESSAGES/basket.mo -opt/trinity/share/locale/pl_PL/LC_MESSAGES/basket.mo -opt/trinity/share/locale/da/LC_MESSAGES/basket.mo -opt/trinity/share/locale/zh_TW/LC_MESSAGES/basket.mo -opt/trinity/share/locale/fr/LC_MESSAGES/basket.mo -opt/trinity/share/locale/ru/LC_MESSAGES/basket.mo -opt/trinity/share/locale/tr/LC_MESSAGES/basket.mo -opt/trinity/share/locale/ja/LC_MESSAGES/basket.mo -opt/trinity/share/locale/de/LC_MESSAGES/basket.mo -opt/trinity/share/locale/cs/LC_MESSAGES/basket.mo -opt/trinity/share/locale/nn/LC_MESSAGES/basket.mo -opt/trinity/share/locale/it/LC_MESSAGES/basket.mo -opt/trinity/share/locale/nl/LC_MESSAGES/basket.mo -opt/trinity/share/doc/tde/HTML/en/basket/index.cache.bz2 -opt/trinity/share/doc/tde/HTML/en/basket/index.docbook opt/trinity/bin/basket +opt/trinity/lib/libbasketcommon.la +opt/trinity/lib/libbasketcommon.so opt/trinity/lib/trinity/basketthumbcreator.la -opt/trinity/lib/trinity/libbasketpart.so +opt/trinity/lib/trinity/basketthumbcreator.so opt/trinity/lib/trinity/kcm_basket.la opt/trinity/lib/trinity/kcm_basket.so opt/trinity/lib/trinity/libbasketpart.la -opt/trinity/lib/trinity/basketthumbcreator.so -opt/trinity/lib/libbasketcommon.la -opt/trinity/lib/libbasketcommon.so +opt/trinity/lib/trinity/libbasketpart.so +opt/trinity/share/applications/tde/basket.desktop +opt/trinity/share/apps/basket/* +opt/trinity/share/doc/* +opt/trinity/share/icons/* +opt/trinity/share/locale/* +opt/trinity/share/man/* +opt/trinity/share/mimelnk/application/x-basket-archive.desktop +opt/trinity/share/mimelnk/application/x-basket-template.desktop +opt/trinity/share/services/basket_config_apps.desktop +opt/trinity/share/services/basket_config_baskets.desktop +opt/trinity/share/services/basket_config_general.desktop +opt/trinity/share/services/basket_config_new_notes.desktop +opt/trinity/share/services/basket_config_notes_appearance.desktop +opt/trinity/share/services/basket_part.desktop +opt/trinity/share/services/basketthumbcreator.desktop diff --git a/debian/_base/applications/basket/debian/basket.1 b/debian/_base/applications/basket/debian/basket.1 deleted file mode 100644 index db272f06a..000000000 --- a/debian/_base/applications/basket/debian/basket.1 +++ /dev/null @@ -1,171 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36. -.TH BasKet "1" "February 2007" "BasKet 1.0" -.SH NAME -BasKet -.SH SYNOPSIS -.B basket -[\fIQt-options\fR] [\fITDE-options\fR] [\fIoptions\fR] [\fIfile\fR] -.SH DESCRIPTION -BasKet is a application to allow you to quickly take notes, save your ideas and assist in quickly find them later. -Organizing your notes has never been so easy. -Basket also allows integration with Kontact and rest of TDE environment. - -.SH OPTIONS -.SS "BasKet options:" -.TP -\fB\-d\fR, \fB\-\-debug\fR -Show the debug window -.HP -\fB\-f\fR, \fB\-\-data\-folder\fR Custom folder where to load and save basket data and application data (useful for debugging purpose) -.TP -\fB\-h\fR, \fB\-\-start\-hidden\fR -Hide the main window in the system tray icon on startup -.TP -\fB\-k\fR, \fB\-\-use\-drkonquy\fR -When crashing, use the standard TDE report dialog instead of sending an email -.SS "Arguments:" -.TP -file -Open basket archive or template -.SS "Generic options:" -.TP -\fB\-\-help\fR -Show help about options -.TP -\fB\-\-help\-qt\fR -Show Qt specific options -.TP -\fB\-\-help\-tde\fR -Show TDE specific options -.TP -\fB\-\-help\-all\fR -Show all options -.TP -\fB\-\-author\fR -Show author information -.TP -\fB\-v\fR, \fB\-\-version\fR -Show version information -.TP -\fB\-\-license\fR -Show license information -.TP -\fB\-\-\fR -End of options -.SS "Qt options:" -.TP -\fB\-\-display\fR -Use the X\-server display 'displayname' -.TP -\fB\-\-session\fR -Restore the application for the given 'sessionId' -.TP -\fB\-\-cmap\fR -Causes the application to install a private color -map on an 8\-bit display -.TP -\fB\-\-ncols\fR -Limits the number of colors allocated in the color -cube on an 8\-bit display, if the application is -using the QApplication::ManyColor color -specification -.TP -\fB\-\-nograb\fR -tells Qt to never grab the mouse or the keyboard -.TP -\fB\-\-dograb\fR -running under a debugger can cause an implicit -\fB\-nograb\fR, use \fB\-dograb\fR to override -.TP -\fB\-\-sync\fR -switches to synchronous mode for debugging -.TP -\fB\-\-fn\fR, \fB\-\-font\fR -defines the application font -.TP -\fB\-\-bg\fR, \fB\-\-background\fR sets the default background color and an -application palette (light and dark shades are -calculated) -.HP -\fB\-\-fg\fR, \fB\-\-foreground\fR sets the default foreground color -.TP -\fB\-\-btn\fR, \fB\-\-button\fR -sets the default button color -.TP -\fB\-\-name\fR -sets the application name -.TP -\fB\-\-title\fR -sets the application title (caption) -.TP -\fB\-\-visual\fR TrueColor -forces the application to use a TrueColor visual on -an 8\-bit display -.TP -\fB\-\-inputstyle\fR <inputstyle> sets XIM (X Input Method) input style. Possible -values are onthespot, overthespot, offthespot and -root -.TP -\fB\-\-im\fR <XIM server> -set XIM server -.TP -\fB\-\-noxim\fR -disable XIM -.TP -\fB\-\-reverse\fR -mirrors the whole layout of widgets -.SS "TDE options:" -.TP -\fB\-\-caption\fR <caption> -Use 'caption' as name in the titlebar -.TP -\fB\-\-icon\fR <icon> -Use 'icon' as the application icon -.TP -\fB\-\-miniicon\fR <icon> -Use 'icon' as the icon in the titlebar -.TP -\fB\-\-config\fR <filename> -Use alternative configuration file -.TP -\fB\-\-dcopserver\fR <server> -Use the DCOP Server specified by 'server' -.TP -\fB\-\-nocrashhandler\fR -Disable crash handler, to get core dumps -.TP -\fB\-\-waitforwm\fR -Waits for a WM_NET compatible windowmanager -.TP -\fB\-\-style\fR <style> -sets the application GUI style -.TP -\fB\-\-geometry\fR <geometry> -sets the client geometry of the main widget \- see man X for the argument format -.TP -\fB\-\-nofork\fR -Don't run in the background. -.SH "SEE ALSO" -The full documentation for -.B BasKet: -is maintained as a TDE help file. -If TDE, Konqueror and KHelpcenter is fully installed on your computer, accessing -.IP -.B help:/basket -.PP -should give you access to the complete manual. -.SH "AUTHOR" -.B BasKet -Note Pads was written by -.IP -S\['e]bastien Lao\[^u]t <slaout@linux62.org> -.IP -Petri Damst\['e]n <damu@iki.fi> -.IP -Alex Gontmakher <gsasha@cs.technion.ac.il> -.IP -Marco Martin <m4rt@libero.it> -.PP -Please report bugs to slaout@linux62.org. -.SH "OTHER" -This manpage is derived from help2man by Sune Vuorela <debian@pusling.com> for the Debian project (But may be used by others). License: GPL2 like BasKet diff --git a/debian/_base/applications/basket/debian/cdbs/debian-tde.mk b/debian/_base/applications/basket/debian/cdbs/debian-tde.mk new file mode 100644 index 000000000..7a55130b2 --- /dev/null +++ b/debian/_base/applications/basket/debian/cdbs/debian-tde.mk @@ -0,0 +1,218 @@ +# -*- 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 + +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 + +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 debian/stamp-kde-apidox + rm -f debian/stamp-cvs-make + +endif diff --git a/debian/_base/applications/basket/debian/cdbs/versions.pl b/debian/_base/applications/basket/debian/cdbs/versions.pl new file mode 100644 index 000000000..1b110f7af --- /dev/null +++ b/debian/_base/applications/basket/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/debian/_base/applications/basket/debian/control b/debian/_base/applications/basket/debian/control index f9281361d..cc1fe1357 100644 --- a/debian/_base/applications/basket/debian/control +++ b/debian/_base/applications/basket/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Sune Vuorela <debian@pusling.com> -Build-Depends: libasound2-dev, cdbs, debhelper (>= 9~), tdelibs14-trinity-dev, tdepim-trinity-dev, libgpgme11-dev | libgpgme-dev (>= 1.0~), quilt (>= 0.40), automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, tdelibs14-trinity-dev, tdepim-trinity-dev, libgpgme11-dev | libgpgme-dev (>= 1.0~) Standards-Version: 3.8.4 Package: basket-trinity diff --git a/debian/_base/applications/basket/debian/rules b/debian/_base/applications/basket/debian/rules index 077485094..18aa16b96 100755 --- a/debian/_base/applications/basket/debian/rules +++ b/debian/_base/applications/basket/debian/rules @@ -1,114 +1,19 @@ #!/usr/bin/make -f -# -*- makefile -*- -#export DH_VERBOSE=1 - -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 - -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif - -#include /usr/share/cdbs/1/rules/patchsys-quilt.mk - -post-patches:: - dh_testdir - -config.status: post-patches - dh_testdir - cp -p /usr/share/misc/config.sub admin/config.sub - cp -p /usr/share/misc/config.guess admin/config.guess - 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) -f admin/Makefile.common dist; - - CFLAGS="$(CFLAGS)" kde_confdir=/etc/trinity ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \ - --prefix=/opt/trinity --with-qt-dir=/usr/share/qt3 \ - --with-qt-includes=/usr/include/qt3 \ - --with-qt-libraries=/usr/share/qt3/lib \ - --mandir=/opt/trinity/share/man \ - --infodir=/opt/trinity/share/info \ - --disable-debug kde_htmldir=/opt/trinity/share/doc/tde/HTML \ - --with-extra-libs=/opt/trinity/lib - - -build: build-stamp - -build-stamp: config.status - dh_testdir - - $(MAKE) - - touch build-stamp - -clean:: - dh_testdir - dh_testroot - - -$(MAKE) distclean - - $(RM) config.cache config.sub config.guess config.log - - dh_clean - rm -f build-stamp - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - # Install into package-build-dir - $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp - -# mkdir -p $(CURDIR)/debian/basket-trinity/opt/trinity/share/applications/tde/ -# mv $(CURDIR)/debian/basket-trinity/opt/trinity/share/applnk/Utilities/basket.desktop $(CURDIR)/debian/basket-trinity/opt/trinity/share/applications/tde/ - -binary-indep: build install - -binary-arch: build install - dh_testdir - dh_testroot - dh_installchangelogs ChangeLog - dh_installdocs - dh_installexamples - dh_install --sourcedir=debian/tmp - dh_installmenu -# dh_installlogrotate -# dh_installinfo - dh_installman debian/basket.1 - mv debian/basket-trinity/usr/share/man debian/basket-trinity/opt/trinity/share/ - dh_link - dh_strip - dh_compress - dh_fixperms - 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/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/_base/applications/basket/debian/watch b/debian/_base/applications/basket/debian/watch deleted file mode 100644 index a620b0d5a..000000000 --- a/debian/_base/applications/basket/debian/watch +++ /dev/null @@ -1,2 +0,0 @@ -version=2 -http://basket.kde.org/download.php (?:.*/)?downloads/\?file=basket-?_?([\w+\d+\.]+|\d+)(\.tar|\.tgz)(\.gz|\.bz2|) debian uupdate -- cgit v1.2.1