diff options
author | Slávek Banko <[email protected]> | 2018-11-04 12:55:14 +0100 |
---|---|---|
committer | Slávek Banko <[email protected]> | 2018-11-04 12:55:14 +0100 |
commit | 4b11983ef2300e3a28a28932a64cf2b991f6772d (patch) | |
tree | e31c77130695758e4a14c18c2de39d6d2bb607ef /ubuntu/maverick/applications | |
parent | 84b9012cd16fd4bb51079faa067ace40dd6951d0 (diff) | |
download | tde-packaging-4b11983ef2300e3a28a28932a64cf2b991f6772d.tar.gz tde-packaging-4b11983ef2300e3a28a28932a64cf2b991f6772d.zip |
DEB kdirstat: Switch to cmake.
The man page has been moved to the main tree.
Signed-off-by: Slávek Banko <[email protected]>
Diffstat (limited to 'ubuntu/maverick/applications')
12 files changed, 26 insertions, 325 deletions
diff --git a/ubuntu/maverick/applications/kdirstat/debian/cdbs/buildvars.mk b/ubuntu/maverick/applications/kdirstat/debian/cdbs/buildvars.mk deleted file mode 100644 index 23d4709dc..000000000 --- a/ubuntu/maverick/applications/kdirstat/debian/cdbs/buildvars.mk +++ /dev/null @@ -1,86 +0,0 @@ -# -*- mode: makefile; coding: utf-8 -*- -# Copyright © 2002,2003 Colin Walters <[email protected]> -# Description: Defines some useful variables, but no rules -# -# 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_rules_buildvars -_cdbs_rules_buildvars = 1 - -CDBS_VERSION = something - -# Common useful variables -DEB_SOURCE_PACKAGE := $(strip $(shell egrep '^Source: ' debian/control | cut -f 2 -d ':')) -DEB_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ') -DEB_NOEPOCH_VERSION := $(shell echo $(DEB_VERSION) | cut -d: -f2-) -DEB_UPSTREAM_VERSION := $(shell echo $(DEB_NOEPOCH_VERSION) | sed 's/-[^-]*$$//') -DEB_ISNATIVE := $(shell dpkg-parsechangelog | egrep '^Version:' | perl -ne 'print if not /^Version:\s*.*-/;') - -# Split into arch/indep packages -ifneq ($(DEB_INDEP_PACKAGES),cdbs) -DEB_INDEP_PACKAGES := $(filter-out $(DONT_BUILD), $(strip $(shell $(_cdbs_scripts_path)/list-packages indep))) -DEB_ARCH_PACKAGES := $(filter-out $(DONT_BUILD), $(filter-out $(DEB_INDEP_PACKAGES),$(strip $(shell $(_cdbs_scripts_path)/list-packages same)))) -endif -# Split into normal and udeb packages -ifeq ($(DEB_UDEB_PACKAGES),) -DEB_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out %-udeb, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES))) -DEB_UDEB_PACKAGES = $(filter-out $(DONT_BUILD),$(filter %-udeb, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES))) -else -DEB_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES), $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES))) -endif -# Too much bother for now. If someone complains we'll fix it. -#DEB_ARCH_UDEB_PACKAGES = $(filter %-udeb, $(DEB_ARCH_PACKAGES)) -#DEB_INDEP_UDEB_PACKAGES = $(filter %-udeb, $(DEB_INDEP_PACKAGES)) -# A handy list of every package, udeb or not -DEB_ALL_PACKAGES = $(filter-out $(DONT_BUILD),$(DEB_PACKAGES) $(DEB_UDEB_PACKAGES)) -DEB_INDEP_REGULAR_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES),$(DEB_INDEP_PACKAGES))) -DEB_ARCH_REGULAR_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES),$(DEB_ARCH_PACKAGES))) - -DEB_DBG_PACKAGES = $(filter-out $(DONT_BUILD), $(filter %-dbg, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES))) - -# Some support for srcdir != builddir builds. -# These are relative to the root of the package -DEB_SRCDIR ?= . -DEB_BUILDDIR ?= $(strip $(DEB_SRCDIR)) - -# Miscellaneous bits -DEB_ARCH = $(shell dpkg --print-architecture) -DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -DEB_HOST_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM) -DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU) -DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) -DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) -DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) -DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -DEB_BUILD_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM) -DEB_BUILD_GNU_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU) -DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH) -DEB_BUILD_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU) -DEB_BUILD_ARCH_OS ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS) - -ifeq ($(words $(DEB_ALL_PACKAGES)),1) - DEB_DESTDIR = $(CURDIR)/debian/$(strip $(DEB_ALL_PACKAGES))/ -else - DEB_DESTDIR = $(CURDIR)/debian/tmp/ -endif - -CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), cdbs (>= 0.4.23-1.1) - -endif diff --git a/ubuntu/maverick/applications/kdirstat/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kdirstat/debian/cdbs/debian-qt-kde.mk index 9920696ce..32ba4acfb 100644 --- a/ubuntu/maverick/applications/kdirstat/debian/cdbs/debian-qt-kde.mk +++ b/ubuntu/maverick/applications/kdirstat/debian/cdbs/debian-qt-kde.mk @@ -10,6 +10,7 @@ _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 @@ -18,10 +19,11 @@ 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 +#include debian/cdbs/uploaders.mk ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches @@ -103,6 +105,7 @@ binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: 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 | \ @@ -111,6 +114,7 @@ clean:: configure configure.files configure.in stamp-h.in \ subdirs; \ fi +endif rm -f debian/stamp-cvs-make endif diff --git a/ubuntu/maverick/applications/kdirstat/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kdirstat/debian/cdbs/kde.mk index 765560c89..ed93c4763 100644 --- a/ubuntu/maverick/applications/kdirstat/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/kdirstat/debian/cdbs/kde.mk @@ -35,7 +35,9 @@ 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 @@ -59,7 +61,7 @@ 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/tde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: @@ -75,7 +77,7 @@ debian/stamp-kde-apidox: 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 + -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 diff --git a/ubuntu/maverick/applications/kdirstat/debian/cdbs/team-members b/ubuntu/maverick/applications/kdirstat/debian/cdbs/team-members deleted file mode 100644 index 05761af6e..000000000 --- a/ubuntu/maverick/applications/kdirstat/debian/cdbs/team-members +++ /dev/null @@ -1,16 +0,0 @@ -Sune Vuorela <[email protected]> -Ana Beatriz Guerrero Lopez <[email protected]> -Fathi Boudra <[email protected]> -Modestas Vainius <[email protected]> -Josh Metzler <[email protected]> -Isaac Clerencia <[email protected]> -Adeodato Simó <[email protected]> -Adeodato Simo <[email protected]> -Christopher Martin <[email protected]> -Daniel Schepler <[email protected]> -Sarah Hobbs <[email protected]> -Nacho Barrientos Arias <[email protected]> -Ricardo Javier Cardenes Medina <[email protected]> -Ricardo Cardenes <[email protected]> -Armin Berres <[email protected]> -Francesco Pedrini <[email protected]> diff --git a/ubuntu/maverick/applications/kdirstat/debian/cdbs/uploaders.mk b/ubuntu/maverick/applications/kdirstat/debian/cdbs/uploaders.mk deleted file mode 100644 index 31adfe31e..000000000 --- a/ubuntu/maverick/applications/kdirstat/debian/cdbs/uploaders.mk +++ /dev/null @@ -1,29 +0,0 @@ - -MAINTAINER=Debian Qt/KDE Maintainers <[email protected]> -UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog | grep -v "[email protected]" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//') - - -debian/control.tmp: - @if [ ! -e debian/control.in ] ; then \ - echo "this package is not yet prepared for using automatic update of uploaders"; \ - echo "Please do so."; \ - exit 1; \ - fi - @sed 's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in > debian/control.tmp - -check-uploaders: debian/control.tmp - @if ! diff -q debian/control debian/control.tmp ; then \ - echo "WARNING:: Control file differs from manually generated one" ; \ - echo "WARNING:: Please update it manually and check it afterwards" ; \ - echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\ - echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\ - fi - - -clean:: - rm -f debian/control.tmp - -update-uploaders: debian/control.tmp - @mv -f debian/control.tmp debian/control - -makebuilddir:: check-uploaders diff --git a/ubuntu/maverick/applications/kdirstat/debian/control b/ubuntu/maverick/applications/kdirstat/debian/control index 4c86b78d9..ee2e0ef40 100644 --- a/ubuntu/maverick/applications/kdirstat/debian/control +++ b/ubuntu/maverick/applications/kdirstat/debian/control @@ -2,7 +2,7 @@ Source: kdirstat-trinity Section: misc Priority: optional Maintainer: Timothy Pearson <[email protected]> -Build-Depends: cdbs (>= 0.4.41), debhelper (>= 7.0.50~), quilt, tdelibs14-trinity-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs (>= 0.4.41), debhelper (>= 7.0.50~), quilt, cmake, tdelibs14-trinity-dev Standards-Version: 3.8.4 Homepage: http://kdirstat.sourceforge.net/ diff --git a/ubuntu/maverick/applications/kdirstat/debian/docs b/ubuntu/maverick/applications/kdirstat/debian/docs new file mode 100644 index 000000000..7f03542b1 --- /dev/null +++ b/ubuntu/maverick/applications/kdirstat/debian/docs @@ -0,0 +1,4 @@ +AUTHORS +CREDITS +README +TODO diff --git a/ubuntu/maverick/applications/kdirstat/debian/kdirstat.1 b/ubuntu/maverick/applications/kdirstat/debian/kdirstat.1 deleted file mode 100644 index a9a5991c3..000000000 --- a/ubuntu/maverick/applications/kdirstat/debian/kdirstat.1 +++ /dev/null @@ -1,155 +0,0 @@ -.\" This file was generated by kdemangen.pl -.TH KDIRSTAT 1 "Feb 2008" "Trinity Desktop Environment" "KDirStat - Directory statistics." -.SH NAME -kdirstat -\- KDirStat - Directory statistics. -.SH SYNOPSIS -kdirstat [Qt\-options] [TDE\-options] [Dir/URL] -.SH DESCRIPTION -KDirStat (TDE Directory Statistics) is a small utility program that sums -up disk usage for directory trees, very much like the Unix 'du' command. -It displays the disk space used up by a directory tree, both numerically -and graphically. It is network transparent (i.e., you can use it to sum -up FTP servers), and comes with predefined and user configurable cleanup -actions. You can directly open a directory branch in Konqueror or the -shell of your choice, compress it to a .tar.bz2 archive, or define your -own cleanup actions. - -.SH OPTIONS -.SS -.SS Arguments: -Dir/URL Directory or URL 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 <caption> -Use 'caption' as name in the titlebar -.TP -.B \-\-icon <icon> -Use 'icon' as the application icon -.TP -.B \-\-miniicon <icon> -Use 'icon' as the icon in the titlebar -.TP -.B \-\-config <filename> -Use alternative configuration file -.TP -.B \-\-dcopserver <server> -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 <style> -sets the application GUI style -.TP -.B \-\-geometry <geometry> -sets the client geometry of the main widget - see man X for the argument format -.SS -.SS Qt options: -.TP -.B \-\-display <displayname> -Use the X-server display 'displayname' -.TP -.B \-\-session <sessionId> -Restore the application for the given 'sessionId' -.TP -.B \-\-cmap -Causes the application to install a private color -map on an 8-bit display -.TP -.B \-\-ncols <count> -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 -.B \-\-nograb -tells Qt to never grab the mouse or the keyboard -.TP -.B \-\-dograb -running under a debugger can cause an implicit --nograb, use -dograb to override -.TP -.B \-\-sync -switches to synchronous mode for debugging -.TP -.B \-\-fn, \-\-font <fontname> -defines the application font -.TP -.B \-\-bg, \-\-background <color> -sets the default background color and an -application palette (light and dark shades are -calculated) -.TP -.B \-\-fg, \-\-foreground <color> -sets the default foreground color -.TP -.B \-\-btn, \-\-button <color> -sets the default button color -.TP -.B \-\-name <name> -sets the application name -.TP -.B \-\-title <title> -sets the application title (caption) -.TP -.B \-\-visual TrueColor -forces the application to use a TrueColor visual on -an 8-bit display -.TP -.B \-\-inputstyle <inputstyle> -sets XIM (X Input Method) input style. Possible -values are onthespot, overthespot, offthespot and -root -.TP -.B \-\-im <XIM server> -set XIM server -.TP -.B \-\-noxim -disable XIM -.TP -.B \-\-reverse -mirrors the whole layout of widgets -.SS - -.SH SEE ALSO -Full user documentation is available through the TDE Help Center. You can also enter the URL -.BR help:/kdirstat/ -directly into konqueror or you can run -.BR "`khelpcenter help:/kdirstat/'" -from the command-line. -.br -.SH AUTHORS -.nf -Stefan Hundhammer <[email protected]> -.br - diff --git a/ubuntu/maverick/applications/kdirstat/debian/kdirstat.manpages b/ubuntu/maverick/applications/kdirstat/debian/kdirstat.manpages deleted file mode 100644 index 3e4bf7ff8..000000000 --- a/ubuntu/maverick/applications/kdirstat/debian/kdirstat.manpages +++ /dev/null @@ -1 +0,0 @@ -debian/kdirstat.1 diff --git a/ubuntu/maverick/applications/kdirstat/debian/rules b/ubuntu/maverick/applications/kdirstat/debian/rules index 018dd234e..18b1c07e2 100755 --- a/ubuntu/maverick/applications/kdirstat/debian/rules +++ b/ubuntu/maverick/applications/kdirstat/debian/rules @@ -1,39 +1,20 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include debian/cdbs/kde.mk +include /usr/share/cdbs/1/class/cmake.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) - -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde +include debian/cdbs/debian-qt-kde.mk DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) -LDFLAGS += -Wl,--as-needed - -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 - -clean:: - rm -f po/*.gmo +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/ubuntu/maverick/applications/kdirstat/debian/source.lintian-overrides b/ubuntu/maverick/applications/kdirstat/debian/source.lintian-overrides deleted file mode 100644 index aad24dd30..000000000 --- a/ubuntu/maverick/applications/kdirstat/debian/source.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -kdirstat-trinity source: source-contains-CVS-dir diff --git a/ubuntu/maverick/applications/kdirstat/debian/watch b/ubuntu/maverick/applications/kdirstat/debian/watch deleted file mode 100644 index 6dc72cf03..000000000 --- a/ubuntu/maverick/applications/kdirstat/debian/watch +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://kdirstat.sourceforge.net/download/kdirstat-([0-9]+\.[02468]+\.[0-9]+)\.tar\.bz2 |