From ce12f9fa05fe43b5878f3189e747e31bbb60c7f7 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 27 Jan 2013 02:00:00 -0600 Subject: Update Debian and Ubuntu packaging with the latest renaming in GIT --- .../applications/amarok.cmake/debian/control | 2 +- .../applications/amarok.cmake/debian/control.in | 2 +- ubuntu/maverick/applications/amarok/debian/control | 2 +- .../maverick/applications/amarok/debian/control.in | 2 +- .../debian/cdbs/buildvars.mk | 86 ---------------- .../debian/cdbs/debian-qt-kde.mk | 109 --------------------- .../debian/cdbs/kde.mk | 97 ------------------ .../debian/cdbs/team-members | 16 --- .../debian/cdbs/uploaders.mk | 29 ------ .../debian/cdbs/versions.pl | 19 ---- .../compizconfig-backend-kconfig/debian/changelog | 56 ----------- .../compizconfig-backend-kconfig/debian/compat | 1 - .../compizconfig-backend-kconfig/debian/control | 21 ---- .../compizconfig-backend-kconfig/debian/copyright | 58 ----------- .../debian/patches/.gitignore | 0 .../compizconfig-backend-kconfig/debian/rules | 30 ------ .../debian/source/format | 1 - .../debian/source/options | 6 -- .../debian/cdbs/buildvars.mk | 86 ++++++++++++++++ .../debian/cdbs/debian-qt-kde.mk | 109 +++++++++++++++++++++ .../debian/cdbs/kde.mk | 97 ++++++++++++++++++ .../debian/cdbs/team-members | 16 +++ .../debian/cdbs/uploaders.mk | 29 ++++++ .../debian/cdbs/versions.pl | 19 ++++ .../debian/changelog | 56 +++++++++++ .../compizconfig-backend-tdeconfig/debian/compat | 1 + .../compizconfig-backend-tdeconfig/debian/control | 21 ++++ .../debian/copyright | 58 +++++++++++ .../debian/patches/.gitignore | 0 .../compizconfig-backend-tdeconfig/debian/rules | 30 ++++++ .../debian/source/format | 1 + .../debian/source/options | 6 ++ .../maverick/applications/digikam/debian/copyright | 4 +- .../applications/gwenview/debian/changelog | 6 +- .../maverick/applications/gwenview/debian/control | 4 +- ubuntu/maverick/applications/k3b/debian/changelog | 6 +- .../applications/k3b/debian/k3b-trinity.install | 4 +- .../maverick/applications/k3b/debian/k3b.install | 4 +- .../applications/kile/debian/kile-trinity.install | 2 +- .../maverick/applications/knemo/debian/changelog | 2 +- .../applications/koffice/debian/README.MimeType | 4 +- .../maverick/applications/koffice/debian/changelog | 4 +- .../koffice/debian/koffice-data-trinity.install | 8 +- .../koffice/debian/koffice-libs-trinity.install | 16 +-- .../applications/konversation/debian/changelog | 2 +- .../debian/konversation-trinity.install | 2 +- .../tde-style-lipstik/debian/changelog | 2 +- .../tde-systemsettings/debian/changelog | 2 +- .../maverick/applications/tdesvn/debian/changelog | 8 +- .../tdesvn/debian/tdesvn-trinity.install | 2 +- .../tdmtheme/debian/tdmtheme.lintian-overrides | 2 +- 51 files changed, 575 insertions(+), 575 deletions(-) delete mode 100644 ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/cdbs/buildvars.mk delete mode 100644 ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/cdbs/debian-qt-kde.mk delete mode 100644 ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/cdbs/kde.mk delete mode 100644 ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/cdbs/team-members delete mode 100644 ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/cdbs/uploaders.mk delete mode 100644 ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/cdbs/versions.pl delete mode 100644 ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/changelog delete mode 100644 ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/compat delete mode 100644 ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/control delete mode 100644 ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/copyright delete mode 100644 ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/patches/.gitignore delete mode 100755 ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/rules delete mode 100644 ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/source/format delete mode 100644 ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/source/options create mode 100644 ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/cdbs/buildvars.mk create mode 100644 ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/cdbs/debian-qt-kde.mk create mode 100644 ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/cdbs/kde.mk create mode 100644 ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/cdbs/team-members create mode 100644 ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/cdbs/uploaders.mk create mode 100644 ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/cdbs/versions.pl create mode 100644 ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/changelog create mode 100644 ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/compat create mode 100644 ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/control create mode 100644 ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/copyright create mode 100644 ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/patches/.gitignore create mode 100755 ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/rules create mode 100644 ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/source/format create mode 100644 ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/source/options (limited to 'ubuntu/maverick/applications') diff --git a/ubuntu/maverick/applications/amarok.cmake/debian/control b/ubuntu/maverick/applications/amarok.cmake/debian/control index 7407748f8..49bfcb1c5 100644 --- a/ubuntu/maverick/applications/amarok.cmake/debian/control +++ b/ubuntu/maverick/applications/amarok.cmake/debian/control @@ -31,7 +31,7 @@ Description: versatile and easy to use audio player for Trinity - rapid playlist creation, with drag and drop from a directory view - nice playlist browser for your existing playlists (PLS or M3U formats) - collection-indexing support, for smart browsing and playlist creation - - possibility of accessing media via kioslaves, allowing you to play + - possibility of accessing media via tdeioslaves, allowing you to play via smb:// or fish:// (normal streams are of course supported) - inline ID3 tag editing, capable of retrieving tags via MusicBrainz - album cover support: automatically displays album covers from the diff --git a/ubuntu/maverick/applications/amarok.cmake/debian/control.in b/ubuntu/maverick/applications/amarok.cmake/debian/control.in index dc0f8621a..8ff2b1c0b 100644 --- a/ubuntu/maverick/applications/amarok.cmake/debian/control.in +++ b/ubuntu/maverick/applications/amarok.cmake/debian/control.in @@ -28,7 +28,7 @@ Description: versatile and easy to use audio player for Trinity - rapid playlist creation, with drag and drop from a directory view - nice playlist browser for your existing playlists (PLS or M3U formats) - collection-indexing support, for smart browsing and playlist creation - - possibility of accessing media via kioslaves, allowing you to play + - possibility of accessing media via tdeioslaves, allowing you to play via smb:// or fish:// (normal streams are of course supported) - inline ID3 tag editing, capable of retrieving tags via MusicBrainz - album cover support: automatically displays album covers from the diff --git a/ubuntu/maverick/applications/amarok/debian/control b/ubuntu/maverick/applications/amarok/debian/control index a4d9e84d9..5b9d8f9ea 100644 --- a/ubuntu/maverick/applications/amarok/debian/control +++ b/ubuntu/maverick/applications/amarok/debian/control @@ -31,7 +31,7 @@ Description: versatile and easy to use audio player for Trinity - rapid playlist creation, with drag and drop from a directory view - nice playlist browser for your existing playlists (PLS or M3U formats) - collection-indexing support, for smart browsing and playlist creation - - possibility of accessing media via kioslaves, allowing you to play + - possibility of accessing media via tdeioslaves, allowing you to play via smb:// or fish:// (normal streams are of course supported) - inline ID3 tag editing, capable of retrieving tags via MusicBrainz - album cover support: automatically displays album covers from the diff --git a/ubuntu/maverick/applications/amarok/debian/control.in b/ubuntu/maverick/applications/amarok/debian/control.in index dc0f8621a..8ff2b1c0b 100644 --- a/ubuntu/maverick/applications/amarok/debian/control.in +++ b/ubuntu/maverick/applications/amarok/debian/control.in @@ -28,7 +28,7 @@ Description: versatile and easy to use audio player for Trinity - rapid playlist creation, with drag and drop from a directory view - nice playlist browser for your existing playlists (PLS or M3U formats) - collection-indexing support, for smart browsing and playlist creation - - possibility of accessing media via kioslaves, allowing you to play + - possibility of accessing media via tdeioslaves, allowing you to play via smb:// or fish:// (normal streams are of course supported) - inline ID3 tag editing, capable of retrieving tags via MusicBrainz - album cover support: automatically displays album covers from the diff --git a/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/cdbs/buildvars.mk b/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/cdbs/buildvars.mk deleted file mode 100644 index 23d4709dc..000000000 --- a/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/cdbs/buildvars.mk +++ /dev/null @@ -1,86 +0,0 @@ -# -*- mode: makefile; coding: utf-8 -*- -# Copyright © 2002,2003 Colin Walters -# 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/compizconfig-backend-kconfig/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/cdbs/debian-qt-kde.mk deleted file mode 100644 index 311dc059d..000000000 --- a/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/cdbs/debian-qt-kde.mk +++ /dev/null @@ -1,109 +0,0 @@ -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 - -# 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: - cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in - cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh - $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; - touch debian/stamp-cvs-make - -include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) -include debian/cdbs/uploaders.mk - -DEB_PATCHDIRS := debian/patches/common debian/patches - -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) - -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 - -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_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 - -clean:: - 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 - rm -f debian/stamp-cvs-make - -endif diff --git a/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/cdbs/kde.mk b/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/cdbs/kde.mk deleted file mode 100644 index 765560c89..000000000 --- a/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/cdbs/kde.mk +++ /dev/null @@ -1,97 +0,0 @@ -# -*- mode: makefile; coding: utf-8 -*- -# Copyright © 2003 Christopher L Cheney -# Description: A class for KDE packages; sets KDE 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. - -_cdbs_scripts_path ?= /usr/lib/cdbs -_cdbs_rules_path ?= /usr/share/cdbs/1/rules -_cdbs_class_path ?= /usr/share/cdbs/1/class - -ifndef _cdbs_class_kde -_cdbs_class_kde := 1 - -# for dh_icons -CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4) - -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 - -include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) - -export kde_cgidir = \$${libdir}/cgi-bin -export kde_confdir = \$${sysconfdir}/trinity -export kde_htmldir = \$${datadir}/doc/tde/HTML - -ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) - cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,) -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) - -DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" -DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el - -$(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 - -cleanbuilddir:: - -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR)) - -common-build-arch common-build-indep:: debian/stamp-kde-apidox -debian/stamp-kde-apidox: - $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) - touch $@ - -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 - -for file in po/*pot; do \ - sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \ - done - -common-install-arch common-install-indep:: common-install-kde-apidox -common-install-kde-apidox:: - $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR)) - -clean:: - rm -f debian/stamp-kde-apidox - rm -rf po/*.pot - -# This is a convenience target for calling manually. It's not part of -# the build process. -buildprep: clean apply-patches - $(MAKE) -f admin/Makefile.common dist - debian/rules clean - -endif diff --git a/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/cdbs/team-members b/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/cdbs/team-members deleted file mode 100644 index 05761af6e..000000000 --- a/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/cdbs/team-members +++ /dev/null @@ -1,16 +0,0 @@ -Sune Vuorela -Ana Beatriz Guerrero Lopez -Fathi Boudra -Modestas Vainius -Josh Metzler -Isaac Clerencia -Adeodato Simó -Adeodato Simo -Christopher Martin -Daniel Schepler -Sarah Hobbs -Nacho Barrientos Arias -Ricardo Javier Cardenes Medina -Ricardo Cardenes -Armin Berres -Francesco Pedrini diff --git a/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/cdbs/uploaders.mk b/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/cdbs/uploaders.mk deleted file mode 100644 index 31adfe31e..000000000 --- a/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/cdbs/uploaders.mk +++ /dev/null @@ -1,29 +0,0 @@ - -MAINTAINER=Debian Qt/KDE Maintainers -UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog | grep -v "debian-qt-kde@lists.debian.org" | 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/compizconfig-backend-kconfig/debian/cdbs/versions.pl b/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/cdbs/versions.pl deleted file mode 100644 index 9ce11d8a3..000000000 --- a/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/cdbs/versions.pl +++ /dev/null @@ -1,19 +0,0 @@ -#!/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/-[^-]+$//; -($version2 = $version3) =~ s/\.[^.]+$//; - -($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e; -($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e; - -print "KDE-Version3=$version3\n"; -print "KDE-Version2=$version2\n"; -print "KDE-Next-Version3=$version3_next\n"; -print "KDE-Next-Version2=$version2_next\n"; diff --git a/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/changelog b/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/changelog deleted file mode 100644 index 3483239b4..000000000 --- a/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/changelog +++ /dev/null @@ -1,56 +0,0 @@ -compizconfig-backend-kconfig-trinity (0.8.4-0ubuntu1) lucid; urgency=low - - * Lucid rebuild - - -- Timothy Pearson Fri, 05 March 2010 12:31:00 -0600 - -compizconfig-backend-kconfig-trinity (0.7.4-0ubuntu5) karmic; urgency=low - - * Karmic rebuild - - -- Timothy Pearson Thu, 02 July 2009 16:08:00 -0600 - -compizconfig-backend-kconfig-trinity (0.7.4-0ubuntu3) intrepid; urgency=low - - * Moved Trinity to /opt/trinity - * Integrated properly with KDE4.2+ - - -- Timothy Pearson Fri, 06 March 2009 01:35:00 -0600 - -compizconfig-backend-kconfig-trinity (0.7.4-0ubuntu2) intrepid; urgency=low - - * Added -trinity prefix - - -- Timothy Pearson Mon, 01 Dec 2008 08:30:00 -0600 - -compizconfig-backend-kconfig (0.7.4-0ubuntu1) hardy; urgency=low - - * new upstream release - - -- Michael Vogt Sat, 05 Apr 2008 12:56:08 +0200 - -compizconfig-backend-kconfig (0.7.2-0ubuntu1) hardy; urgency=low - - * new upstream release - - -- Michael Vogt Fri, 07 Mar 2008 15:06:14 +0100 - -compizconfig-backend-kconfig (0.6.99+git20071127-0ubuntu1) hardy; urgency=low - - * renamed to match debian name - * new git HEAD snapshot - * update build depends - - -- Michael Vogt Tue, 27 Nov 2007 20:03:35 +0100 - -libcompizconfig-backend-kconfig (0.0+git20070912-0ubuntu1) gutsy; urgency=low - - * new git snapshot based on 0.6 branch - - -- Michael Vogt Fri, 10 Aug 2007 16:25:52 +0200 - -libcompizconfig-backend-kconfig (0.0+git20070703-0ubuntu1) gutsy; urgency=low - - * initial git snapshot - - -- Michael Vogt Tue, 03 Jul 2007 15:15:49 +0200 diff --git a/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/compat b/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/compat deleted file mode 100644 index 7ed6ff82d..000000000 --- a/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/compat +++ /dev/null @@ -1 +0,0 @@ -5 diff --git a/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/control b/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/control deleted file mode 100644 index 57cfdd8b3..000000000 --- a/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/control +++ /dev/null @@ -1,21 +0,0 @@ -Source: compizconfig-backend-kconfig-trinity -Section: libs -Priority: extra -Maintainer: Timothy Pearosn -Build-Depends: cdbs, debhelper (>= 5), compiz-trinity-dev, pkg-config, intltool, tdelibs4-trinity-dev, libcompizconfig0-trinity-dev, automake, autoconf, libtool, libltdl-dev -Standards-Version: 3.8.4 - -Package: compizconfig-backend-kconfig-trinity -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Replaces: compizconfig-backend-kconfig-trinity (<< 4:14.0.0) -Breaks: compizconfig-backend-kconfig-trinity (<< 4:14.0.0) -Conflicts: libcompizconfig-backend-kconfig-trinity -Description: KConfig [Trinity] Settings library for plugins - OpenCompositing Project - The OpenCompositing Project brings 3D desktop visual effects that improve - usability of the X Window System and provide increased productivity - through plugins and themes contributed by the community giving a - rich desktop experience. - . - This package contains the KConfig (Trinity) settings backend for - libcompizconfig. diff --git a/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/copyright b/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/copyright deleted file mode 100644 index 68f70d9c0..000000000 --- a/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/copyright +++ /dev/null @@ -1,58 +0,0 @@ -This package was debianized by Michael Vogt on -Mon, 28 Jun 2007 09:53:13 +0200. - -It was downloaded from git://anongit.opencompositing.org/fusion/compizconfig/compizconfig-backend-kconfig - -Upstream Authors: -Dennis Kasprzyk - -License: - * KDE libccs backend - * - * Copyright (c) 2006 Dennis Kasprzyk - * - * 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - -For the full license text, see /usr/share/common-licenses/GPL - - -The files acinclude.m4 and admin/acinclude.m4.in come with the -following license: - -dnl This file is part of the KDE libraries/packages -dnl Copyright (C) 1997 Janos Farkas (chexum@shadow.banki.hu) -dnl (C) 1997,98,99 Stephan Kulow (coolo@kde.org) - -dnl This file is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Library General Public -dnl License as published by the Free Software Foundation; either -dnl version 2 of the License, or (at your option) any later version. - -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Library General Public License for more details. - -dnl You should have received a copy of the GNU Library General Public License -dnl along with this library; see the file COPYING.LIB. If not, write to -dnl the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -dnl Boston, MA 02110-1301, USA. - -For the full license text, see /usr/share/common-licenses/LGPL - - -The Debian packaging is (C) 2007, Michael Vogt and -is licensed under the GPL, see `/usr/share/common-licenses/GPL'. - diff --git a/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/patches/.gitignore b/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/patches/.gitignore deleted file mode 100644 index e69de29bb..000000000 diff --git a/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/rules b/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/rules deleted file mode 100755 index 85efaa2fa..000000000 --- a/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/rules +++ /dev/null @@ -1,30 +0,0 @@ -#!/usr/bin/make -f - -include /usr/share/cdbs/1/rules/debhelper.mk -include debian/cdbs/kde.mk -include /usr/share/cdbs/1/rules/simple-patchsys.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 - -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - -post-patches:: debian/stamp-bootstrap - -debian/stamp-bootstrap: - ! [ -f /usr/share/libtool/ltmain.sh ] || \ - cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh - ! [ -f /usr/share/libtool/config/ltmain.sh ] || \ - cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh - cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in - - make -f admin/Makefile.common cvs - touch debian/stamp-bootstrap - diff --git a/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/source/format b/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/source/format deleted file mode 100644 index 89ae9db8f..000000000 --- a/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/source/format +++ /dev/null @@ -1 +0,0 @@ -3.0 (native) diff --git a/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/source/options b/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/source/options deleted file mode 100644 index 72f1f5450..000000000 --- a/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/source/options +++ /dev/null @@ -1,6 +0,0 @@ -# Use xz instead of gzip -compression = "xz" -compression-level = 9 - -# Don't run differences -diff-ignore = .* diff --git a/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/cdbs/buildvars.mk b/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/cdbs/buildvars.mk new file mode 100644 index 000000000..23d4709dc --- /dev/null +++ b/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/cdbs/buildvars.mk @@ -0,0 +1,86 @@ +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2002,2003 Colin Walters +# 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/compizconfig-backend-tdeconfig/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/cdbs/debian-qt-kde.mk new file mode 100644 index 000000000..311dc059d --- /dev/null +++ b/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/cdbs/debian-qt-kde.mk @@ -0,0 +1,109 @@ +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 + +# 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: + cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in + cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh + $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; + touch debian/stamp-cvs-make + +include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) +include debian/cdbs/uploaders.mk + +DEB_PATCHDIRS := debian/patches/common debian/patches + +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) + +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 + +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_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 + +clean:: + 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 + rm -f debian/stamp-cvs-make + +endif diff --git a/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/cdbs/kde.mk b/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/cdbs/kde.mk new file mode 100644 index 000000000..765560c89 --- /dev/null +++ b/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/cdbs/kde.mk @@ -0,0 +1,97 @@ +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2003 Christopher L Cheney +# Description: A class for KDE packages; sets KDE 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. + +_cdbs_scripts_path ?= /usr/lib/cdbs +_cdbs_rules_path ?= /usr/share/cdbs/1/rules +_cdbs_class_path ?= /usr/share/cdbs/1/class + +ifndef _cdbs_class_kde +_cdbs_class_kde := 1 + +# for dh_icons +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4) + +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 + +include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) + +export kde_cgidir = \$${libdir}/cgi-bin +export kde_confdir = \$${sysconfdir}/trinity +export kde_htmldir = \$${datadir}/doc/tde/HTML + +ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,) +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) + +DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" +DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el + +$(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 + +cleanbuilddir:: + -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR)) + +common-build-arch common-build-indep:: debian/stamp-kde-apidox +debian/stamp-kde-apidox: + $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) + touch $@ + +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 + -for file in po/*pot; do \ + sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \ + done + +common-install-arch common-install-indep:: common-install-kde-apidox +common-install-kde-apidox:: + $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR)) + +clean:: + rm -f debian/stamp-kde-apidox + rm -rf po/*.pot + +# This is a convenience target for calling manually. It's not part of +# the build process. +buildprep: clean apply-patches + $(MAKE) -f admin/Makefile.common dist + debian/rules clean + +endif diff --git a/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/cdbs/team-members b/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/cdbs/team-members new file mode 100644 index 000000000..05761af6e --- /dev/null +++ b/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/cdbs/team-members @@ -0,0 +1,16 @@ +Sune Vuorela +Ana Beatriz Guerrero Lopez +Fathi Boudra +Modestas Vainius +Josh Metzler +Isaac Clerencia +Adeodato Simó +Adeodato Simo +Christopher Martin +Daniel Schepler +Sarah Hobbs +Nacho Barrientos Arias +Ricardo Javier Cardenes Medina +Ricardo Cardenes +Armin Berres +Francesco Pedrini diff --git a/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/cdbs/uploaders.mk b/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/cdbs/uploaders.mk new file mode 100644 index 000000000..31adfe31e --- /dev/null +++ b/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/cdbs/uploaders.mk @@ -0,0 +1,29 @@ + +MAINTAINER=Debian Qt/KDE Maintainers +UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog | grep -v "debian-qt-kde@lists.debian.org" | 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/compizconfig-backend-tdeconfig/debian/cdbs/versions.pl b/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/cdbs/versions.pl new file mode 100644 index 000000000..9ce11d8a3 --- /dev/null +++ b/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/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/-[^-]+$//; +($version2 = $version3) =~ s/\.[^.]+$//; + +($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e; +($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e; + +print "KDE-Version3=$version3\n"; +print "KDE-Version2=$version2\n"; +print "KDE-Next-Version3=$version3_next\n"; +print "KDE-Next-Version2=$version2_next\n"; diff --git a/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/changelog b/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/changelog new file mode 100644 index 000000000..cabaf6e87 --- /dev/null +++ b/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/changelog @@ -0,0 +1,56 @@ +compizconfig-backend-tdeconfig-trinity (0.8.4-0ubuntu1) lucid; urgency=low + + * Lucid rebuild + + -- Timothy Pearson Fri, 05 March 2010 12:31:00 -0600 + +compizconfig-backend-tdeconfig-trinity (0.7.4-0ubuntu5) karmic; urgency=low + + * Karmic rebuild + + -- Timothy Pearson Thu, 02 July 2009 16:08:00 -0600 + +compizconfig-backend-tdeconfig-trinity (0.7.4-0ubuntu3) intrepid; urgency=low + + * Moved Trinity to /opt/trinity + * Integrated properly with KDE4.2+ + + -- Timothy Pearson Fri, 06 March 2009 01:35:00 -0600 + +compizconfig-backend-tdeconfig-trinity (0.7.4-0ubuntu2) intrepid; urgency=low + + * Added -trinity prefix + + -- Timothy Pearson Mon, 01 Dec 2008 08:30:00 -0600 + +compizconfig-backend-tdeconfig (0.7.4-0ubuntu1) hardy; urgency=low + + * new upstream release + + -- Michael Vogt Sat, 05 Apr 2008 12:56:08 +0200 + +compizconfig-backend-tdeconfig (0.7.2-0ubuntu1) hardy; urgency=low + + * new upstream release + + -- Michael Vogt Fri, 07 Mar 2008 15:06:14 +0100 + +compizconfig-backend-tdeconfig (0.6.99+git20071127-0ubuntu1) hardy; urgency=low + + * renamed to match debian name + * new git HEAD snapshot + * update build depends + + -- Michael Vogt Tue, 27 Nov 2007 20:03:35 +0100 + +libcompizconfig-backend-tdeconfig (0.0+git20070912-0ubuntu1) gutsy; urgency=low + + * new git snapshot based on 0.6 branch + + -- Michael Vogt Fri, 10 Aug 2007 16:25:52 +0200 + +libcompizconfig-backend-tdeconfig (0.0+git20070703-0ubuntu1) gutsy; urgency=low + + * initial git snapshot + + -- Michael Vogt Tue, 03 Jul 2007 15:15:49 +0200 diff --git a/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/compat b/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/compat new file mode 100644 index 000000000..7ed6ff82d --- /dev/null +++ b/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/compat @@ -0,0 +1 @@ +5 diff --git a/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/control b/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/control new file mode 100644 index 000000000..4cf6183e2 --- /dev/null +++ b/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/control @@ -0,0 +1,21 @@ +Source: compizconfig-backend-tdeconfig-trinity +Section: libs +Priority: extra +Maintainer: Timothy Pearosn +Build-Depends: cdbs, debhelper (>= 5), compiz-trinity-dev, pkg-config, intltool, tdelibs4-trinity-dev, libcompizconfig0-trinity-dev, automake, autoconf, libtool, libltdl-dev +Standards-Version: 3.8.4 + +Package: compizconfig-backend-tdeconfig-trinity +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Replaces: compizconfig-backend-tdeconfig-trinity (<< 4:14.0.0) +Breaks: compizconfig-backend-tdeconfig-trinity (<< 4:14.0.0) +Conflicts: libcompizconfig-backend-tdeconfig-trinity +Description: KConfig [Trinity] Settings library for plugins - OpenCompositing Project + The OpenCompositing Project brings 3D desktop visual effects that improve + usability of the X Window System and provide increased productivity + through plugins and themes contributed by the community giving a + rich desktop experience. + . + This package contains the KConfig (Trinity) settings backend for + libcompizconfig. diff --git a/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/copyright b/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/copyright new file mode 100644 index 000000000..61d8f8195 --- /dev/null +++ b/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/copyright @@ -0,0 +1,58 @@ +This package was debianized by Michael Vogt on +Mon, 28 Jun 2007 09:53:13 +0200. + +It was downloaded from git://anongit.opencompositing.org/fusion/compizconfig/compizconfig-backend-tdeconfig + +Upstream Authors: +Dennis Kasprzyk + +License: + * KDE libccs backend + * + * Copyright (c) 2006 Dennis Kasprzyk + * + * 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +For the full license text, see /usr/share/common-licenses/GPL + + +The files acinclude.m4 and admin/acinclude.m4.in come with the +following license: + +dnl This file is part of the KDE libraries/packages +dnl Copyright (C) 1997 Janos Farkas (chexum@shadow.banki.hu) +dnl (C) 1997,98,99 Stephan Kulow (coolo@kde.org) + +dnl This file is free software; you can redistribute it and/or +dnl modify it under the terms of the GNU Library General Public +dnl License as published by the Free Software Foundation; either +dnl version 2 of the License, or (at your option) any later version. + +dnl This library is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +dnl Library General Public License for more details. + +dnl You should have received a copy of the GNU Library General Public License +dnl along with this library; see the file COPYING.LIB. If not, write to +dnl the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +dnl Boston, MA 02110-1301, USA. + +For the full license text, see /usr/share/common-licenses/LGPL + + +The Debian packaging is (C) 2007, Michael Vogt and +is licensed under the GPL, see `/usr/share/common-licenses/GPL'. + diff --git a/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/patches/.gitignore b/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/patches/.gitignore new file mode 100644 index 000000000..e69de29bb diff --git a/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/rules b/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/rules new file mode 100755 index 000000000..85efaa2fa --- /dev/null +++ b/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/rules @@ -0,0 +1,30 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include debian/cdbs/kde.mk +include /usr/share/cdbs/1/rules/simple-patchsys.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 + +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + +post-patches:: debian/stamp-bootstrap + +debian/stamp-bootstrap: + ! [ -f /usr/share/libtool/ltmain.sh ] || \ + cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh + ! [ -f /usr/share/libtool/config/ltmain.sh ] || \ + cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh + cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in + + make -f admin/Makefile.common cvs + touch debian/stamp-bootstrap + diff --git a/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/source/format b/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/source/options b/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/source/options new file mode 100644 index 000000000..72f1f5450 --- /dev/null +++ b/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/source/options @@ -0,0 +1,6 @@ +# Use xz instead of gzip +compression = "xz" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/applications/digikam/debian/copyright b/ubuntu/maverick/applications/digikam/debian/copyright index 637b1fa8d..bc06dd076 100644 --- a/ubuntu/maverick/applications/digikam/debian/copyright +++ b/ubuntu/maverick/applications/digikam/debian/copyright @@ -136,7 +136,7 @@ digikam/ o digikam/digikam_export.h © 2005 Laurent Montel - o from kfiletip source copies (tdebase, konqueror) + o from tdefiletip source copies (tdebase, konqueror) © 1998, 1999 Torben Weis © 2000, 2001, 2002 David Faure o Concept copied from tdelibs/kio/kio/netaccess.h/cpp @@ -148,7 +148,7 @@ imageplugins/ © 2004-2005 by Gilles Caulier © 2004-2005 by Renchi Raju -kioslave/ +tdeioslave/ © 2003, 2004 by Renchi Raju libs/ diff --git a/ubuntu/maverick/applications/gwenview/debian/changelog b/ubuntu/maverick/applications/gwenview/debian/changelog index 25741414f..e78f7be52 100644 --- a/ubuntu/maverick/applications/gwenview/debian/changelog +++ b/ubuntu/maverick/applications/gwenview/debian/changelog @@ -85,7 +85,7 @@ gwenview (1.4.0~debian.1-1) unstable; urgency=low + Fixes focus switching. (Closes: #301812) * Clarify the package description, as displaying EXIF tags don't require - kdegaphics-kfile-plugins (but other features still do). (Closes: #368809) + kdegaphics-tdefile-plugins (but other features still do). (Closes: #368809) * This rebuild eliminates all references to obsolete libX*.la files. (Closes: #381323) @@ -95,7 +95,7 @@ gwenview (1.4.0~debian.1-1) unstable; urgency=low gwenview (1.3.1-3) unstable; urgency=low * Clarify the package description, as merely editing EXIF comments doesn't - strictly require tdegraphics-kfile-plugins. (Closes: #368809) + strictly require tdegraphics-tdefile-plugins. (Closes: #368809) -- Christopher Martin Sun, 28 May 2006 11:37:27 -0400 @@ -198,7 +198,7 @@ gwenview (1.1.4-1) unstable; urgency=low * New upstream release. * Rebuild against Qt 3.3, fixing the failure to exit properly from fullscreen mode. - * Added a recommends on tdegraphics-kfile-plugins, which enables the use of + * Added a recommends on tdegraphics-tdefile-plugins, which enables the use of EXIF comments. -- Christopher Martin Tue, 10 Aug 2004 18:37:33 -0400 diff --git a/ubuntu/maverick/applications/gwenview/debian/control b/ubuntu/maverick/applications/gwenview/debian/control index 781aec00d..a28fbdb19 100644 --- a/ubuntu/maverick/applications/gwenview/debian/control +++ b/ubuntu/maverick/applications/gwenview/debian/control @@ -11,7 +11,7 @@ Architecture: any Depends: ${shlibs:Depends} Replaces: gwenview-trinity (<< 4:14.0.0) Breaks: gwenview-trinity (<< 4:14.0.0) -Recommends: tdegraphics-kfile-plugins-trinity, kipi-plugins-trinity +Recommends: tdegraphics-tdefile-plugins-trinity, kipi-plugins-trinity Suggests: gwenview-i18n Description: image viewer for TDE Gwenview is an image viewer for the K Desktop Environment. It features a @@ -23,7 +23,7 @@ Description: image viewer for TDE Image loading is handled by the Qt library, so Gwenview supports all image formats your Qt installation supports. Gwenview correctly displays images with an alpha channel. Gwenview supports the displaying and editing of EXIF - comments, and, if the tdegraphics-kfile-plugins package is installed, other + comments, and, if the tdegraphics-tdefile-plugins package is installed, other image meta-information as well. Also supported is KIPI, the KDE Image Plugin Interface, a collection of helpful tools provided by the kipi-plugins package. The ability to perform lossless JPEG transforms is built in. diff --git a/ubuntu/maverick/applications/k3b/debian/changelog b/ubuntu/maverick/applications/k3b/debian/changelog index 77f899f3c..61061c0a5 100644 --- a/ubuntu/maverick/applications/k3b/debian/changelog +++ b/ubuntu/maverick/applications/k3b/debian/changelog @@ -85,7 +85,7 @@ k3b (1.0.5-2) unstable; urgency=low [ Francois Marier ] * Sync with Ubuntu - - Add kfile_k3b.so to k3b.install + - Add tdefile_k3b.so to k3b.install - libk3b3-extracodecs replaces libk3b2-extracodecs * Bump Standards-Version up to 3.8.0 (no changes) * Remove the KUBUNTU difference file @@ -133,7 +133,7 @@ k3b (1.0.5-1ubuntu1) intrepid; urgency=low kubuntu_111_advice_kubuntu_restricted_extras.diff and add "or kubuntu-restricted-extras."), - * Add libk3bffmpegdecoder.so to libk3b3.install - * Add kfile_k3b.so to k3b.install + * Add tdefile_k3b.so to k3b.install * libk3b3-extracodecs replaces libk3b2-extracodecs -- Jonathan Riddell Wed, 11 Jun 2008 17:32:09 +0000 @@ -776,7 +776,7 @@ k3b (0.12.14-0ubuntu2) dapper; urgency=low * Remove kubuntu_01_hide_k3bsetup.diff patch and replace it with kubuntu_06_hide_k3bsetup.diff: - - Remove NoDisplay=true to prevent hiding k3bsetup in kcmshell + - Remove NoDisplay=true to prevent hiding k3bsetup in tdecmshell (Closes: Malone #23007, KDE Bug #117455, Debian #353826) - Change the Category field so k3bsetup doesn't appear in the KDE menu (Was the goal of the original patch) diff --git a/ubuntu/maverick/applications/k3b/debian/k3b-trinity.install b/ubuntu/maverick/applications/k3b/debian/k3b-trinity.install index 8e0b27b98..a72c0b374 100644 --- a/ubuntu/maverick/applications/k3b/debian/k3b-trinity.install +++ b/ubuntu/maverick/applications/k3b/debian/k3b-trinity.install @@ -1,5 +1,5 @@ debian/tmp/opt/trinity/bin/* debian/tmp/opt/trinity/share/applications/* debian/k3b.xpm /opt/trinity/share/pixmaps/ -debian/tmp/opt/trinity/lib/trinity/kfile_k3b.so -debian/tmp/opt/trinity/lib/trinity/kfile_k3b.la +debian/tmp/opt/trinity/lib/trinity/tdefile_k3b.so +debian/tmp/opt/trinity/lib/trinity/tdefile_k3b.la diff --git a/ubuntu/maverick/applications/k3b/debian/k3b.install b/ubuntu/maverick/applications/k3b/debian/k3b.install index 72cf96bb3..134bb0bf2 100644 --- a/ubuntu/maverick/applications/k3b/debian/k3b.install +++ b/ubuntu/maverick/applications/k3b/debian/k3b.install @@ -1,5 +1,5 @@ debian/tmp/usr/bin/* debian/tmp/usr/share/applications/* debian/k3b.xpm usr/share/pixmaps/ -debian/tmp/usr/lib/trinity/kfile_k3b.so -debian/tmp/usr/lib/trinity/kfile_k3b.la +debian/tmp/usr/lib/trinity/tdefile_k3b.so +debian/tmp/usr/lib/trinity/tdefile_k3b.la diff --git a/ubuntu/maverick/applications/kile/debian/kile-trinity.install b/ubuntu/maverick/applications/kile/debian/kile-trinity.install index 52d706863..eb1b59da1 100644 --- a/ubuntu/maverick/applications/kile/debian/kile-trinity.install +++ b/ubuntu/maverick/applications/kile/debian/kile-trinity.install @@ -1,6 +1,6 @@ opt/trinity/bin/kile /opt/trinity/share/applications/tde/kile.desktop -/opt/trinity/share/apps/kconf_update +/opt/trinity/share/apps/tdeconf_update /opt/trinity/share/apps/kile /opt/trinity/share/config.kcfg/kile.kcfg /opt/trinity/share/doc/tde/HTML/en/kile diff --git a/ubuntu/maverick/applications/knemo/debian/changelog b/ubuntu/maverick/applications/knemo/debian/changelog index 884cc039e..7d52a6a0b 100644 --- a/ubuntu/maverick/applications/knemo/debian/changelog +++ b/ubuntu/maverick/applications/knemo/debian/changelog @@ -240,7 +240,7 @@ knemo (0.1.9-1) unstable; urgency=low for i[fw]config (instead of hardcoded path in *.cpp files) * added home page on kde-apps to control * Add to depends: tdelibs-bin (contains kded), kicker - * Add to recommends: kcontrol (contains kcmshell, kcontrol) + * Add to recommends: kcontrol (contains tdecmshell, kcontrol) * fixed version in VERSION file s/0.1.8/0.1.9/ * README: s/</, Mon, 17 Jan 2005 20:57:22 +1100 diff --git a/ubuntu/maverick/applications/koffice/debian/changelog b/ubuntu/maverick/applications/koffice/debian/changelog index f68f16811..8cbb6f1dc 100644 --- a/ubuntu/maverick/applications/koffice/debian/changelog +++ b/ubuntu/maverick/applications/koffice/debian/changelog @@ -228,7 +228,7 @@ koffice (1:1.6.3-3) unstable; urgency=high (Closes: #443673) * Add not-installed.list file to keep track of not installed files. * Add a missing dependency on kcontrol to kformula, in order to provide the - fonts kioslave. Thanks to Eike Hein for reporting. + fonts tdeioslave. Thanks to Eike Hein for reporting. -- Ana Beatriz Guerrero Lopez Wed, 26 Sep 2007 23:29:24 +0200 @@ -748,7 +748,7 @@ koffice (1:1.3.5-1) unstable; urgency=high - http://kde.org/info/security/advisory-20041223-1.txt References: CAN-2004-1125, DSA-619 * Added README.MimeType to most binary packages to explain how to fix - the missing MimeType error by running kbuildsycoca (closes: #288950). + the missing MimeType error by running tdebuildsycoca (closes: #288950). -- Ben Burton Mon, 17 Jan 2005 20:57:22 +1100 diff --git a/ubuntu/maverick/applications/koffice/debian/koffice-data-trinity.install b/ubuntu/maverick/applications/koffice/debian/koffice-data-trinity.install index cc7cbb4ac..4532ce445 100644 --- a/ubuntu/maverick/applications/koffice/debian/koffice-data-trinity.install +++ b/ubuntu/maverick/applications/koffice/debian/koffice-data-trinity.install @@ -69,10 +69,10 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/actions/sqrt.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/actions/sum.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/actions/under.png debian/tmp/opt/trinity/share/services/clipartthumbnail.desktop -debian/tmp/opt/trinity/share/services/kfile_abiword.desktop -debian/tmp/opt/trinity/share/services/kfile_gnumeric.desktop -debian/tmp/opt/trinity/share/services/kfile_koffice.desktop -debian/tmp/opt/trinity/share/services/kfile_ooo.desktop +debian/tmp/opt/trinity/share/services/tdefile_abiword.desktop +debian/tmp/opt/trinity/share/services/tdefile_gnumeric.desktop +debian/tmp/opt/trinity/share/services/tdefile_koffice.desktop +debian/tmp/opt/trinity/share/services/tdefile_ooo.desktop debian/tmp/opt/trinity/share/services/kformula_latex_export.desktop debian/tmp/opt/trinity/share/services/kformula_mathml_export.desktop debian/tmp/opt/trinity/share/services/kformula_mathml_import.desktop diff --git a/ubuntu/maverick/applications/koffice/debian/koffice-libs-trinity.install b/ubuntu/maverick/applications/koffice/debian/koffice-libs-trinity.install index 8d1ecc1d3..4be4f26eb 100644 --- a/ubuntu/maverick/applications/koffice/debian/koffice-libs-trinity.install +++ b/ubuntu/maverick/applications/koffice/debian/koffice-libs-trinity.install @@ -2,14 +2,14 @@ debian/tmp/opt/trinity/bin/koconverter debian/tmp/opt/trinity/bin/krossrunner debian/tmp/opt/trinity/lib/trinity/clipartthumbnail.la debian/tmp/opt/trinity/lib/trinity/clipartthumbnail.so -debian/tmp/opt/trinity/lib/trinity/kfile_abiword.la -debian/tmp/opt/trinity/lib/trinity/kfile_abiword.so -debian/tmp/opt/trinity/lib/trinity/kfile_gnumeric.la -debian/tmp/opt/trinity/lib/trinity/kfile_gnumeric.so -debian/tmp/opt/trinity/lib/trinity/kfile_koffice.la -debian/tmp/opt/trinity/lib/trinity/kfile_koffice.so -debian/tmp/opt/trinity/lib/trinity/kfile_ooo.la -debian/tmp/opt/trinity/lib/trinity/kfile_ooo.so +debian/tmp/opt/trinity/lib/trinity/tdefile_abiword.la +debian/tmp/opt/trinity/lib/trinity/tdefile_abiword.so +debian/tmp/opt/trinity/lib/trinity/tdefile_gnumeric.la +debian/tmp/opt/trinity/lib/trinity/tdefile_gnumeric.so +debian/tmp/opt/trinity/lib/trinity/tdefile_koffice.la +debian/tmp/opt/trinity/lib/trinity/tdefile_koffice.so +debian/tmp/opt/trinity/lib/trinity/tdefile_ooo.la +debian/tmp/opt/trinity/lib/trinity/tdefile_ooo.so debian/tmp/opt/trinity/lib/trinity/kodocinfopropspage.la debian/tmp/opt/trinity/lib/trinity/kodocinfopropspage.so debian/tmp/opt/trinity/lib/trinity/kofficescan.la diff --git a/ubuntu/maverick/applications/konversation/debian/changelog b/ubuntu/maverick/applications/konversation/debian/changelog index 69aa8c22f..dc4235d2d 100644 --- a/ubuntu/maverick/applications/konversation/debian/changelog +++ b/ubuntu/maverick/applications/konversation/debian/changelog @@ -1079,7 +1079,7 @@ konversation (0.13+20031123-1) experimental; urgency=low * debian/rules: + install examples/dcop-away.sh executable, as linda does not like it otherwise, and some other packages also do this (exim4, autotools, ...) - + make usr/share/apps/kconf_update/*.pl executable as well, for a similar + + make usr/share/apps/tdeconf_update/*.pl executable as well, for a similar reason (quiets lintian, and there is precedent for either way) -- Nathaniel W. Turner Sun, 23 Nov 2003 18:22:31 -0500 diff --git a/ubuntu/maverick/applications/konversation/debian/konversation-trinity.install b/ubuntu/maverick/applications/konversation/debian/konversation-trinity.install index 8a6cf218e..6b5aef496 100644 --- a/ubuntu/maverick/applications/konversation/debian/konversation-trinity.install +++ b/ubuntu/maverick/applications/konversation/debian/konversation-trinity.install @@ -1,6 +1,6 @@ debian/tmp/opt/trinity/bin/konversation debian/tmp/opt/trinity/share/applications/tde/konversation.desktop -debian/tmp/opt/trinity/share/apps/kconf_update/* +debian/tmp/opt/trinity/share/apps/tdeconf_update/* debian/tmp/opt/trinity/share/apps/konversation/eventsrc debian/tmp/opt/trinity/share/apps/konversation/konversationui.rc debian/tmp/opt/trinity/share/apps/konversation/scripts/* diff --git a/ubuntu/maverick/applications/tde-style-lipstik/debian/changelog b/ubuntu/maverick/applications/tde-style-lipstik/debian/changelog index 2010b4b10..ef19564bc 100644 --- a/ubuntu/maverick/applications/tde-style-lipstik/debian/changelog +++ b/ubuntu/maverick/applications/tde-style-lipstik/debian/changelog @@ -28,7 +28,7 @@ tde-style-lipstik (2.2.2-1) unstable; urgency=low * New upstream version - Added new automake1.9 dependency - - Created style/lipstik.moc and style/config/listikconf.moc + - Created style/lipstik.moc and style/config/listitdeconf.moc -- Bastian Venthur Thu, 24 May 2007 23:32:09 +0200 diff --git a/ubuntu/maverick/applications/tde-systemsettings/debian/changelog b/ubuntu/maverick/applications/tde-systemsettings/debian/changelog index 49bc830e9..3bcceb6ea 100644 --- a/ubuntu/maverick/applications/tde-systemsettings/debian/changelog +++ b/ubuntu/maverick/applications/tde-systemsettings/debian/changelog @@ -191,7 +191,7 @@ tde-systemsettings (0.0svn20060314-0ubuntu3) dapper; urgency=low tde-systemsettings (0.0svn20060314-0ubuntu2) dapper; urgency=low - * Add kubuntu_03_no_kbuildsycoca.diff, stop it running kbuildsycocoa + * Add kubuntu_03_no_tdebuildsycoca.diff, stop it running kbuildsycocoa during 'make install' -- Jonathan Riddell Wed, 15 Mar 2006 01:12:43 +0000 diff --git a/ubuntu/maverick/applications/tdesvn/debian/changelog b/ubuntu/maverick/applications/tdesvn/debian/changelog index 07180f154..9d928278f 100644 --- a/ubuntu/maverick/applications/tdesvn/debian/changelog +++ b/ubuntu/maverick/applications/tdesvn/debian/changelog @@ -54,7 +54,7 @@ tdesvn (1.0.2-1) unstable; urgency=low tdesvn (1.0.1-1) experimental; urgency=low * New upstream release. - * debian/patches/01-bashisms_kconf_update.patch + * debian/patches/01-bashisms_tdeconf_update.patch - Removed, merged upstream. * debian/patches/02-docimages.patch - Removed, fixed upstream. @@ -138,14 +138,14 @@ tdesvn (0.14.0-1) unstable; urgency=low * debian/tdesvn.menu - Change section to "Applications/Programming" to comply with the new menu spec. - * debian/patches/01-bashisms_kconf_update.patch - - Fix a bashism in the kconf_update script. + * debian/patches/01-bashisms_tdeconf_update.patch + - Fix a bashism in the tdeconf_update script. * debian/control - Use the new "Homepage:" field to specify the upstream URL. - SONAME bump, rename the libsvnqt3 package to libsvnqt4. * Rename libsvnqt3.install to libsvnqt4.install. * debian/tdesvn.install - - Install the kconf_update files. + - Install the tdeconf_update files. * debian/libsvnqt-dev.install - No longer install the libtool *.la files for libsvnqt. diff --git a/ubuntu/maverick/applications/tdesvn/debian/tdesvn-trinity.install b/ubuntu/maverick/applications/tdesvn/debian/tdesvn-trinity.install index fe0936b26..8903355a2 100644 --- a/ubuntu/maverick/applications/tdesvn/debian/tdesvn-trinity.install +++ b/ubuntu/maverick/applications/tdesvn/debian/tdesvn-trinity.install @@ -5,7 +5,7 @@ debian/tmp/opt/trinity/lib/trinity/tdesvnpart* debian/tmp/opt/trinity/share/apps/tdesvn/ debian/tmp/opt/trinity/share/apps/tdesvnpart/ debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/ -debian/tmp/opt/trinity/share/apps/kconf_update/ +debian/tmp/opt/trinity/share/apps/tdeconf_update/ debian/tmp/opt/trinity/share/icons/ debian/tmp/opt/trinity/share/locale/*/LC_MESSAGES/*.mo debian/tmp/opt/trinity/share/config.kcfg/ diff --git a/ubuntu/maverick/applications/tdmtheme/debian/tdmtheme.lintian-overrides b/ubuntu/maverick/applications/tdmtheme/debian/tdmtheme.lintian-overrides index 5ad21ad51..f1c2df0c2 100644 --- a/ubuntu/maverick/applications/tdmtheme/debian/tdmtheme.lintian-overrides +++ b/ubuntu/maverick/applications/tdmtheme/debian/tdmtheme.lintian-overrides @@ -1,5 +1,5 @@ # provided by tdelibs -tdmtheme: desktop-command-not-in-package ./usr/share/applications/tde/tdmtheme.desktop kcmshell +tdmtheme: desktop-command-not-in-package ./usr/share/applications/tde/tdmtheme.desktop tdecmshell # kcontrol module tdmtheme: desktop-entry-invalid-category X-TDE-settings-system ./usr/share/applications/tde/tdmtheme.desktop tdmtheme: desktop-entry-lacks-main-category ./usr/share/applications/tde/tdmtheme.desktop -- cgit v1.2.3