Housekeeping in Debian and Ubuntu

18 files changed, 0 insertions, 1173 deletions

diff --git a/ubuntu/maverick_automake/libraries/libkipi/debian/README.Debian b/ubuntu/maverick_automake/libraries/libkipi/debian/README.Debian
deleted file mode 100644
index b0302c211..000000000
--- a/ubuntu/maverick_automake/libraries/libkipi/debian/README.Debian
+++ /dev/null
@@ -1,107 +0,0 @@
-Debian kde-extras Team
-----------------------
-
-1. Contacts
------------
-
-General help requests
-	<debian-kde@lists.debian.org>	mailing list
-	#debian-kde			on irc
-
-Packaging queries
-	<debian-qt-kde@lists.debian.org>  mailing list
-	#debian-qt-kde			  on irc
-
-Maintainers
-	<pkg-kde-extras@lists.alioth.debian.org>	mailing list
-
-
-2. Subversion repository
-------------------------
-  
-You can browse it only at:
-
-http://svn.debian.org/wsvn/pkg-kde/kde-extras/
-
-To "checkout" the repository use these commands:
-
-	$ svn co svn+ssh://${ALIOTH_USERNAME}@svn.debian.org/svn/pkg-kde/kde-extras
-
-Authorized SSH keys are controlled at https://alioth.debian.org/account/
-
-The repository layout is:
-
-- packagename/
-    - trunk/
-    - branches/
-    - tags/
-        - 0.7.2-1/
-        - 0.7.2-2/
-        - 0.7.2-2ubuntu1/
-        - 0.7.2-2ubuntu2/
-        - 0.7.2-2ubuntu3/
-        - 0.8.0/
-        ...
-
-If only one version of the package is available at the time, development must 
-be made at trunk/ dir, copying the dir to tags/'pkg-version' each time a new 
-release is made.
-
-When, at some point, the need to have two different versions at the same time 
-arises (for example, if we need a version to be in unstable and a different one
-to be in experimental), experimental development will be made in trunk/ and 
-if a new unstable package needs to be cooked, copying 
-tag/'latest_version_in_sid' to tag/'latest_version_in_sid'+1 will make the
-trick.
-
-3. Using svn-buildpackage
---------------------------
-
-Packages with an upstream tarball will require you to set the mergeWithUpstream
-property first (from the package root) so that svn-buildpackage will look for
-the .orig.tar.gz in the ../tarballs directory.
-	
-	% svn propset mergeWithUpstream 1 debian
-
-Please note that this only works for packages which have only the debian/
-directory committed. Consequently, you must use CDBS's simple-patchsys.mk or
-dpatch to modify the upstream sources.
-
-After you have finished and committed your Debian patches via
-	
-	% svn commit [PACKAGE]
-
-as well as copying the orig.tar.gz to ../tarballs/ if necessary, you may build
-your package with the following commands:
-
-	% svn-buildpackage --svn-ignore-new -rfakeroot
-
-Please, don't commit tarballs/ or build-area/ directories to SVN.
-
-4. Tarballs and Build-area directories
-------------------------------------
-
-During pkg development before uploaded to debian the tarballs can be found at:
-
-	http://pkg-kde.alioth.debian.org/kde-extra/orig.tar.gz/
-
-You need to place those dirs in the parent directory of the one from which you're 
-running svn-buildpackage. Usually this means placing tarballs/ and build-area/ dirs 
-in 'pkgname'/ dir, at the same level as trunk/
-
-If you want to compile inside one version in tags/ dir, you'll need to place those
-dirs inside that dir. Of course the easiest and cleanest way of doing it is 
-by making a symlink of those dirs inside tags/ dir.
-
-5. Using svn-inject
--------------------
-
-To inject a new package into the Debian KDE Extras svn archive you should use svn-inject(1)
-as follows:
-
-        svn-inject -o <package>.dsc svn+ssh://${ALIOTH_USERNAME}@svn.debian.org/svn/pkg-kde/kde-extras
-
-Type in your alioth password a few hundred times :-) and your package should be
-uploaded to the archive.  Note you will also need to manually copy the
-package.orig.tar.gz to your tarballs directory.  The -o option is important as
-this ensures that we 'Only keep modified files under SVN control'
diff --git a/ubuntu/maverick_automake/libraries/libkipi/debian/TODO b/ubuntu/maverick_automake/libraries/libkipi/debian/TODO
deleted file mode 100644
index 383c04cea..000000000
--- a/ubuntu/maverick_automake/libraries/libkipi/debian/TODO
+++ /dev/null
@@ -1,8 +0,0 @@
-o check for doxygen docs -> -dev pkg (+ add to build deps)
-o add -dbg pkg
-o for parallel libkipi1 libkipi2 installs (see libkexif):
-	o append soname to msg catalog
-	o add a note in dev package about the renamed msg catalog
-	o check rdepends for addcatalogs(libkipi) calls and file
-	  bug reports if necessary
-__END__
diff --git a/ubuntu/maverick_automake/libraries/libkipi/debian/cdbs/buildvars.mk b/ubuntu/maverick_automake/libraries/libkipi/debian/cdbs/buildvars.mk
deleted file mode 100644
index 23d4709dc..000000000
--- a/ubuntu/maverick_automake/libraries/libkipi/debian/cdbs/buildvars.mk
+++ /dev/null
@@ -1,86 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2002,2003 Colin Walters <walters@debian.org>
-# 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_automake/libraries/libkipi/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick_automake/libraries/libkipi/debian/cdbs/debian-qt-kde.mk
deleted file mode 100644
index 2be8f97f1..000000000
--- a/ubuntu/maverick_automake/libraries/libkipi/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/kde3/share/doc/kde/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/kde3/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/kde3/share/doc/kde/HTML/en/$$pkg; \
-		/opt/kde3/bin/meinproc $(DEB_DESTDIR)/opt/kde3/share/doc/kde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/kde3/share/doc/kde/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_automake/libraries/libkipi/debian/cdbs/kde.mk b/ubuntu/maverick_automake/libraries/libkipi/debian/cdbs/kde.mk
deleted file mode 100644
index 21965ceef..000000000
--- a/ubuntu/maverick_automake/libraries/libkipi/debian/cdbs/kde.mk
+++ /dev/null
@@ -1,97 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# 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}/kde3
-export kde_htmldir = \$${datadir}/doc/kde/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/kde3/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_automake/libraries/libkipi/debian/cdbs/team-members b/ubuntu/maverick_automake/libraries/libkipi/debian/cdbs/team-members
deleted file mode 100644
index 05761af6e..000000000
--- a/ubuntu/maverick_automake/libraries/libkipi/debian/cdbs/team-members
+++ /dev/null
@@ -1,16 +0,0 @@
-Sune Vuorela <debian@pusling.com>
-Ana Beatriz Guerrero Lopez <ana@debian.org>
-Fathi Boudra <fboudra@free.fr>
-Modestas Vainius <geromanas@mailas.com>
-Josh Metzler <joshdeb@metzlers.org>
-Isaac Clerencia <isaac@debian.org>
-Adeodato Simó <dato@net.com.org.es>
-Adeodato Simo <dato@net.com.org.es>
-Christopher Martin <chrsmrtn@debian.org>
-Daniel Schepler <schepler@debian.org>
-Sarah Hobbs <hobbsee@ubuntu.com>
-Nacho Barrientos Arias <nacho@debian.org>
-Ricardo Javier Cardenes Medina <rcardenes@debian.org>
-Ricardo Cardenes <rcardenes@debian.org>
-Armin Berres <trigger+debian@space-based.de>
-Francesco Pedrini <francesco.pedrini@gmail.com>
diff --git a/ubuntu/maverick_automake/libraries/libkipi/debian/cdbs/uploaders.mk b/ubuntu/maverick_automake/libraries/libkipi/debian/cdbs/uploaders.mk
deleted file mode 100644
index 31adfe31e..000000000
--- a/ubuntu/maverick_automake/libraries/libkipi/debian/cdbs/uploaders.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-
-MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
-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_automake/libraries/libkipi/debian/cdbs/versions.pl b/ubuntu/maverick_automake/libraries/libkipi/debian/cdbs/versions.pl
deleted file mode 100644
index 9ce11d8a3..000000000
--- a/ubuntu/maverick_automake/libraries/libkipi/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_automake/libraries/libkipi/debian/changelog b/ubuntu/maverick_automake/libraries/libkipi/debian/changelog
deleted file mode 100644
index e2d23fe78..000000000
--- a/ubuntu/maverick_automake/libraries/libkipi/debian/changelog
+++ /dev/null
@@ -1,236 +0,0 @@
-libkipi-kde3 (0.1.5-3intrepid0) karmic; urgency=low
-
-  * Karmic rebuild
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 02 July 2009 16:08:00 -0600
-
-libkipi-kde3 (0.1.5-2intrepid6) jaunty; urgency=low
-
-  * Jaunty rebuild
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Tue, 28 April 2009 13:23:00 -0600
-
-libkipi-kde3 (0.1.5-2intrepid5) intrepid; urgency=low
-
-  * Moved KDE3 to /opt/kde3
-  * Integrated properly with KDE4.2+
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 05 March 2009 01:11:00 -0600
-
-libkipi-kde3 (0.1.5-2intrepid3) intrepid; urgency=low
-
-  [ Timothy Pearson ]
-  * Added -kde3 prefix
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Tue,  2 Dec 2008 01:33:00 -0600
-
-libkipi (0.1.5-2) unstable; urgency=low
-
-  [ Mark Purcell ]
-  * Merge branches/experimental with trunk and upload 1.5 to unstable
-  * libkipi-dev Depends: pkg-config
-
- -- Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>  Sat,  3 Mar 2007 18:17:38 +0000
-
-libkipi (0.1.5-1) experimental; urgency=low
-
-  * New upstream release
-
-  [ Mark Purcell ]
-  * Add Build-Depends: autotools-dev
-
-  [ Achim Bohnet ]
-  * Relibtoolization patches:
-    + remove patches/05_pedantic-errors.diff. No need to be more pedantic than
-      upstream.
-    + remove patches/10_aclocal.m4_update.diff, debian/patches/99_only_-lqt-mt.diff
-      no longer necessary
-    + regenerate patches/98_buildpref.diff and patches/98_configure.diff
-  * Set standards-version to 3.7.2.  No changes necessary.
-  * Add XS-Vcs-Svn and XS-Vcs-Browser info to debian/control
-  * Long description: update homepage URL to new http://www.kipi-plugins.org/
-    site
-  * Check sources for licenses/copyrights. No changes in debian/copyright
-    necessary.
-
- -- Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>  Fri, 29 Dec 2006 14:34:34 +0100
-
-libkipi (0.1.4-1) unstable; urgency=low
-
-  [ Achim Bohnet ]
-  * new upstream release.  Fixes FTBFS on first installation.
-  * Remove 11_kdesvn_r540613_fix_include_path.diff.  Included upstream
-  * Remove 06_disable_no_undefined.diff. Not needed. Pkg is properly
-    relibtoolized
-  * Update relibtoolization patches: 98_buildprep.diff 99_only_-lqt-mt.diff
-
- -- Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>  Tue, 16 May 2006 20:55:30 +0200
-
-libkipi (0.1.3-2) unstable; urgency=low
-
-  [ Achim Bohnet ]
-  * Add 11_kdesvn_r540613_fix_include_path.diff.  Closes: #366933: libkipi -
-    FTBFS: error: libkipi/interface.h: No such file or directory
-
- -- Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>  Sun, 14 May 2006 11:03:25 +0200
-
-libkipi (0.1.3-1) unstable; urgency=low
-
-  [ Mark Purcell ]
-  * New upstream release
-  * Relibtoolize from /pkg-kde/trunk/common-patches/ for 3.5.2
-  * Dropped from debian/patches (seems OK)
-      + 08_disable-visibility.diff
-
-   [ Achim Bohnet ]
-   o Update 98_buildprep.diff
-   o Replace 10_link_to_right_libs.diff with 99_only_-lqt-mt.diff
-     Relibtoolization patch was accepted upstream, except for LIB_QT hack.
-     Now patch configure to hardcode LIB_QT to -lqt-mt instead of
-     patching every Makefile.am/.in.
-
- -- Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>  Tue,  9 May 2006 22:45:55 +0100
-
-libkipi (0.1.2-4) unstable; urgency=low
-
-  [ Mark Purcell ]
-  * Rebuild for libXrender.la
-  * Package needs to be rebuilt against new version of libxrender-dev.
-    Cannot build KphotoAlbum against it. (Closes: #363918)
-
- -- Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>  Thu, 20 Apr 2006 18:30:51 +0100
-
-libkipi (0.1.2-3) unstable; urgency=low
-
-  [ Achim Bohnet ]
-  * relibtoolize libkipi:
-      + Closes #304336 libkipi_0.1.1-2(GNU/k*BSD): FTBFS: out of date
-        libtool scripts
-      + use tool/patches of Debian Qt/KDE Team packages: patches/0*.diff
-      + update 03_libtool_update.diff to libtool 1.5.20-2
-      + debian/rules: add buildprep rule to recreate the buildpref diff
-      + add 06_aclocal_update.diff: aclocal.m4 gets recreated after each
-        new buildprep diff
-      + patches/10_link_to_right_libs.diff: add missing libraries -lkdecore
-        -lqt-mt
-    Result: libkipi0 now depends on 5 instead of 25 packages
-  * remove unnecessary build dependency on libimlib2-dev
-
- -- Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>  Wed, 28 Dec 2005 00:07:03 +0100
-
-libkipi (0.1.2-2) unstable; urgency=low
-
-  [ Mark Purcell ]
-  * Add debian/watch: sf.net kipi project will be used for
-    future releases
-
-  [ Achim Bohnet ]
-  * 2nd g++ v4 ABI change: Because we already depend on kdelibs4c2a,
-    remove c2 that was unnecessarily introduced for the 1st g++ v4.0
-    ABI change.  Now backporting and sync with kunbuntu needs no
-    source changes again.
-  * rules:
-      + use utils.mk from cdbs instead of calling dh_install with
-        --list-missing
-      + remove unnecessary --disable-debug configure option
-      + build with --enable-final
-  * Temporarily Build-Depend on kdelibs4-dev (>= 4:3.4.3-2) to make
-    sure we build against kdelibs4c2a
-
- -- Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>  Fri,  2 Dec 2005 15:49:45 +0100
-
-libkipi (0.1.2-1) unstable; urgency=low
-
-  * New upstream release
-  * Pkg now maintained by Debian KDE Extras Team
-
-  +++ Changes by Achim Bohnet:
-
-  * remove versioned build-dependency of kdelibs4-dev now that
-    it's build on all archs with new C++ ABI.
-  * patches/00_fix-home-page-url.patch removed. Fixed upstream.
-  * updated debian/copyright for 0.1.2 tarball
-
- -- Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>  Thu, 15 Sep 2005 02:29:15 +0200
-
-libkipi (0.1.1-4) unstable; urgency=low
-
-  * Conflicts:/ Replaces: libkipi0
-  * libkipi0-dev Depends: libkipi0c2
-
- -- Mark Purcell <msp@debian.org>  Fri, 19 Aug 2005 17:49:41 +0100
-
-libkipi (0.1.1-3) unstable; urgency=low
-
-  * C++ transition package
-  * Upgrade Build-Depends: kdelibs4-dev (>= 3.4.2-1)
-  * Uploaders: Achim Bohnet <ach@mpe.mpg.de>, Mark Purcell
-    <msp@debian.org>
-
- -- Mark Purcell <msp@debian.org>  Thu, 18 Aug 2005 17:52:32 +0100
-
-libkipi (0.1.1-2) unstable; urgency=low
-
-  * debian/copyright: fix typo
-
- -- Achim Bohnet <ach@mpe.mpg.de>  Thu, 10 Mar 2005 01:52:32 +0100
-
-libkipi (0.1.1-1) unstable; urgency=low
-
-  * new upstream release
-  * control: removed unused misc:Depends var
-  * control: update homepage URL (closes: #294947)
-  * updated debian/copyright
-  * fix homepage URL in About dialogs (use simplepatchsys)
-
- -- Achim Bohnet <ach@mpe.mpg.de>  Mon, 14 Feb 2005 22:16:20 +0100
-
-libkipi (0.1-2~kalyxo1) unstable; urgency=low
-
-  * Initial upload (Closes: #280439)
-  * get rid of debug output (configure with --disable-debug)
-
- -- Achim Bohnet <ach@mpe.mpg.de>  Tue,  9 Nov 2004 23:31:13 +0100
-
-libkipi (0.1-1) unstable; urgency=low
-
-  * control: remove libkexif0-dev build dependency
-  * libkipi/Makefile.am: fix compilation without libkipi0-dev
-  	installed
-  * change distribtion to unstable
-
- -- Achim Bohnet <ach@mpe.mpg.de>  Tue, 19 Oct 2004 00:48:03 +0200
-
-libkipi (0.1-0) experimental; urgency=low
-
-  * first upstream release
-  * added homepage URL to extended description
-  * add translation to libkipi0 deb
-  * main.cpp: fix URL
-  * copyright: mention the 3 GPL files, rest LGPL
-  * install libkipi/design as doc to -dev pkgs
-
- -- Achim Bohnet <ach@mpe.mpg.de>  Sun, 17 Oct 2004 00:50:36 +0200
-
-libkipi (0.0.cvs20040802-1) experimental; urgency=low
-
-  * sync with cvs
-  * fix libkexif.install to install icons servicetypes and apps dirs
-
- -- Achim Bohnet <ach@mpe.mpg.de>  Tue,  3 Aug 2004 01:18:47 +0200
-
-libkipi (0.0.cvs20040726-1) experimental; urgency=low
-
-  * rebuild against new libkexif (should fix rpath stuff)
-  * all build-deps on one line (lintian)
-  * use configure --disable-rpath 
-
- -- Achim Bohnet <ach@mpe.mpg.de>  Mon, 26 Jul 2004 21:42:03 +0200
-
-libkipi (0.0.cvs20040721-1) unstable; urgency=low
-
-  * Initial Release
-  * WARNING experimental pkg!
-
- -- Achim Bohnet <ach@mpe.mpg.de>  Wed, 21 Jul 2004 01:25:11 +0200
-
diff --git a/ubuntu/maverick_automake/libraries/libkipi/debian/compat b/ubuntu/maverick_automake/libraries/libkipi/debian/compat
deleted file mode 100644
index b8626c4cf..000000000
--- a/ubuntu/maverick_automake/libraries/libkipi/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-4
diff --git a/ubuntu/maverick_automake/libraries/libkipi/debian/control b/ubuntu/maverick_automake/libraries/libkipi/debian/control
deleted file mode 100644
index 009ca465d..000000000
--- a/ubuntu/maverick_automake/libraries/libkipi/debian/control
+++ /dev/null
@@ -1,38 +0,0 @@
-Source: libkipi-kde3
-Section: libs
-Priority: optional
-Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Uploaders: Achim Bohnet <ach@mpe.mpg.de>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>> 4.1), libexif-dev, kdelibs4-kde3-dev (>= 4:3.4.3-2), automake1.11-kde3, autoconf2.63, libtool, libltdl-dev
-Standards-Version: 3.8.3
-
-Package: libkipi0-kde3-dev
-Provides: libkipi-kde3-dev
-Conflicts: libkipi-kde3-dev
-Section: libdevel
-Architecture: any
-Depends: libkipi0-kde3 (= ${Source-Version}), pkg-config
-Description: library for apps that want to use kipi-plugins (development version) [KDE3]
- Libkipi is a library
- .
-     o that contains common routines and widget used by kipi-plugins
-     o to ease implementation of the kipi-plugins interface in an application
-       that wants to use kipi-plugins
- .
- This pkg contains development files and documentation for libkipi library.
- .
- Homepage: http://www.kipi-plugins.org/
-
-Package: libkipi0-kde3
-Conflicts: libkipi0c2-kde3
-Section: libs
-Architecture: any
-Depends: ${shlibs:Depends}
-Description: library for apps that want to use kipi-plugins (runtime version) [KDE3]
- Libkipi is a library
- .
-     o that contains common routines and widget used by kipi-plugins
-     o to ease implementation of the kipi-plugins interface in an application
-       that wants to use kipi-plugins
- .
- Homepage: http://extragear.kde.org/apps/kipi
diff --git a/ubuntu/maverick_automake/libraries/libkipi/debian/control.in b/ubuntu/maverick_automake/libraries/libkipi/debian/control.in
deleted file mode 100644
index bdd9b4f6c..000000000
--- a/ubuntu/maverick_automake/libraries/libkipi/debian/control.in
+++ /dev/null
@@ -1,39 +0,0 @@
-Source: libkipi-kde3
-Section: libs
-Priority: optional
-Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-XSBC-Original-Maintainer: @@@MAINTAINER@@@
-Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs, debhelper (>> 4.1), libexif-dev, kdelibs4-kde3-dev (>= 4:3.4.3-2), autotools-dev
-Standards-Version: 3.8.3
-
-Package: libkipi0-kde3-dev
-Provides: libkipi-kde3-dev
-Conflicts: libkipi-kde3-dev
-Section: libdevel
-Architecture: any
-Depends: libkipi0-kde3 (= ${Source-Version}), pkg-config
-Description: library for apps that want to use kipi-plugins (development version) [KDE3]
- Libkipi is a library
- .
-     o that contains common routines and widget used by kipi-plugins
-     o to ease implementation of the kipi-plugins interface in an application
-       that wants to use kipi-plugins
- .
- This pkg contains development files and documentation for libkipi library.
- .
- Homepage: http://www.kipi-plugins.org/
-
-Package: libkipi0-kde3
-Conflicts: libkipi0c2-kde3
-Section: libs
-Architecture: any
-Depends: ${shlibs:Depends}
-Description: library for apps that want to use kipi-plugins (runtime version) [KDE3]
- Libkipi is a library
- .
-     o that contains common routines and widget used by kipi-plugins
-     o to ease implementation of the kipi-plugins interface in an application
-       that wants to use kipi-plugins
- .
- Homepage: http://extragear.kde.org/apps/kipi
diff --git a/ubuntu/maverick_automake/libraries/libkipi/debian/copyright b/ubuntu/maverick_automake/libraries/libkipi/debian/copyright
deleted file mode 100644
index 46dc95db6..000000000
--- a/ubuntu/maverick_automake/libraries/libkipi/debian/copyright
+++ /dev/null
@@ -1,327 +0,0 @@
-This package was debianized by Achim Bohnet on
-Tue, 21 Jul 2004 01:29:01 +0200.
-
-Upstream authors are the 'KIPI Team' (from AUTHORS file):
-
-    Renchi Raju     <renchi at pooh.tam.uiuc.edu>
-    Caulier Gilles  <caulier dot gilles at free.fr>
-    Jesper K. Pedersen <blackie at kde.org>
-    Aurelien Gateau <aurelien dot gateau at free.fr>
-
-
-Copyrights:
-
-    Copyright 2004 by the KIPI team
-    Copyright 2004 by Renchi Raju
-    Copyright 2004 by Jesper K. Pedersen
-    Copyright (C) 2002-2004 Renchi Raju <renchi at pooh.tam.uiuc.edu>
-                            Gilles CAULIER <caulier dot gilles at free.fr>
-                            Jesper K. Pedersen <blackie at kde.org>
-                            Aurelien Gateau <aurelien dot gateau at free.fr>
-    Copyright (C) 2003,2004 Gilles Caulier <caulier dot gilles at free.fr>
-    Copyright (C) 2001-2005 Klarälvdalens Datakonsult AB
-    Copyright (c) 2005 Laurent Montel <montel@kde.org>
-
-
-
-Licenses:
-
-version.h:
-
-    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.
-
-
-KDStream.cpp, KDStream.h are dual licensed: GPL V2 or
-'KD Tools Commercial License':
-
-
-    This file may be distributed and/or modified under the terms of the
-    GNU General Public License version 2 as published by the Free Software
-    Foundation and appearing in the file LICENSE.GPL included in the
-    packaging of this file.
-
-    Licensees holding valid commercial KD Tools licenses may use this file in
-    accordance with the KD Tools Commercial License Agreement provided with
-    the Software.
-
-    This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-    WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-
-    See http://www.klaralvdalens-datakonsult.se/?page=products for
-      information about KD Tools Commercial License Agreements.
-
-    Contact info@klaralvdalens-datakonsult.se if any conditions of this
-    licensing are not clear to you.
-
-
-the GNU General Public License version 2 can be found at
-/usr/share/common-licenses/GPL-2.
-
-KDTools-License-US:
-
-    KD Tools COMMERCIAL LICENSE AGREEMENT
-    FOR COMMERCIAL VERSIONS
-    March 27, 2002
-    
-    
-    IMPORTANT-READ CAREFULLY: This Klarälvdalens Datakonsult AB End-User
-    License Agreement ("EULA") is a legal agreement between you (either an
-    individual or a legal entity) and Klarälvdalens Datakonsult AB
-    ("KDAB") for the Klarälvdalens Datakonsult AB software product(s)
-    accompanying this EULA, which include(s) computer software and may
-    include "online" or electronic documentation, associated media, and
-    printed materials ("Licensed Product").
-    
-    The Licensed Product is protected by copyright laws and international
-    copyright treaties, as well as other intellectual property laws and
-    treaties. The Licensed Product is licensed, not sold.
-    
-    By installing, copying, or otherwise using the Licensed Product, you
-    agree to be bound by the terms of this EULA. If you do not agree to
-    the terms of this EULA, do not install, copy, or otherwise use the
-    Licensed Product; you may, however, return it to your place of
-    purchase for a full refund. In addition, by installing, copying, or
-    otherwise using any updates or other components of the Licensed
-    Product that you receive separately as part of the Licensed Product
-    ("Updates"), you agree to be bound by any additional license terms
-    that accompany such Updates. If you do not agree to the additional
-    license terms that accompany such Updates, you may not install, copy,
-    or otherwise use such Updates.
-    
-    Upon your acceptance of the terms and conditions of this EULA, KDAB
-    grants you the right to use the Licensed Product in the manner
-    provided below.
-    
-    KDAB grants to you as an individual a personal, nonexclusive,
-    nontransferable license to make and use copies of the Licensed Product
-    for the sole purposes of designing, developing, and testing your
-    software product(s) ("Applications"). You may install copies of the
-    Licensed Product on an unlimited number of computers provided that you
-    are the only individual using the Licensed Product. If you are an
-    entity, KDAB grants you the right to designate one, and only one,
-    individual within your organization who shall have the sole right to
-    use the Licensed Product in the manner provided above.  You may at any
-    time, but not more frequently that once every six (6) months,
-    designate another individual to replace the current designated user by
-    notifying KDAB, so long as there is no more than one designated user
-    at any given time.
-    
-    
-    GENERAL TERMS THAT APPLY TO APPLICATIONS AND REDISTRIBUTABLES 
-    KDAB grants you a nonexclusive, royalty-free right to reproduce and
-    distribute the object code form of any portion of the Licensed Product
-    ("Redistributables") for execution on any operating system of a type
-    listed in the License Certificate ("Platforms"). Copies of
-    Redistributables may only be distributed with and for the sole purpose
-    of executing Applications permitted under this License Agreement that
-    you have created using the Licensed Product.  Under no circumstances
-    may any copies of Redistributables be distributed separately.
-    
-    The license granted in this EULA for you to create your own
-    Applications and distribute them and the Redistributables (if any) to
-    your customers is subject to all of the following conditions: (i) all
-    copies of the Applications you create must bear a valid copyright
-    notice, either your own or the copyright notice that appears on the
-    Licensed Product; (ii) you may not remove or alter any copyright,
-    trademark or other proprietary rights notice contained in any portion
-    of the Licensed Product; (iii) Redistributables, if any, shall be
-    licensed to your customer "as is" (KDAB MAKES NO WARRANTIES OR
-    REPRESENTATIONS VIS-A-VIS YOUR CUSTOMER WITH RESPECT TO
-    REDISTRIBUTABLES, AND KDAB EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES
-    VIS-A-VIS YOUR CUSTOMER, WHETHER EXPRESS OR IMPLIED, ORAL OR WRITTEN,
-    INCLUDING, BUT NOT LIMITED TO ANY IMPLIED WARRANTY OF MERCHANTABILITY
-    OR FITNESS FOR ANY PARTICULAR PURPOSE, WHETHER OR NOT KDAB KNOWS, HAS
-    REASON TO KNOW, HAS BEEN ADVISED OR IS OTHERWISE AWARE OF SUCH
-    PURPOSE); (iv) you will indemnify and hold KDAB, its related companies
-    and its suppliers, harmless from and against any claims or liabilities
-    arising out of the use, reproduction or distribution of your
-    Applications; (v) your Applications must be written using a licensed,
-    registered copy of the Licensed Product; (vi) your Applications must
-    add primary and substantial functionality to the Licensed Product;
-    (vii) your Applications may not pass on functionality which in any way
-    makes it possible for others to create Applications with the Software;
-    (viii) your Applications may not compete with the Licensed Product;
-    (ix)) you may not use KDAB's or any of its suppliers' names, logos, or
-    trademarks to market your programs, except to state that your program
-    was written using the Licensed Product.
-    
-    
-    WARRANTY DISCLAIMER
-    THE LICENSED PRODUCT IS LICENSED TO YOU "AS IS".  TO THE MAXIMUM
-    EXTENT PERMITTED BY APPLICABLE LAW, KDAB ON BEHALF OF ITSELF AND ITS
-    SUPPLIERS, DISCLAIMS ALL WARRANTIES AND CONDITIONS, EITHER EXPRESS OR
-    IMPLIED, INCLUDING, BUT NOT LIMITED TO, IMPLIED WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE AND
-    NON-INFRINGEMENT WITH REGARD TO THE LICENSED PRODUCT.  THIS WARRANTY
-    DISCLAIMER NOTWITHSTANDING, YOU MAY HAVE SPECIFIC LEGAL RIGHTS WHICH
-    MAY VARY FROM STATE/JURISDICTION TO STATE/JURISDICTION.
-    
-    
-    LIMITATION OF LIABILITY
-    IF, KDAB'S WARRANTY DISCLAIMER NOTWITHSTANDING, KDAB IS HELD LIABLE TO
-    YOU, WHETHER IN CONTRACT, TORT OR ANY OTHER LEGAL THEORY, BASED ON THE
-    LICENSED PRODUCT, KDAB'S ENTIRE LIABILITY TO YOU AND YOUR EXCLUSIVE
-    REMEDY SHALL BE, AT KDAB'S OPTION, EITHER (A) RETURN OF THE PRICE YOU
-    PAID FOR THE LICENSED PRODUCT, OR (B) REPAIR OR REPLACEMENT OF THE
-    LICENSED PRODUCT, PROVIDED YOU RETURN TO KDAB ALL COPIES OF THE
-    LICENSED PRODUCT AS ORIGINALLY DELIVERED TO YOU.  KDAB SHALL NOT UNDER
-    ANY CIRCUMSTANCES BE LIABLE TO YOU BASED ON FAILURE OF THE LICENSED
-    PRODUCT IF THE FAILURE RESULTED FROM ACCIDENT, ABUSE OR
-    MISAPPLICATION, NOR SHALL KDAB UNDER ANY CIRCUMSTANCES BE LIABLE FOR
-    SPECIAL DAMAGES, PUNITIVE OR EXEMPLARY DAMAGES, DAMAGES FOR LOSS OF
-    PROFITS OR INTERRUPTION OF BUSINESS OR FOR LOSS OR CORRUPTION OF DATA.
-    ANY AWARD OF DAMAGES FROM KDAB TO YOU SHALL NOT EXCEED THE TOTAL AMOUNT
-    YOU HAVE PAID TO KDAB IN CONNECTION WITH THIS EULA.
-    
-    
-    SUPPORT AND UPDATES
-    You will receive email based, software developer support and access to
-    Updates to the Licensed Product for one year from the date of initial
-    delivery, in accordance with KDAB support policies and procedures.
-    Such policies and procedures may be changed from time to time.
-    
-    
-    GENERAL PROVISIONS
-    This EULA may only be modified in writing signed by you and an
-    authorized officer of KDAB. All terms of any purchase order or other
-    ordering document shall be superseded by this EULA.  If any provision
-    of the EULA is found void or unenforceable, the remainder will remain
-    valid and enforceable according to its terms.  If any remedy provided
-    is determined to have failed for its essential purpose, all
-    limitations of liability and exclusions of damages set forth in this
-    EULA shall remain in effect.
-    
-    This EULA shall be construed, interpreted and governed by the laws of
-    Sweden, the venue to be Sunne Tingsrätt.  The EULA gives you specific
-    legal rights; you may have others, which vary from state to state and
-    from country to country.  KDAB reserves all rights not specifically
-    granted in this EULA.
-
-
-KDTools-License-non-US:
-
-
-    KD Tools COMMERCIAL LICENSE AGREEMENT
-    FOR COMMERCIAL VERSIONS
-    Version 1.0
-    
-    Copyright of this license text (C) 2001 Trolltech AS and (C) 2002
-    Klarälvdalens Datakonsult AB.  All rights reserved. License text used
-    with kind permission of Trolltech AS. The software and accompanying
-    material is Copyright (C) 2002 Klarälvdalens Datakonsult AB.
-    
-    This non-exclusive non-transferable License Agreement ("Agreement") is
-    between you ("Licensee") and Klarälvdalens Datakonsult AB (KDAB), and
-    pertains to the Klarälvdalens Datakonsult AB software product(s)
-    accompanying this Agreement, which include(s) computer software and
-    may include "online" or electronic documentation, associated media,
-    and printed materials, including the source code, example programs and
-    the documentation ("Software").
-    
-    
-                            COPYRIGHT AND RESTRICTIONS
-    
-    1. All intellectual property rights in the Software are owned by KDAB
-    and are protected by Swedish copyright laws, other applicable
-    copyright laws, and international treaty provisions. KDAB retains all
-    rights not expressly granted. No title, property rights or copyright
-    in the Software or in any modifications to the Software shall pass to
-    the Licensee under any circumstances. The Software is licensed, not
-    sold.
-    
-    2. By installing, copying, or otherwise using the Software, you agree
-    to be bound by the terms of this agreement. If you do not agree to the
-    terms of this Agreement, do not install, copy, or otherwise use the
-    Software.
-    
-    3. Upon your acceptance of the terms and conditions of this Agreement,
-    KDAB grants you the right to use the Software in the manner provided
-    below.
-    
-    4. KDAB grants to you as an individual a personal, nonexclusive,
-    non-transferable license to make and use copies of the Software for
-    the sole purposes of designing, developing, testing and distributing
-    your software product(s) ("Applications"). You may install copies of
-    the Software on an unlimited number of computers provided that you are
-    the only individual using the Software. If you are an entity, KDAB
-    grants you the right to designate one, and only one, individual within
-    your organization who shall have the sole right to use the Software in
-    the manner provided above.
-    
-    5. The license granted in this Agreement for you to create and
-    distribute your own Applications is subject to all of the following
-    conditions: (i) all copies of the Applications you create must bear a
-    valid copyright notice, either your own or the copyright notice that
-    appears on the Software; (ii) you may not remove or alter any
-    copyright, trademark or other proprietary rights notice contained in
-    any portion of the Software; (iii) you will indemnify and hold KDAB, its
-    related companies and its suppliers, harmless from and against any
-    claims or liabilities arising out of the use and/or reproduction of
-    your Applications; (iv) your Applications must be written using a
-    licensed, registered copy of the Software; (v) your Applications must
-    add primary and substantial functionality to the Software; (vi) your
-    Applications may not pass on functionality which in any way makes it
-    possible for others to create Applications with the Software; (vii)
-    your Applications may not compete with the Software; (viii) you may
-    not use KDAB's or any of its suppliers' names, logos, or trademarks to
-    market your programs, except to state that your program was written
-    using the Software.
-    
-    6. WARRANTY DISCLAIMER
-    THE SOFTWARE IS LICENSED TO YOU "AS IS".  TO THE MAXIMUM EXTENT
-    PERMITTED BY APPLICABLE LAW, KDAB ON BEHALF OF ITSELF AND ITS SUPPLIERS,
-    DISCLAIMS ALL WARRANTIES AND CONDITIONS, EITHER EXPRESS OR IMPLIED,
-    INCLUDING, BUT NOT LIMITED TO, IMPLIED WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT WITH
-    REGARD TO THE SOFTWARE.
-    
-    7. LIMITATION OF LIABILITY
-    IF, KDAB'S WARRANTY DISCLAIMER NOTWITHSTANDING, KDAB IS HELD LIABLE TO
-    YOU BASED ON THE SOFTWARE, KDAB'S ENTIRE LIABILITY TO YOU AND YOUR
-    EXCLUSIVE REMEDY SHALL BE, AT REPAIR OR REPLACEMENT OF THE SOFTWARE,
-    PROVIDED YOU RETURN TO KDAB ALL COPIES OF THE SOFTWARE AS ORIGINALLY
-    DELIVERED TO YOU.  KDAB SHALL NOT UNDER ANY CIRCUMSTANCES BE LIABLE TO
-    YOU BASED ON FAILURE OF THE SOFTWARE IF THE FAILURE RESULTED FROM
-    ACCIDENT, ABUSE OR MISAPPLICATION, NOR SHALL KDAB UNDER ANY
-    CIRCUMSTANCES BE LIABLE FOR SPECIAL DAMAGES, PUNITIVE OR EXEMPLARY
-    DAMAGES, DAMAGES FOR LOSS OF PROFITS OR INTERRUPTION OF BUSINESS OR
-    FOR LOSS OR CORRUPTION OF DATA.
-    
-    9. This Agreement may only be modified in writing signed by you and an
-    authorized officer of KDAB. All terms of any purchase order or other
-    ordering document shall be superseded by this Agreement.
-    
-    10. This Agreement shall be construed, interpreted and governed by the
-    laws of Sweden, the venue to be Sunne Tingsrätt.
- 
-
-The other files are distributed under the GNU Library General Public
-License, LGPL:
-
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Library 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 Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02110-1301, USA.
-
-A copy of the GNU Library General Public License can be found at
-/usr/share/common-licenses/LGPL.
-
diff --git a/ubuntu/maverick_automake/libraries/libkipi/debian/libkipi0-kde3-dev.install b/ubuntu/maverick_automake/libraries/libkipi/debian/libkipi0-kde3-dev.install
deleted file mode 100644
index 8cb322185..000000000
--- a/ubuntu/maverick_automake/libraries/libkipi/debian/libkipi0-kde3-dev.install
+++ /dev/null
@@ -1,6 +0,0 @@
-debian/tmp/opt/kde3/include/*
-debian/tmp/opt/kde3/lib/lib*.a
-debian/tmp/opt/kde3/lib/pkgconfig/*
-debian/tmp/opt/kde3/lib/*.la
-debian/tmp/opt/kde3/lib/lib*.so
-debian/tmp/opt/kde3/share/aclocal/*.m4
diff --git a/ubuntu/maverick_automake/libraries/libkipi/debian/libkipi0-kde3.install b/ubuntu/maverick_automake/libraries/libkipi/debian/libkipi0-kde3.install
deleted file mode 100644
index e3096a441..000000000
--- a/ubuntu/maverick_automake/libraries/libkipi/debian/libkipi0-kde3.install
+++ /dev/null
@@ -1,5 +0,0 @@
-debian/tmp/opt/kde3/lib/lib*.so.*
-debian/tmp/opt/kde3/share/apps/kipi
-debian/tmp/opt/kde3/share/icons
-debian/tmp/opt/kde3/share/servicetypes
-debian/tmp/opt/kde3/share/locale
diff --git a/ubuntu/maverick_automake/libraries/libkipi/debian/patches/.gitignore b/ubuntu/maverick_automake/libraries/libkipi/debian/patches/.gitignore
deleted file mode 100644
index e69de29bb..000000000
--- a/ubuntu/maverick_automake/libraries/libkipi/debian/patches/.gitignore
+++ /dev/null
diff --git a/ubuntu/maverick_automake/libraries/libkipi/debian/rules b/ubuntu/maverick_automake/libraries/libkipi/debian/rules
deleted file mode 100755
index 6d35aa5b2..000000000
--- a/ubuntu/maverick_automake/libraries/libkipi/debian/rules
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/make -f
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include debian/cdbs/debian-qt-kde.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
-include /usr/share/cdbs/1/rules/utils.mk
-
-DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde
-DEB_CONFIGURE_MANDIR := /opt/kde3/share/man
-DEB_CONFIGURE_PREFIX := /opt/kde3
-DEB_CONFIGURE_INFODIR := /opt/kde3/share/info
-
-cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
-
-DEB_INSTALL_DOCS_libkipi0-kde3-dev = libkipi/libkipi/design
-
-DEB_KDE_ENABLE_FINAL = yes
-
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib
-
-clean ::
-	rm -f po/*/*.gmo
-
-get-orig-source:
-	 @@dh_testdir
-	 @@[ -d ../tarballs/. ]
-	 @@dpatch-get-origtargz ../tarballs
-
diff --git a/ubuntu/maverick_automake/libraries/libkipi/debian/watch b/ubuntu/maverick_automake/libraries/libkipi/debian/watch
deleted file mode 100644
index a913b7d89..000000000
--- a/ubuntu/maverick_automake/libraries/libkipi/debian/watch
+++ /dev/null
@@ -1,22 +0,0 @@
-# Example watch control file for uscan
-# Rename this file to "watch" and then you can run the "uscan" command
-# to check for upstream updates and more.
-# See uscan(1) for format
-
-# Compulsory line, this is a version 3 file
-version=3
-
-# Uncomment to examine a Webpage 
-# <Webpage URL> <string match>
-#http://www.example.com/downloads.php #PACKAGE#-(.*)\.tar\.gz
-
-# Uncomment to examine a Webserver directory
-#http://www.example.com/pub/#PACKAGE#-(.*)\.tar\.gz
-
-# Uncommment to examine a FTP server
-#ftp://ftp.example.com/pub/#PACKAGE#-(.*)\.tar\.gz debian uupdate
-
-# Uncomment to find new files on sourceforge, for debscripts >= 2.9
-http://sf.net/kipi/libkipi-(.*)\.tar\.bz2 debian svn-upgrade
-
-