DEB: use _base folder for a distro instead of specific distros (squeeze and maverick).

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

20 files changed, 1178 insertions, 0 deletions

diff --git a/debian/_base/applications/adept/debian/adept-batch-trinity.install b/debian/_base/applications/adept/debian/adept-batch-trinity.install
new file mode 100644
index 000000000..7f2ac31a4
--- /dev/null
+++ b/debian/_base/applications/adept/debian/adept-batch-trinity.install
@@ -0,0 +1,2 @@
+debian/tmp/opt/trinity/bin/adept_batch
+debian/tmp/opt/trinity/share/apps/adept_batch/adept_batchui.rc
diff --git a/debian/_base/applications/adept/debian/adept-common-trinity.install b/debian/_base/applications/adept/debian/adept-common-trinity.install
new file mode 100644
index 000000000..535c10c7d
--- /dev/null
+++ b/debian/_base/applications/adept/debian/adept-common-trinity.install
@@ -0,0 +1,2 @@
+debian/tmp/opt/trinity/share/icons/crystalsvg/*/actions/adept_*
+debian/tmp/opt/trinity/share/icons/crystalsvg/*/actions/extender_*.{png,svgz}
diff --git a/debian/_base/applications/adept/debian/adept-installer-trinity.install b/debian/_base/applications/adept/debian/adept-installer-trinity.install
new file mode 100644
index 000000000..b1d5914e1
--- /dev/null
+++ b/debian/_base/applications/adept/debian/adept-installer-trinity.install
@@ -0,0 +1,4 @@
+debian/tmp/opt/trinity/bin/adept_installer
+debian/tmp/opt/trinity/share/icons/hicolor/*/apps/adept_installer.*
+debian/tmp/opt/trinity/share/apps/adept_installer/adept_installerui.rc
+debian/tmp/opt/trinity/share/applications/tde/adept_installer.desktop
diff --git a/debian/_base/applications/adept/debian/adept-manager-trinity.install b/debian/_base/applications/adept/debian/adept-manager-trinity.install
new file mode 100644
index 000000000..f5f2446e7
--- /dev/null
+++ b/debian/_base/applications/adept/debian/adept-manager-trinity.install
@@ -0,0 +1,4 @@
+debian/tmp/opt/trinity/bin/adept_manager
+debian/tmp/opt/trinity/share/icons/hicolor/*/apps/adept_manager.*
+debian/tmp/opt/trinity/share/apps/adept_manager/adept_managerui.rc
+debian/tmp/opt/trinity/share/applications/tde/adept_manager.desktop
diff --git a/debian/_base/applications/adept/debian/adept-notifier-trinity.install b/debian/_base/applications/adept/debian/adept-notifier-trinity.install
new file mode 100644
index 000000000..e221e4ac3
--- /dev/null
+++ b/debian/_base/applications/adept/debian/adept-notifier-trinity.install
@@ -0,0 +1,3 @@
+debian/tmp/opt/trinity/bin/adept_notifier
+debian/tmp/opt/trinity/share/applications/tde/adept_notifier.desktop
+debian/tmp/etc/xdg/autostart/adept_notifier_auto.desktop
diff --git a/debian/_base/applications/adept/debian/adept-updater-trinity.install b/debian/_base/applications/adept/debian/adept-updater-trinity.install
new file mode 100644
index 000000000..ba854f2a8
--- /dev/null
+++ b/debian/_base/applications/adept/debian/adept-updater-trinity.install
@@ -0,0 +1,4 @@
+debian/tmp/opt/trinity/bin/adept_updater
+debian/tmp/opt/trinity/share/icons/hicolor/*/apps/adept_updater.{png,svgz}
+debian/tmp/opt/trinity/share/apps/adept_updater/adept_updaterui.rc
+debian/tmp/opt/trinity/share/applications/tde/adept_updater.desktop
diff --git a/debian/_base/applications/adept/debian/cdbs/debian-qt-kde.mk b/debian/_base/applications/adept/debian/cdbs/debian-qt-kde.mk
new file mode 100644
index 000000000..9f8f97776
--- /dev/null
+++ b/debian/_base/applications/adept/debian/cdbs/debian-qt-kde.mk
@@ -0,0 +1,115 @@
+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
+ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
+	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
+endif
+ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
+	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
+endif
+	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
+	touch debian/stamp-cvs-make
+
+include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
+
+ifndef _cdbs_rules_patchsys_quilt
+DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
+
+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/debian/_base/applications/adept/debian/cdbs/kde.mk b/debian/_base/applications/adept/debian/cdbs/kde.mk
new file mode 100644
index 000000000..1ac26c4b7
--- /dev/null
+++ b/debian/_base/applications/adept/debian/cdbs/kde.mk
@@ -0,0 +1,89 @@
+# -*- 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}/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-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
+
+# 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/debian/_base/applications/adept/debian/cdbs/versions.pl b/debian/_base/applications/adept/debian/cdbs/versions.pl
new file mode 100644
index 000000000..1b110f7af
--- /dev/null
+++ b/debian/_base/applications/adept/debian/cdbs/versions.pl
@@ -0,0 +1,19 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+
+my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
+my ($version3, $version3_next);
+my ($version2, $version2_next);
+
+($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
+($version2 = $version3) =~ s/\.[^.]+$//;
+
+($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
+($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
+
+print "TDE-Version3=$version3\n";
+print "TDE-Version2=$version2\n";
+print "TDE-Next-Version3=$version3_next\n";
+print "TDE-Next-Version2=$version2_next\n";
diff --git a/debian/_base/applications/adept/debian/changelog b/debian/_base/applications/adept/debian/changelog
new file mode 100644
index 000000000..332ec5674
--- /dev/null
+++ b/debian/_base/applications/adept/debian/changelog
@@ -0,0 +1,704 @@
+adept-trinity (2.1.3ubuntu14) karmic; urgency=low
+
+  * No change; working around badly broken Launchpad build farm...
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Sun, 04 Oct 2009 00:26:00 -0600
+
+adept-trinity (2.1.3ubuntu12) karmic; urgency=low
+
+  * Karmic rebuild
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Fri, 02 Oct 2009 00:31:00 -0600
+
+adept-trinity (2.1.3ubuntu11) karmic; urgency=low
+
+  * Karmic rebuild
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 02 July 2009 16:08:00 -0600
+
+adept-trinity (2.1.3ubuntu10) jaunty; urgency=low
+
+  * Moved Trinity to /opt/trinity
+  * Integrated properly with KDE4.2+
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 04 March 2009 01:08:00 -0600
+
+adept-trinity (2.1.3ubuntu5) intrepid; urgency=low
+
+  * Added -trinity suffix
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 03 Dec 2008 18:08:00 -0600
+
+adept (2.1.3ubuntu25.1) hardy-proposed; urgency=low
+
+  * Add kubuntu_33_skip_intrepid.diff, don't offer automatic upgrade to intrepid
+    LP: #280295
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 08 Oct 2008 17:58:30 +0100
+
+adept (2.1.3ubuntu25) hardy; urgency=low
+
+  [ Yuriy Kozlov ]
+  * Add kubuntu_32_i18n_contextmenu.diff to enable translation of context
+    menu items (LP: #204439)
+
+  [ Daniel Hahler ]
+  * Update kubuntu_10_apport.diff to pickup Apport crash files by default.
+    (LP: #215100)
+  * Update kubuntu_03_translation_catalogues.diff to include translations from
+    libapt-front (LP: #204439)
+
+ -- Daniel Hahler <ubuntu@thequod.de>  Fri, 18 Apr 2008 20:38:58 +0200
+
+adept (2.1.3ubuntu24) hardy; urgency=low
+
+  * Add kubuntu_31_xdg_autostart_dir.diff to move to xdg autostart dir
+    for KDE 4
+  * Up build-dep for new libapt-front (and libept)
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 10 Mar 2008 14:36:00 +0000
+
+adept (2.1.3ubuntu23) hardy; urgency=low
+
+  * Rebuild for new apt/ept
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 18 Dec 2007 14:48:33 +0000
+
+adept (2.1.3ubuntu22) hardy; urgency=low
+
+  * Add kubuntu_30_utf8_fix.diff from Guillaume Martres, fixes "adept
+    does not display utf-8 text correctly".  Closes LP: #102753
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 07 Dec 2007 18:23:58 +0000
+
+adept (2.1.3ubuntu21) hardy; urgency=low
+
+  * Added kubuntu_29_batch_check_pkgname.diff
+    Closes LP: #153710
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Mon, 19 Nov 2007 21:04:54 +0100
+
+adept (2.1.3ubuntu20) hardy; urgency=low
+
+  * Fixed debian/adept_batch.install, including missing
+    /usr/share/apps/adept_batch/adept_batchui.rc
+  * Fixed debian/rules, removing dh_buildinfo, causes ftbfs
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Thu, 15 Nov 2007 14:30:37 +0100
+
+adept (2.1.3ubuntu19) hardy; urgency=low
+
+  * Added kubuntu_27_disable_refresh_question_upgrade.diff. Removes the
+    first screen askig if refreshing updates is needed for adept_updater
+  * kubuntu_28_fix_updater_makefile_for_translation.diff. Fixed
+    Makefile as there are i18n strings in app.h too
+  * buildprep applied according as patch 
+    kubuntu_28_fix_updater_makefile_for_translation.diff touches makefiles
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Wed, 14 Nov 2007 16:44:32 +0100
+
+adept (2.1.3ubuntu18) hardy; urgency=low
+
+  * Sync Hardy with gutsy-proposed
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Sat, 27 Oct 2007 16:35:34 +0100
+
+adept (2.1.3ubuntu17.1) gutsy-proposed; urgency=low
+
+  * Fix dist-upgrade file check
+    Closes LP: #153889
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 18 Oct 2007 15:54:38 +0100
+
+adept (2.1.3ubuntu17) gutsy; urgency=low
+
+  * Make kubuntu_26_gxx43.diff apply
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 12 Oct 2007 15:16:28 +0100
+
+adept (2.1.3ubuntu16) gutsy; urgency=low
+
+  * Update kubuntu_10_apport.diff to not run Apport (configurable)
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 10 Oct 2007 16:42:21 +0100
+
+adept (2.1.3ubuntu15) gutsy; urgency=low
+
+  * Fix build failures with g++-4.3. LP: #138549.
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 14 Sep 2007 21:54:01 +0000
+
+adept (2.1.3ubuntu14) gutsy; urgency=low
+
+  * debian/patches/kubuntu_25_write_apport_files.diff:
+    - write out apport files 
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 20 Aug 2007 19:54:15 +0200
+
+adept (2.1.3ubuntu13) gutsy; urgency=low
+
+  * remove old files from install
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 15 Aug 2007 19:39:51 +0100
+
+adept (2.1.3ubuntu12) gutsy; urgency=low
+
+  * Add kubuntu_23_notifier_reboot.diff, adds support for
+    reboot notification in adept_notifier
+  * Edit kubuntu_02_archive_limit.diff to not install any apt.conf.d files,
+    make adept-notifier depend on update-notifier-common instead
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 15 Aug 2007 18:11:43 +0100
+
+adept (2.1.3ubuntu11) gutsy; urgency=low
+
+  * Call software-properties-kde with --no-update
+  * Add kubuntu_21_installer_ui_changes.diff, removes menubar and adds
+    buttons to edit sources and review changes
+  * Add kubuntu_22_installer_rank.diff, adds star rating (from popcon) to adept installer
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 14 Aug 2007 11:54:15 +0100
+
+adept (2.1.3ubuntu10) gutsy; urgency=low
+
+  * Add header to diff
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 13 Aug 2007 22:52:53 +0100
+
+adept (2.1.3ubuntu9) gutsy; urgency=low
+
+  * Run buildprep before upload
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 13 Aug 2007 21:13:29 +0100
+
+adept (2.1.3ubuntu8) gutsy; urgency=low
+
+  * Add kubuntu_20_batch_update.diff, adds an update mode to adept_batch
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 13 Aug 2007 19:50:35 +0100
+
+adept (2.1.3ubuntu7) gutsy; urgency=low
+
+  * Fix kubuntu_upgrader/upgradewizard.cpp to work for
+    --dist-upgrade and --dist-upgrade-devel
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 08 Aug 2007 16:58:06 +0100
+
+adept (2.1.3ubuntu6) gutsy; urgency=low
+
+  * Add build-dep on automake1.9, fix fail to build
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 07 Aug 2007 11:08:29 +0100
+
+adept (2.1.3ubuntu5) gutsy; urgency=low
+
+  * Add ability to run dist upgrade tool with command line switches
+  * Add kubuntu_19_automake10.diff, ability to use automake 1.10
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 06 Aug 2007 20:29:55 +0100
+
+adept (2.1.3ubuntu4) gutsy; urgency=low
+
+  * rebuild against latest libept
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 03 Aug 2007 22:07:57 +0200
+
+adept (2.1.3ubuntu3) gutsy; urgency=low
+
+  * Add missing build-dep on sharutils
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 27 Jul 2007 18:13:25 +0100
+
+adept (2.1.3ubuntu2) gutsy; urgency=low
+
+  * Add kubuntu_15_main_indicator_icon.diff.uu with
+    main indicator icon
+  * Add kubuntu_16_installer_details_button.diff
+    closes https://bugs.launchpad.net/ubuntu/+source/adept/+bug/119969
+    "Adept Installer review changes screen has a useless Details button."
+  * Add kubuntu_17_locked_dpkg.diff
+    closes https://bugs.launchpad.net/ubuntu/+source/adept/+bug/48627
+    'Poor resolution of "database locked" problem'
+  * Add kubuntu_18_danish_icon_translation.diff
+    closes https://bugs.launchpad.net/ubuntu/+source/adept/+bug/95852
+    Incorrect Danish translation
+  * Add XS-VCS-Bzr
+	
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 27 Jul 2007 14:23:57 +0100
+
+adept (2.1.3ubuntu1) gutsy; urgency=low
+
+  * Merge with Debian, remaining changes:
+   - patches in debian/patches
+   - files in adept/kubuntu_upgrader
+  * Add patches for cleaner merge with Debian
+   - kubuntu_01_batch_makefile.diff
+   - kubuntu_01_upgradewizard.diff
+   - kubuntu_01_upgradewizard_makefile.diff
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 11 Jul 2007 09:28:00 +0000
+
+adept (2.1.3) unstable; urgency=low
+
+  * Ported to new apt-front.  Closes: bug#423736.
+  * Built with new apt.  Closes: bug#429806.
+
+ -- Enrico Zini <enrico@debian.org>  Wed, 27 Jun 2007 08:42:01 +0200
+
+adept (2.1.2ubuntu28) gutsy; urgency=low
+
+  * Rebuild against libapt-pkg-libc6.6-6-4.4.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Mon, 09 Jul 2007 16:45:48 +0100
+
+adept (2.1.2ubuntu27) gutsy; urgency=low
+
+  * Recompile on new apt and to remove references to libtdb.la
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 20 Jun 2007 19:11:37 +0100
+
+adept (2.1.2ubuntu26) feisty; urgency=low
+
+  * Add option to run dist upgrade tool for development versions
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 10 Apr 2007 17:55:37 +0100
+
+adept (2.1.2ubuntu25) feisty; urgency=low
+
+  * Change meta-release file from -development to final
+  * In updater, only show new release message if one if available
+  * Fix to kubuntu_04_supported_label.diff to show expander icon again
+    from Michael D. Stemle <manchicken@notsosoft.net>
+  * Fix kubuntu_07_show_changelog.diff to use correct URL (source
+    package, not binary package name; no epoch in URL)
+  * Fix layout in adept/kubuntu_upgrader/errordialogbase.ui and
+    adept/kubuntu_upgrader/upgradewizardbase.ui so it doesn't use a
+    fixed layout.
+  * Remove references to Debian, branding for derivatives
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Fri,  6 Apr 2007 10:33:46 +0100
+
+adept (2.1.2ubuntu24) feisty; urgency=low
+
+  * Drop kubuntu_13_remove_view_menu.diff:
+    - Rediscussing on the devel channel, it was decided to fix
+      the menu instead of removing it
+  * Add kubuntu_13_clean_view_menu.diff:
+    - Removes dupe "Manage Repos" entry
+    - patch from "Michael D. Stemle, Jr.
+  * Add kubuntu_14_enables_view_menu_components.diff:
+    - Enables disabled components of the menu.
+    - patch from Michael D. Stemle, Jr.
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Tue, 03 Apr 2007 23:48:21 +0100
+
+adept (2.1.2ubuntu23) feisty; urgency=low
+
+  * Add kubuntu_13_remove_view_menu.diff:
+    - Remove useless "view" menu from the manager's UI
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Tue, 03 Apr 2007 15:42:37 +0100
+
+adept (2.1.2ubuntu22) feisty; urgency=low
+
+  * Sync adept/kubuntu_upgrader/upgradewizard.cpp with edgy-propsed
+    - don't kill adept (stops new process connecting to X)
+    - set working directory
+  * Patch to adept/kubuntu_upgrader/upgradewizard.{h,cpp} from 
+    Billy Pollifrone <billy@silverbaseball.com> to delete old copies of
+    dist upgrader
+  * Fix kubuntu_03_translation_catalogues.diff, change catalogue to libept
+  * manager and updater: show a button for version upgrade rather than
+    popping up wizard every time
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 30 Mar 2007 16:23:34 +0100
+
+adept (2.1.2ubuntu21) feisty; urgency=low
+
+  * Add kubuntu_11_accessibility_icon.diff fixes blank accessibility
+    icon in adept_installer
+  * Add kubuntu_12_installer_enable_all.diff enables all categories 
+    by default
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  6 Mar 2007 20:09:06 +0000
+
+adept (2.1.2ubuntu20) feisty; urgency=low
+
+  * Update to kubuntu_04_supported_label.diff from 
+    "Michael D. Stemle, Jr." <manchicken@notsosoft.net>
+    keep supported column when expanded
+    closes https://launchpad.net/bugs/82431
+  * Update to kubuntu_07_show_changelog.diff from
+    "Michael D. Stemle, Jr." <manchicken@notsosoft.net>
+    Make only 1 changelog object globally, not 1 per package  
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Mon,  5 Mar 2007 15:16:40 +0000
+
+adept (2.1.2ubuntu19) feisty; urgency=low
+
+  * Rebuild for new libapt-front
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 28 Feb 2007 11:46:30 +0000
+
+adept (2.1.2ubuntu18) feisty; urgency=low
+
+  * Rebuild for new libapt
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 26 Feb 2007 20:36:13 +0000
+
+adept (2.1.2ubuntu17) feisty; urgency=low
+
+  * Add kubuntu_10_apport.diff, watches for crash reports
+    coming from Apport and runs apport-qt when they appear
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 20 Feb 2007 17:12:40 +0000
+
+adept (2.1.2ubuntu16) feisty; urgency=low
+
+  * Run buildprep before upload
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 13 Feb 2007 11:57:22 +0000
+
+adept (2.1.2ubuntu15) feisty; urgency=low
+
+  * Add replaces on adept-common for adept-notifier, closes
+    https://bugs.launchpad.net/ubuntu/+source/adept/+bug/82651
+  * Make kubuntu upgrader wizard run after update not before
+  * Implement uncompressing and running kubuntu upgrade tool
+	
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 12 Feb 2007 12:54:35 +0000
+
+adept (2.1.2ubuntu14) feisty; urgency=low
+
+  * Rebuilt against new apt
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Wed,  7 Feb 2007 00:29:21 +0100
+
+adept (2.1.2ubuntu13) feisty; urgency=low
+
+  * Add kubuntu_08_no_unique_application.diff don't use a unique application,
+    stops it forking which broke xauthority and means debconf can't work in X mode
+  * Add kubuntu_09_no_double_tdesu.diff stop using tdesu twice
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  6 Feb 2007 12:38:42 +0000
+
+adept (2.1.2ubuntu12) feisty; urgency=low
+
+  * Fix adept/kubuntu_upgrader/upgradewizard.cpp to not crash when it doesn't find
+    any newer release available, patch from 
+    "Michael D. Stemle, Jr." <manchicken@notsosoft.net>
+  * Add kubuntu_07_show_changelog.diff to show changelog when installing new
+    versions, patch from "Michael D. Stemle, Jr." <manchicken@notsosoft.net>
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Mon,  5 Feb 2007 13:03:36 +0000
+
+adept (2.1.2ubuntu11) feisty; urgency=low
+
+  * Add kubuntu_06_software_properties.diff, launch
+    software-properties as source editor if available
+  * Update kubuntu_04_supported_label.diff for tooltips from Michael D. Stemle
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Sat,  3 Feb 2007 02:31:04 +0000
+
+adept (2.1.2ubuntu10) feisty; urgency=low
+
+  * Add kubuntu_05_adept_batch_finish.diff, adept-batch auto
+    close when finished, for kubuntu-feisty-adept-changes and
+    kubuntu-feisty-adept-changes
+    patch by "Michael D. Stemle, Jr." <manchicken@notsosoft.net>
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Mon, 22 Jan 2007 22:05:45 +0100
+
+adept (2.1.2ubuntu9) feisty; urgency=low
+
+  * Fixed debian/adept-notifier.install, removed adept_notifier_warning.png
+    already in adept-common, which adept-notifier depends on
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Fri, 19 Jan 2007 02:28:32 +0100
+
+adept (2.1.2ubuntu8) feisty; urgency=low
+
+  * Add kubuntu_04_supported_label.diff
+    adds a column indicating if the package is in main or not, 
+    for kubuntu-feisty-adept-changes and kubuntu-feisty-adept-changes
+    patch by "Michael D. Stemle, Jr." <manchicken@notsosoft.net>
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 18 Jan 2007 16:05:57 +0000
+
+adept (2.1.2ubuntu7) feisty; urgency=low
+
+  * Removed apt-index-watcher dependancy, dropped in debian.
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Thu,  18 Jan 2007 00:28:32 +0100
+
+adept (2.1.2ubuntu6) feisty; urgency=low
+
+  * Fix build order in adept/Makefile.am and kubuntu_upgrader/Makefile.am
+  * Fix includes in kubuntu_upgrader/updatewizard.cpp
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Fri,  5 Jan 2007 13:23:20 +0000
+
+adept (2.1.2ubuntu5) feisty; urgency=low
+
+  * Manage package in bzr
+    https://code.launchpad.net/~jr/+branch/adept/ubuntu
+  * Add kubuntu_upgrader/ directory and changes for kubuntu-upgrade-tool
+    changes by Vladimir <vstefan85@gmail.com>
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Fri,  5 Jan 2007 01:02:10 +0000
+
+adept (2.1.2ubuntu4) feisty; urgency=low
+
+  * Add kubuntu_03_translation_catalogues.diff to force adept
+    to use the correct translation catalogues.
+    Closes https://launchpad.net/ubuntu/+source/adept/+bug/47181
+    Patch by Martin Bohm <martin.bohm@kubuntu.org>
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Thu,  4 Jan 2007 22:30:23 +0000
+
+adept (2.1.2ubuntu3) feisty; urgency=low
+
+  * Remove a pair of quotes from kubuntu_02_archive_limit.diff, fixes FTBFS.
+
+ -- Frode M. Døving <frode@dark.lnix.net>  Wed,  6 Dec 2006 21:25:42 +0100
+
+adept (2.1.2ubuntu2) feisty; urgency=low
+
+  * Added /etc/apt/apt.conf.d/25adept-archive-limits to allow
+    /etc/cron.daily/apt to autoclean the apt archive on kubuntu too.
+    Add kubuntu_02_archive_limit.diff
+  * Enable simple-patchsys.mk in debian/rules.
+
+ -- Frode M. Døving <frode@ubuntu.com>  Sun,  3 Dec 2006 14:56:03 +0100
+
+adept (2.1.2ubuntu1) feisty; urgency=low
+
+  * Sync with debian.
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Thu, 23 Nov 2006 16:01:32 +0200
+
+adept (2.1.1ubuntu3) edgy; urgency=low
+
+  * Add kubuntu_01_enable_sources_editor.diff to force sources editor
+    to be enabled, fixes malone No 62610
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 13 Oct 2006 11:39:23 +0100
+
+adept (2.1.1ubuntu2) edgy; urgency=low
+
+  * rebuild against latest libapt-front in ubuntu to get
+    translated package descriptions
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 15 Aug 2006 16:08:17 +0200
+
+adept (2.1.1ubuntu1) edgy; urgency=low
+
+  * Add adept-batch package for adept_batch
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 20 Jul 2006 15:51:31 +0100
+
+adept (2.1.1) unstable; urgency=low
+
+  * Add dependency on debtags to adept-common, finally closes: #359065,
+  * fix crash when previewing changes, closes: #376784,
+  * add conflicts+replaces to adept-common for adept << 2.1, closes: #377149.
+
+ -- Peter Rockai <me@mornfall.net>  Mon, 17 Jul 2006 11:35:58 +0200
+
+adept (2.1) unstable; urgency=low
+
+  * Release 2.1 Cruiser,
+  * rename the source package to adept,
+  * split up the package per component,
+  * improve startup perception (early GUI, lazy init),
+  * user can now skip the fetch lists part of updater.
+
+ -- Peter Rockai <me@mornfall.net>  Thu, 25 May 2006 20:58:11 +0200
+
+ept (2.0) unstable; urgency=low
+
+  * Release 2.0 Destroyer,
+  * reduce amount of debug output in notifier.
+
+ -- Peter Rockai <me@mornfall.net>  Wed, 24 May 2006 12:47:36 +0200
+
+ept (1.92) unstable; urgency=low
+
+  * Release 1.92 Ironclad (release candidate),
+  * bunch of crash fixes,
+  * fix the annoying "konsole starts out 20 columns wide, it makes output
+    unreadable and freaks out debconf" bug,
+  * add purge/reinstall icons (courtesy of Anthony Mercatante),
+  * fix few other minor issues,
+  * try to work around scim breakage.
+
+ -- Peter Rockai <me@mornfall.net>  Tue,  9 May 2006 23:17:53 +0200
+
+ept (1.91) unstable; urgency=low
+
+  * Release 1.91 Swarm (beta 2),
+  * includes adept_batch for non-interactive invocation of package
+    install/remove via adept,
+  * fix few crash/hang bugs (application/octet-stream hang, keeping data
+    invalidated by cache reload),
+  * fix a grave misbehaviour bug (spurious package marking),
+  * change the button layout of wizard apps (2 buttons, right-aligned),
+  * fix few less severe (but possibly annoying) bugs.
+
+ -- Peter Rockai <me@mornfall.net>  Sat, 25 Mar 2006 02:54:34 +0100
+
+ept (1.90.1) unstable; urgency=low
+
+  * Upload the beta version to unstable, closes: #355628,
+  * fix a bug in TagChooser that would cause reliable crashes with
+    new libapt-front (and possibly infrequent ones with old one),
+  * rebuild with new libapt-front.
+
+ -- Peter Rockai <me@mornfall.net>  Mon, 13 Mar 2006 23:32:38 +0100
+
+ept (1.90) unstable; urgency=low
+
+  * Release 1.90 Conquest (beta 1),
+  * finished Adept Installer:
+    - implemented filtering,
+    - implemented unsupported/non-free checkboxes,
+    - implemented warning about multiple programs in single package removal,
+    - implemented extended description,
+  * implemented version constraints in package relation view,
+  * fixed bunch of crashes and other bugs.
+
+ -- Peter Rockai <me@mornfall.net>  Sun, 19 Feb 2006 22:06:23 +0100
+
+ept (1.89) unstable; urgency=low
+
+  * Release 1.89 Viking (alpha 2),
+  * speed and interactivity improvements,
+  * better statusbar,
+  * ability to browse packages in updater,
+  * greatly improved commit progress reporter,
+  * usability fixes,
+  * completion of update notifier,
+  * add actions on packages to package browser,
+  * package file list,
+  * i18n everywhere.
+
+ -- Peter Rockai <me@mornfall.net>  Sun, 12 Feb 2006 21:18:17 +0100
+
+ept (1.88.5) unstable; urgency=low
+
+  * Add a missing dependency on konsole.
+
+ -- Peter Rockai <me@mornfall.net>  Wed,  1 Feb 2006 21:46:20 +0100
+
+ept (1.88.4) unstable; urgency=low
+
+  * Fix spontaneous death of update fetch in adept-updater,
+  * fix crashes with update in both updater/manager with invalid entries
+    (404, unreachable) in sources.list,
+  * do not show error message when user cancels operation in updater,
+  * reduce debugging noise in the embedded konsole part,
+  * really show installed and candidate version in package info instead of
+    just candidate twice.
+
+ -- Peter Rockai <me@mornfall.net>  Thu, 26 Jan 2006 08:29:08 +0100
+
+ept (1.88.3) unstable; urgency=low
+
+  * Initial upload to Debian, closes: #341204
+  * update libtool, update build system to reduce dependency creep.
+
+ -- Isaac Clerencia <isaac@debian.org>  Tue, 24 Jan 2006 21:04:07 +0100
+
+ept (1.88.2) unstable; urgency=low
+
+  * Remove kde_terminal_interface.h and update debian/copyright accordingly,
+  * add icons licenses to debian/copyright,
+  * build-depend on tdelibs4-dev >= 3.5.0.
+
+ -- Peter Rockai <me@mornfall.net>  Tue, 24 Jan 2006 18:10:36 +0100
+
+ept (1.88.1) experimental; urgency=low
+
+  * An intermediate version -- 1.88.1 Wibble (alpha 1.5),
+  * hopefully fix the memory corruption bug from alpha,
+  * fix debian/copyright and some of the source files,
+  * fix height of the next button in adept-updater,
+  * slightly improve usability of quick filter (enter starts filtering,
+    timeout set to 1s).
+
+ -- Peter Rockai <me@mornfall.net>  Mon, 23 Jan 2006 12:13:38 +0100
+
+ept (1.88) experimental; urgency=low
+
+  * Alpha version (codename Scvrnkls)
+  * improved filtering UI,
+  * new package details browser (to be finished),
+  * update notifier,
+  * progress bar to go with konsole,
+  * interruptible download,
+  * purge and reinstall,
+  * and some bugfixes.
+
+ -- Peter Rockai <me@mornfall.net>  Tue, 20 Dec 2005 21:35:24 +0100
+
+ept (1.0) experimental; urgency=low
+
+  * Final release.
+  * Fix the download hanging at "downloading (100%)" instead of "done (100%)"
+  * Fix .desktop files
+  * Fix a bug where adept fails to reopen cache when commit fails
+
+ -- Peter Rockai <me@mornfall.net>  Sat,  8 Oct 2005 23:23:25 +0200
+
+ept (0.5) experimental; urgency=low
+
+  * Release candidate.
+  * Application icon.
+  * Fix several crashes and unhandled exceptions.
+  * Report progress on various operations.
+  * Support installation media changing.
+  * Fix filter summaries (the short/collapsed view of a filter).
+
+ -- Peter Rockai <me@mornfall.net>  Thu, 29 Sep 2005 17:44:25 +0200
+
+ept (0.4.1) experimental; urgency=low
+
+  * Don't export libept. Saves headaches.
+
+ -- Peter Rockai <me@mornfall.net>  Mon, 12 Sep 2005 11:53:32 +0200
+
+ept (0.4) experimental; urgency=low
+
+  * Another beta release.
+  * Port to libapt-front 0.3.
+  * Easy Tag filter.
+  * Ship own copies of nuvola icons.
+  * Fix segfaulting extenders.
+  * Use tdesu for .desktop entries.
+  * Fix crasher on cache reload with active tag filter.
+  * Major speedup of the tag menu.
+  * Improve handling of comments in sources.list editor.
+  * Hide the filter view from adept updater by default.
+  * Some optimisations and interactivity fixes.
+  * Minor improvements/polishing.
+
+ -- Peter Rockai <me@mornfall.net>  Sun, 11 Sep 2005 15:06:12 +0200
+
+ept (0.3) experimental; urgency=low
+
+  * Beta release.
+  * New filtering ui.
+  * Implement sources.list editor.
+  * Add filter menu and Tag filter.
+  * Undo/redo support.
+  * Changes preview.
+  * Numerous bugfixes etc.
+
+ -- Peter Rockai <me@mornfall.net>  Tue,  6 Sep 2005 08:28:15 +0200
+
+ept (0.2) experimental; urgency=low
+
+  * Alpha release. 
+
+ -- Peter Rockai <me@mornfall.net>  Mon, 22 Aug 2005 12:36:56 +0200
+
diff --git a/debian/_base/applications/adept/debian/compat b/debian/_base/applications/adept/debian/compat
new file mode 100644
index 000000000..7f8f011eb
--- /dev/null
+++ b/debian/_base/applications/adept/debian/compat
@@ -0,0 +1 @@
+7
diff --git a/debian/_base/applications/adept/debian/control b/debian/_base/applications/adept/debian/control
new file mode 100644
index 000000000..e03f9902c
--- /dev/null
+++ b/debian/_base/applications/adept/debian/control
@@ -0,0 +1,103 @@
+Source: adept-trinity
+Section: tde
+Priority: optional
+Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+XSBC-Original-Maintainer: Peter Rockai <me@mornfall.net>
+Uploaders: Isaac Clerencia <isaac@debian.org>, Enrico Zini <enrico@debian.org>
+Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, dh-buildinfo, libapt-front-dev (>= 0.4.0-0.1ubuntu5), libapt-front-dev (<< 0.5), libtagcoll2-dev (>= 2.0.6), libtagcoll2-dev (<< 2.1), libwibble-dev (>= 0.1.10), libwibble-dev (>= 1.1) | libwibble-dev (<< 0.2), tdelibs14-trinity-dev (>= 3.5.0), sharutils, automake, autoconf, libtool, libltdl-dev
+Standards-Version: 3.8.4
+
+Package: adept-trinity
+Section: tde
+Depends: adept-manager-trinity, adept-installer-trinity, adept-updater-trinity, adept-notifier-trinity, adept-batch-trinity
+Replaces: adept-trinity (<< 4:14.0.0~)
+Breaks: adept-trinity (<< 4:14.0.0~)
+Architecture: all
+Description: package management suite for Trinity
+ These packages belong to the adept suite:
+  * adept-manager-trinity - package manager
+  * adept-installer-trinity - application manager
+  * adept-updater-trinity - system upgrade wizard
+  * adept-notifier-trinity - systray notification of available updates
+
+Package: adept-common-trinity
+Section: tde
+Depends: debtags (>= 1.6.1), konsole-trinity (>= 3.5.0), ${shlibs:Depends}
+Replaces: adept-common-trinity (<< 4:14.0.0~)
+Breaks: adept-common-trinity (<< 4:14.0.0~)
+Architecture: all
+Description: package manager for Trinity -- common files
+ Icons and other common files for all adept components.
+
+Package: adept-manager-trinity
+Section: tde
+Depends: adept-common-trinity, ${shlibs:Depends}
+Replaces: adept-manager-trinity (<< 4:14.0.0~)
+Breaks: adept-manager-trinity (<< 4:14.0.0~)
+Recommends: libtqt-perl
+Architecture: any
+Description: package manager for Trinity
+ Adept Manager is a graphical user interface for package management.
+ .
+ Besides these basic functions the following features are provided:
+  * Search and filter the list of available packages (also using debtags)
+  * Perform smart system upgrades
+  * Edit the list of used repositories (sources.list)
+  * Configure packages through the debconf system
+ .
+ Please also install libtqt-perl if you want the TDE Debconf frontend
+ to function.
+
+Package: adept-installer-trinity
+Section: tde
+Depends: adept-common-trinity, app-install-data, ${shlibs:Depends}
+Replaces: adept-installer-trinity (<< 4:14.0.0~)
+Breaks: adept-installer-trinity (<< 4:14.0.0~)
+Recommends: libtqt-perl
+Architecture: any
+Description: simple user interface for application management (for Trinity)
+ Adept Installer presents a list of applications available through the
+ Advanced Package Tool (APT). An application is considered a package
+ that contains a .desktop file for use with TDE, KDE, GNOME or other
+ desktop environment.
+ .
+ Please also install libtqt-perl if you want the TDE Debconf frontend
+ to function.
+
+Package: adept-updater-trinity
+Section: tde
+Depends: adept-common-trinity, ${shlibs:Depends}
+Replaces: adept-updater-trinity (<< 4:14.0.0~)
+Breaks: adept-updater-trinity (<< 4:14.0.0~)
+Recommends: libtqt-perl
+Architecture: any
+Description: system update tool for Trinity
+ Adept Updater provides a simple wizard-style user interface to system
+ upgrades. It uses same algorithms as apt-get dist-upgrade.
+ .
+ Please also install libtqt-perl if you want the TDE Debconf frontend
+ to function.
+
+Package: adept-notifier-trinity
+Section: tde
+Depends: ${shlibs:Depends}, adept-updater-trinity, update-notifier-common | apt-config-auto-update
+Replaces: adept-notifier-trinity (<< 4:14.0.0~)
+Breaks: adept-notifier-trinity (<< 4:14.0.0~)
+Recommends: update-notifier-common | reboot-notifier
+Architecture: any
+Description: system tray notifier of available system updates
+ Adept Notifier provides a system tray icon notifying the user of
+ available updates.  It will run Adept Updater for the user when
+ clicked.
+
+Package: adept-batch-trinity
+Section: tde
+Depends: ${shlibs:Depends}, adept-manager-trinity
+Replaces: adept-batch-trinity (<< 4:14.0.0~)
+Breaks: adept-batch-trinity (<< 4:14.0.0~)
+Architecture: any
+Description: command line install for Adept
+ Adept Batch lets you install packages with Adept from the
+ command line.  It is intended for shell scripts and being run
+ by external applications.
+
diff --git a/debian/_base/applications/adept/debian/copyright b/debian/_base/applications/adept/debian/copyright
new file mode 100644
index 000000000..6f8ad6648
--- /dev/null
+++ b/debian/_base/applications/adept/debian/copyright
@@ -0,0 +1,65 @@
+This package was debianized by Enrico Zini <enrico@debian.org> on
+Tue Nov  2 14:20:12 BRST 2004.
+
+The software is
+Copyright (C) 2004,2005,2006 Peter Rockai
+
+and application icons are
+Copyright (C) 2005 Anthony Mercatante
+
+Both licensed:
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+    * Neither the name of [original copyright holder] nor the names of
+      its contributors may be used to endorse or promote products
+      derived from this software without specific prior written
+      permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Action icons (*-action-*.png in source, subdirectory action in
+binary package) are
+
+Copyright (C) 2004  David Vignoni <dave@icon-king.com>
+
+License: LGPL
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library 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
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+    MA 02110-1301, USA.
+
+On Debian machines the full text of the LGPL can be found at:
+/usr/share/common-licenses/LGPL-2.1
+
diff --git a/debian/_base/applications/adept/debian/dirs b/debian/_base/applications/adept/debian/dirs
new file mode 100644
index 000000000..73752c9ae
--- /dev/null
+++ b/debian/_base/applications/adept/debian/dirs
@@ -0,0 +1 @@
+usr
diff --git a/debian/_base/applications/adept/debian/docs b/debian/_base/applications/adept/debian/docs
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/debian/_base/applications/adept/debian/docs
diff --git a/debian/_base/applications/adept/debian/patches/remove_apport.diff b/debian/_base/applications/adept/debian/patches/remove_apport.diff
new file mode 100644
index 000000000..e768486eb
--- /dev/null
+++ b/debian/_base/applications/adept/debian/patches/remove_apport.diff
@@ -0,0 +1,12 @@
+diff -ur adept/adept/adept/dpkgpm.cpp adept/adept/adept/dpkgpm.cpp
+--- adept/adept/adept/dpkgpm.cpp
++++ adept/adept/adept/dpkgpm.cpp
+@@ -330,7 +330,7 @@
+       char* list[5];
+       char *line = strdup(m_statusBuffer.c_str());
+       TokSplitString(':', line, list, sizeof(list)/sizeof(list[0]));
+-      WriteApportReport(list[1], list[3]);
++//      WriteApportReport(list[1], list[3]);
+       free(line);
+       return;
+    }
diff --git a/debian/_base/applications/adept/debian/patches/series b/debian/_base/applications/adept/debian/patches/series
new file mode 100644
index 000000000..ad5b05138
--- /dev/null
+++ b/debian/_base/applications/adept/debian/patches/series
@@ -0,0 +1 @@
+remove_apport.diff
diff --git a/debian/_base/applications/adept/debian/rules b/debian/_base/applications/adept/debian/rules
new file mode 100755
index 000000000..c51a46292
--- /dev/null
+++ b/debian/_base/applications/adept/debian/rules
@@ -0,0 +1,42 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include debian/cdbs/kde.mk
+#include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
+DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
+DEB_CONFIGURE_PREFIX := /opt/trinity
+DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
+
+cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
+
+DEB_MAKE_CHECK_TARGET := check
+DEB_CONFIGURE_EXTRA_FLAGS += --enable-adept --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib
+
+DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
+                               && echo xz || echo bzip2)
+
+# Enable us to locate the old libept-trinity library and includes
+CPPFLAGS += -I/opt/trinity/include
+LDFLAGS += -L/opt/trinity/lib -lept
+
+post-patches:: debian/stamp-bootstrap
+
+debian/stamp-bootstrap:
+ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" ""
+	cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
+endif
+ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
+	cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
+endif
+ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
+	cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
+endif
+	cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
+	
+	make -f admin/Makefile.common cvs
+	touch debian/stamp-bootstrap
+
+# Store build information
+common-binary-post-install-arch common-binary-post-install-indep::
diff --git a/debian/_base/applications/adept/debian/source/format b/debian/_base/applications/adept/debian/source/format
new file mode 100644
index 000000000..163aaf8d8
--- /dev/null
+++ b/debian/_base/applications/adept/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/_base/applications/adept/debian/source/options b/debian/_base/applications/adept/debian/source/options
new file mode 100644
index 000000000..72f1f5450
--- /dev/null
+++ b/debian/_base/applications/adept/debian/source/options
@@ -0,0 +1,6 @@
+# Use xz instead of gzip
+compression = "xz"
+compression-level = 9
+
+# Don't run differences
+diff-ignore = .*