Rearranged applications folder into sub categories.

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

15 files changed, 692 insertions, 0 deletions

diff --git a/debian/_base/applications/development/kdiff3/debian/cdbs/debian-tde.mk b/debian/_base/applications/development/kdiff3/debian/cdbs/debian-tde.mk
new file mode 100644
index 000000000..f36e3527c
--- /dev/null
+++ b/debian/_base/applications/development/kdiff3/debian/cdbs/debian-tde.mk
@@ -0,0 +1,246 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
+# Copyright © 2019 TDE Team
+# Description: A class for TDE packages; sets TDE environment variables, etc
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+# 02111-1307 USA.
+
+ifndef _cdbs_bootstrap
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+endif
+
+ifndef _cdbs_class_debian-qt-kde
+_cdbs_class_debian-qt-kde := 1
+
+# for dh_icons
+CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
+
+# Note: This _must_ be included before autotools.mk, or it won't work.
+common-configure-arch common-configure-indep:: debian/stamp-cvs-make
+debian/stamp-cvs-make:
+ifndef _cdbs_class_cmake
+	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
+ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
+	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
+endif
+ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
+	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
+endif
+	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
+endif
+	touch debian/stamp-cvs-make
+
+include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
+
+ifdef _cdbs_tarball_dir
+DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
+else
+DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
+endif
+
+ifndef _cdbs_class_cmake
+include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
+endif
+
+ifdef _cdbs_class_cmake
+ifneq "$(wildcard /usr/bin/ninja)" ""
+MAKE = ninja -v
+DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
+DEB_MAKE_INSTALL_TARGET = install
+DEB_CMAKE_NORMAL_ARGS += -GNinja
+endif
+endif
+
+ifndef _cdbs_rules_patchsys_quilt
+DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
+
+export kde_cgidir  = \$${libdir}/cgi-bin
+export kde_confdir = \$${sysconfdir}/trinity
+export kde_htmldir = \$${datadir}/doc/tde/HTML
+
+DEB_KDE_ENABLE_FINAL := yes
+DEB_INSTALL_DOCS_ALL :=
+
+DEB_DH_MAKESHLIBS_ARGS_ALL := -V
+DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
+
+DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
+DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+
+# The default gzip compressor has been changed in dpkg >= 1.17.0.
+deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
+                         sed -e "s|.*version ||" -e "s| .*||" | \
+                         xargs -r dpkg --compare-versions 1.17.0 lt \
+                         && echo xz || echo gzip)
+ifeq ($(deb_default_compress),gzip)
+DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
+                               && echo xz || echo bzip2)
+endif
+
+ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
+    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
+        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
+    else
+        cdbs_kde_enable_final =
+    endif
+endif
+
+ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
+	cdbs_kde_enable_final =
+	cdbs_kde_enable_debug = --enable-debug=yes
+else
+	cdbs_kde_enable_debug = --disable-debug
+endif
+
+ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
+	cdbs_kde_enable_debug = --enable-debug=full
+endif
+
+DEB_BUILD_PARALLEL ?= true
+
+cdbs_configure_flags += \
+    --with-qt-dir=/usr/share/qt3 \
+    --disable-rpath \
+    --with-xinerama \
+    $(cdbs_kde_enable_final) \
+    $(cdbs_kde_enable_debug)
+
+
+# This is a convenience target for calling manually.
+# It's not part of the build process.
+buildprep: clean apply-patches
+ifndef _cdbs_class_cmake
+	$(MAKE) -f admin/Makefile.common dist
+endif
+	debian/rules clean
+
+.tdepkginfo:
+	echo "# TDE package information" >.tdepkginfo
+	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
+	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
+	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
+
+post-patches:: .tdepkginfo
+
+common-build-arch:: debian/stamp-man-pages
+debian/stamp-man-pages:
+	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
+	for f in $$(find debian/man -name '*.sgml'); do \
+		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
+	done
+	for f in $$(find debian/man -name '*.man'); do \
+		soelim -I debian/man $$f \
+		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
+	done
+	touch debian/stamp-man-pages
+
+common-binary-indep::
+	( set -e; \
+	tmpf=`mktemp debian/versions.XXXXXX`; \
+	perl debian/cdbs/versions.pl >$$tmpf; \
+	for p in $(DEB_INDEP_PACKAGES); do \
+	    cat $$tmpf >>debian/$$p.substvars; \
+	done; \
+	rm -f $$tmpf )
+
+common-binary-arch::
+	( set -e; \
+	tmpf=`mktemp debian/versions.XXXXXX`; \
+	perl debian/cdbs/versions.pl >$$tmpf; \
+	for p in $(DEB_ARCH_PACKAGES); do \
+	    cat $$tmpf >>debian/$$p.substvars; \
+	done; \
+	rm -f $$tmpf )
+	# update multi-arch path in install files
+	ls -d debian/* | \
+	grep -E "(install|links)$$" | \
+	while read a; do \
+	    [ -d $$a ] || [ -f $$a.arch ] || \
+	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+	done
+
+clean::
+	rm -rf debian/man/out
+	-rmdir debian/man
+	rm -f debian/stamp-man-pages
+	rm -rf debian/shlibs-check
+	# revert multi-arch path in install files
+	ls -d debian/* | \
+	grep -E "(install|links)$$" | \
+	while read a; do \
+	    [ ! -f $$a.arch ] || \
+	    mv $$a.arch $$a; \
+	done
+
+$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
+	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
+	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
+	if test -e debian/$(cdbs_curpkg).lintian; then \
+		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
+			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
+	fi
+	if test -e debian/$(cdbs_curpkg).presubj; then \
+		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
+			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
+	fi
+
+binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
+	set -e; \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
+		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
+		echo Building $$pkg HTML docs...; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
+	done
+	for pkg in $(DOC_HTML_PRUNE) ; do \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+	done
+
+common-build-indep:: debian/stamp-kde-apidox
+debian/stamp-kde-apidox:
+	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
+	touch $@
+
+common-install-indep:: common-install-kde-apidox
+common-install-kde-apidox::
+	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
+
+cleanbuilddir::
+	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
+
+clean::
+ifndef _cdbs_class_cmake
+	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
+		cd $(DEB_SRCDIR); \
+		find . -name Makefile.in -print | \
+			xargs --no-run-if-empty rm -f; \
+		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
+			configure configure.files configure.in stamp-h.in \
+			subdirs; \
+	fi
+endif
+	rm -f .tdepkginfo
+	rm -f debian/stamp-kde-apidox
+	rm -f debian/stamp-cvs-make
+
+endif
diff --git a/debian/_base/applications/development/kdiff3/debian/cdbs/versions.pl b/debian/_base/applications/development/kdiff3/debian/cdbs/versions.pl
new file mode 100644
index 000000000..1b110f7af
--- /dev/null
+++ b/debian/_base/applications/development/kdiff3/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/development/kdiff3/debian/changelog b/debian/_base/applications/development/kdiff3/debian/changelog
new file mode 100644
index 000000000..f0215eada
--- /dev/null
+++ b/debian/_base/applications/development/kdiff3/debian/changelog
@@ -0,0 +1,224 @@
+kdiff3-trinity (0.9.92-3ubuntu0) karmic; urgency=low
+
+  * Karmic rebuild
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 02 Jul 2009 16:08:00 -0600
+
+kdiff3-trinity (0.9.92-2ubuntu3) intrepid; urgency=low
+
+  * Moved Trinity to /opt/trinity
+  * Integrated properly with KDE4.2+
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 05 March 2009 29:52:00 -0600
+
+kdiff3-trinity (0.9.92-2ubuntu1) intrepid; urgency=low
+
+  * Added -trinity prefix
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Mon, 01 Dec 2008 10:44:00 -0600
+
+kdiff3 (0.9.92-2ubuntu1) hardy; urgency=low
+
+  * Merge from Debian unstable, remaining Ubuntu changes:
+    - debian/rules: added dh_iconcache
+    - debian/control: added libacl1-dev and libattr1-dev to build-dep
+    - Ubuntu MOTU Maintainer
+  * debian/rules: changed dh_iconcache to dh_icons
+
+ -- Richard A. Johnson <nixternal@kubuntu.org>  Fri, 30 Nov 2007 19:30:52 -0600
+
+kdiff3 (0.9.92-2) unstable; urgency=low
+
+  * Include konqueror plugin in package (closes Ubuntu bug no. 145026)
+  * Split package into kdiff3 and kdiff3-doc
+ 
+ -- Eike Sauer <eike@debian.org>  Tue, 11 Nov 2007 20:00:00 +0100
+
+kdiff3 (0.9.92-1ubuntu1) gutsy; urgency=low
+
+  * Merged new debian version, remaining Ubuntu changes:
+    - debian/rules: added dh_iconcache
+    - debian/control: added libacl1-dev and libattr1-dev to build-deb
+  * Added Ubuntu MOTU Maintaner, moved old one to XSBC-Original-Maintainer
+
+ -- Stephan Hermann <sh@sourcecode.de>  Sat,  5 May 2007 20:34:11 +0200
+
+kdiff3 (0.9.92-1) unstable; urgency=low
+
+  * New upstream release
+  	- now distinguishes between empty and non-existent files in "full analysis" 
+  		mode (closes: #417086)
+  	- fixed includes for gcc 4.3, thanks to Martin Michlmayr (closes: #417312)
+  	Thanks to upstream for the Debian bug handling! :o)
+ 
+ -- Eike Sauer <eike@debian.org>  Tue, 17 Apr 2007 16:18:32 +0200
+
+kdiff3 (0.9.91-1) unstable; urgency=low
+
+  * New upstream release
+  * The I'm-a-DD-release...!
+
+ -- Eike Sauer <eike@debian.org>  Sun, 18 Mar 2007 23:33:56 +0100
+
+kdiff3 (0.9.90-5ubuntu1) feisty; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - debian/rules: dh_iconcache
+
+ -- Stephan Hermann <sh@sourcecode.de>  Thu, 21 Dec 2006 11:29:18 +0100
+
+kdiff3 (0.9.90-5) unstable; urgency=low
+
+  * Changed, moved and registered .desktop file (closes: #396790)
+  
+ -- Eike Sauer <eikes@cs.tu-berlin.de>  Tue, 30 Nov 2006 20:15:00 +0200
+
+kdiff3 (0.9.90-4) unstable; urgency=low
+
+  * Added AM_MAINTAINER_MODE
+  
+ -- Eike Sauer <eikes@cs.tu-berlin.de>  Tue, 12 Oct 2006 14:00:00 +0200
+
+kdiff3 (0.9.90-3) unstable; urgency=low
+
+  * More autotooling stuff...
+  
+ -- Eike Sauer <eikes@cs.tu-berlin.de>  Tue, 02 Oct 2006 16:30:00 +0200
+
+kdiff3 (0.9.90-2) unstable; urgency=low
+
+  * Really reduced dependencies (as promised in 0.9.89-1) this time...
+  * manpage updated
+  
+ -- Eike Sauer <eikes@cs.tu-berlin.de>  Tue, 27 Sep 2006 17:40:00 +0200
+
+kdiff3 (0.9.90-1ubuntu1) edgy; urgency=low
+
+  * Merge from debian unstable.
+  * debian/control: removed libacl1-dev and libattr1-dev from build-deps
+  * debian/rules: put dh_iconcache in the correct section 
+
+ -- Stephan Hermann <sh@sourcecode.de>  Sun,  2 Jul 2006 16:52:17 +0200
+
+kdiff3 (0.9.90-1) unstable; urgency=low
+
+  * New upstream release
+  * Standards version now 3.7.2
+
+ -- Eike Sauer <eikes@cs.tu-berlin.de>  Tue, 30 May 2006 10:16:35 +0200
+
+kdiff3 (0.9.89-1) unstable; urgency=low
+
+  * New upstream release
+  * Reduced dependencies from 27 to 5 packages...
+    (see http://lists.debian.org/debian-devel-announce/2005/11/msg00016.html)
+
+ -- Eike Sauer <eikes@cs.tu-berlin.de>  Wed, 12 Apr 2006 00:28:33 +0200
+
+kdiff3 (0.9.88-5ubuntu2) dapper; urgency=low
+
+  * Add dh_iconcache
+
+ -- Sarah Hobbs <hobbsee@ubuntu.com>  Fri, 28 Apr 2006 22:24:09 +1000
+
+kdiff3 (0.9.88-5ubuntu1) dapper; urgency=low
+
+  * debian/control: added libacl1-dev and libattr1-dev to build-deps
+
+ -- Stephan Hermann <sh@sourcecode.de>  Sat, 26 Nov 2005 01:00:50 +0100
+
+kdiff3 (0.9.88-5) unstable; urgency=low
+
+  * corrections to German po file, thanks to Jens Seidel (closes: #314016)
+  * mention GNU diff in copyright file (hint by Florian Ernst)
+  * making manual known to doc-base, so obeying to Debian Policy 3.6.2
+  * ABI transition to GCC 4.0 (closes #327048)
+
+ -- Eike Sauer <eikes@cs.tu-berlin.de>  Fri, 7 Sep 2005 15:15:00 +0100
+
+kdiff3 (0.9.88-4) unstable; urgency=low
+
+  * HTML help goes to /usr/share/doc/kdiff3/html
+
+ -- Eike Sauer <eikes@cs.tu-berlin.de>  Fri, 15 Apr 2005 00:15:00 +0100
+
+kdiff3 (0.9.88-3) unstable; urgency=low
+
+  * symlinked all those documentation images between the different
+    languages (they where the same anyway) - which halves the size 
+    of the package...
+
+ -- Eike Sauer <eikes@cs.tu-berlin.de>  Sun, 10 Apr 2005 22:14:00 +0100
+
+kdiff3 (0.9.88-2) unstable; urgency=low
+
+  * Don't use makefile in clean rule when it doesn't yet exist
+
+ -- Eike Sauer <eikes@cs.tu-berlin.de>  Sun, 10 Apr 2005 22:14:00 +0100
+
+kdiff3 (0.9.88-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Eike Sauer <eikes@cs.tu-berlin.de>  Sat, 26 Feb 2005 18:07:03 +0100
+
+kdiff3 (0.9.87-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Eike Sauer <eikes@cs.tu-berlin.de>  Sun, 30 Jan 2005 19:08:52 +0100
+
+kdiff3 (0.9.86-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Eike Sauer <eikes@cs.tu-berlin.de>  Tue, 15 Jun 2004 11:28:59 +0200
+
+kdiff3 (0.9.84-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Eike Sauer <eikes@cs.tu-berlin.de>  Mon, 31 May 2004 22:43:32 +0200
+
+kdiff3 (0.9.83-2) unstable; urgency=medium
+
+  * First upload of 0.9.83 (closes: #250486)
+  * Casual crashes due to race condition (hopefully) fixed
+
+ -- Eike Sauer <eikes@cs.tu-berlin.de>  Wed,  4 Feb 2004 15:09:12 +0100
+
+kdiff3 (0.9.83-1) unstable; urgency=low
+
+  * New upstream release
+    - now builds on 64 bit architectures (closes: #238221)
+  * We don't need docbook-to-man in Build-Depends anymore
+  * Cleaned up debian/rules.
+
+ -- Eike Sauer <eikes@cs.tu-berlin.de>  Sun,  7 Mar 2004 00:00:32 +0100
+
+kdiff3 (0.9.81-2) unstable; urgency=medium
+
+  * Possible data loss situation fixed by upstream
+
+ -- Eike Sauer <eikes@cs.tu-berlin.de>  Wed,  4 Feb 2004 15:09:12 +0100
+
+kdiff3 (0.9.81-1) unstable; urgency=low
+
+  * New upstream release
+  * Debian manpage accepted by upstream
+
+ -- Eike Sauer <eikes@cs.tu-berlin.de>  Mon, 12 Jan 2004 02:11:51 +0100
+
+kdiff3 (0.9.80-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Eike Sauer <eikes@cs.tu-berlin.de>  Mon,  8 Dec 2003 22:45:16 +0100
+
+kdiff3 (0.9.71-1) unstable; urgency=low
+
+  * Initial Release.
+  * Wrote a short man page to satisfy Debian Policy.
+
+ -- Eike Sauer <eikes@cs.tu-berlin.de>  Wed,  5 Nov 2003 00:25:06 +0100
+
diff --git a/debian/_base/applications/development/kdiff3/debian/compat b/debian/_base/applications/development/kdiff3/debian/compat
new file mode 100644
index 000000000..ec635144f
--- /dev/null
+++ b/debian/_base/applications/development/kdiff3/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/_base/applications/development/kdiff3/debian/control b/debian/_base/applications/development/kdiff3/debian/control
new file mode 100644
index 000000000..aa61b7242
--- /dev/null
+++ b/debian/_base/applications/development/kdiff3/debian/control
@@ -0,0 +1,30 @@
+Source: kdiff3-trinity
+Section: tde
+Priority: optional
+Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
+XSBC-Original-Maintainer: Eike Sauer <eike@debian.org>
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libkonq4-trinity-dev
+Standards-Version: 3.8.4
+
+Package: kdiff3-trinity
+Architecture: any
+Depends: ${shlibs:Depends}
+Replaces: kdiff3-trinity (<< 4:14.0.0~)
+Breaks: kdiff3-trinity (<< 4:14.0.0~)
+Recommends: kdiff3-trinity-doc
+Description: compares and merges 2 or 3 files or directories [Trinity]
+ KDiff3 compares two or three input files and shows the differences
+ line by line and character by character. It provides an automatic
+ merge facility and an integrated editor for comfortable solving of
+ merge conflicts. KDiff3 allows recursive directory comparison and
+ merging as well.
+
+Package: kdiff3-trinity-doc
+Architecture: all
+Recommends: kdiff3-trinity
+Replaces: kdiff3-trinity-doc (<< 4:14.0.0~)
+Breaks: kdiff3-trinity-doc (<< 4:14.0.0~)
+Description: documentation for kdiff3 [Trinity]
+ KDiff3 compares two or three input files and shows the differences
+ line by line and character by character. This package contains the 
+ HTML documentation.
diff --git a/debian/_base/applications/development/kdiff3/debian/copyright b/debian/_base/applications/development/kdiff3/debian/copyright
new file mode 100644
index 000000000..05b7204fd
--- /dev/null
+++ b/debian/_base/applications/development/kdiff3/debian/copyright
@@ -0,0 +1,26 @@
+This package was debianized by Eike Sauer <eikes@cs.tu-berlin.de> on
+Tue, 21 Oct 2003 14:42:39 +0200.
+
+It was downloaded from http://kdiff3.sourceforge.net
+
+Upstream Author: Joachim Eibl <joachim.eibl@gmx.de>
+
+Copyright: (C) 2002-2007 by Joachim Eibl
+
+Parts of this software are derived from GNU diffutils
+by Haertel, Hayes, Stallman, Tower, Eggert et al.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License with
+the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL;
+if not, write to the Free Software Foundation, Inc., 51 Franklin St, 
+Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/debian/_base/applications/development/kdiff3/debian/docs b/debian/_base/applications/development/kdiff3/debian/docs
new file mode 100644
index 000000000..e845566c0
--- /dev/null
+++ b/debian/_base/applications/development/kdiff3/debian/docs
@@ -0,0 +1 @@
+README
diff --git a/debian/_base/applications/development/kdiff3/debian/kdiff3-trinity-doc.doc-base b/debian/_base/applications/development/kdiff3/debian/kdiff3-trinity-doc.doc-base
new file mode 100644
index 000000000..12c5677e6
--- /dev/null
+++ b/debian/_base/applications/development/kdiff3/debian/kdiff3-trinity-doc.doc-base
@@ -0,0 +1,13 @@
+Document: kdiff3-trinity
+Title: KDiff3 Handbook
+Author: Joachim Eibl <joachim.eibl@gmx.de>, The TDE Team
+Abstract:  The manual for KDiff3. KDiff3 compares two or three input files 
+	and shows the differences line by line and character by character. 
+	It provides an automatic merge facility and an integrated editor for 
+	comfortable solving of merge conflicts. KDiff3 allows recursive directory 
+	comparison and merging as well.
+Section: Apps/Programming
+
+Format: HTML
+Index: /opt/trinity/share/doc/kdiff3/html/index.html
+Files: /opt/trinity/share/doc/kdiff3/html/*.html
diff --git a/debian/_base/applications/development/kdiff3/debian/kdiff3-trinity-doc.install b/debian/_base/applications/development/kdiff3/debian/kdiff3-trinity-doc.install
new file mode 100644
index 000000000..515c1099a
--- /dev/null
+++ b/debian/_base/applications/development/kdiff3/debian/kdiff3-trinity-doc.install
@@ -0,0 +1,2 @@
+debian/tmp/opt/trinity/share/doc/tde
+debian/tmp/opt/trinity/share/doc/kdiff3/html
diff --git a/debian/_base/applications/development/kdiff3/debian/kdiff3-trinity-doc.links b/debian/_base/applications/development/kdiff3/debian/kdiff3-trinity-doc.links
new file mode 100644
index 000000000..8d3a5bde5
--- /dev/null
+++ b/debian/_base/applications/development/kdiff3/debian/kdiff3-trinity-doc.links
@@ -0,0 +1,97 @@
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/dirbrowser.png			/opt/trinity/share/doc/tde/HTML/da/kdiff3/dirbrowser.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/dirmergebig.png		/opt/trinity/share/doc/tde/HTML/da/kdiff3/dirmergebig.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/iteminfo.png			/opt/trinity/share/doc/tde/HTML/da/kdiff3/iteminfo.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/letter_by_letter.png	/opt/trinity/share/doc/tde/HTML/da/kdiff3/letter_by_letter.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/merge_current.png		/opt/trinity/share/doc/tde/HTML/da/kdiff3/merge_current.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/new.png				/opt/trinity/share/doc/tde/HTML/da/kdiff3/new.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/open_dialog.png		/opt/trinity/share/doc/tde/HTML/da/kdiff3/open_dialog.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/screenshot_diff.png	/opt/trinity/share/doc/tde/HTML/da/kdiff3/screenshot_diff.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/screenshot_merge.png	/opt/trinity/share/doc/tde/HTML/da/kdiff3/screenshot_merge.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/triple_diff.png		/opt/trinity/share/doc/tde/HTML/da/kdiff3/triple_diff.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/white_space.png		/opt/trinity/share/doc/tde/HTML/da/kdiff3/white_space.png
+
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/dirbrowser.png			/opt/trinity/share/doc/tde/HTML/de/kdiff3/dirbrowser.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/dirmergebig.png		/opt/trinity/share/doc/tde/HTML/de/kdiff3/dirmergebig.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/iteminfo.png			/opt/trinity/share/doc/tde/HTML/de/kdiff3/iteminfo.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/letter_by_letter.png	/opt/trinity/share/doc/tde/HTML/de/kdiff3/letter_by_letter.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/merge_current.png		/opt/trinity/share/doc/tde/HTML/de/kdiff3/merge_current.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/new.png				/opt/trinity/share/doc/tde/HTML/de/kdiff3/new.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/open_dialog.png		/opt/trinity/share/doc/tde/HTML/de/kdiff3/open_dialog.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/screenshot_diff.png	/opt/trinity/share/doc/tde/HTML/de/kdiff3/screenshot_diff.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/screenshot_merge.png	/opt/trinity/share/doc/tde/HTML/de/kdiff3/screenshot_merge.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/triple_diff.png		/opt/trinity/share/doc/tde/HTML/de/kdiff3/triple_diff.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/white_space.png		/opt/trinity/share/doc/tde/HTML/de/kdiff3/white_space.png
+
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/dirbrowser.png			/opt/trinity/share/doc/tde/HTML/et/kdiff3/dirbrowser.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/dirmergebig.png		/opt/trinity/share/doc/tde/HTML/et/kdiff3/dirmergebig.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/iteminfo.png			/opt/trinity/share/doc/tde/HTML/et/kdiff3/iteminfo.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/letter_by_letter.png	/opt/trinity/share/doc/tde/HTML/et/kdiff3/letter_by_letter.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/merge_current.png		/opt/trinity/share/doc/tde/HTML/et/kdiff3/merge_current.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/new.png				/opt/trinity/share/doc/tde/HTML/et/kdiff3/new.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/open_dialog.png		/opt/trinity/share/doc/tde/HTML/et/kdiff3/open_dialog.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/screenshot_diff.png	/opt/trinity/share/doc/tde/HTML/et/kdiff3/screenshot_diff.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/screenshot_merge.png	/opt/trinity/share/doc/tde/HTML/et/kdiff3/screenshot_merge.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/triple_diff.png		/opt/trinity/share/doc/tde/HTML/et/kdiff3/triple_diff.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/white_space.png		/opt/trinity/share/doc/tde/HTML/et/kdiff3/white_space.png
+
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/dirbrowser.png			/opt/trinity/share/doc/tde/HTML/fr/kdiff3/dirbrowser.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/dirmergebig.png		/opt/trinity/share/doc/tde/HTML/fr/kdiff3/dirmergebig.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/iteminfo.png			/opt/trinity/share/doc/tde/HTML/fr/kdiff3/iteminfo.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/letter_by_letter.png	/opt/trinity/share/doc/tde/HTML/fr/kdiff3/letter_by_letter.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/merge_current.png		/opt/trinity/share/doc/tde/HTML/fr/kdiff3/merge_current.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/new.png				/opt/trinity/share/doc/tde/HTML/fr/kdiff3/new.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/open_dialog.png		/opt/trinity/share/doc/tde/HTML/fr/kdiff3/open_dialog.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/screenshot_diff.png	/opt/trinity/share/doc/tde/HTML/fr/kdiff3/screenshot_diff.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/screenshot_merge.png	/opt/trinity/share/doc/tde/HTML/fr/kdiff3/screenshot_merge.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/triple_diff.png		/opt/trinity/share/doc/tde/HTML/fr/kdiff3/triple_diff.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/white_space.png		/opt/trinity/share/doc/tde/HTML/fr/kdiff3/white_space.png
+
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/dirbrowser.png			/opt/trinity/share/doc/tde/HTML/it/kdiff3/dirbrowser.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/dirmergebig.png		/opt/trinity/share/doc/tde/HTML/it/kdiff3/dirmergebig.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/iteminfo.png			/opt/trinity/share/doc/tde/HTML/it/kdiff3/iteminfo.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/letter_by_letter.png	/opt/trinity/share/doc/tde/HTML/it/kdiff3/letter_by_letter.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/merge_current.png		/opt/trinity/share/doc/tde/HTML/it/kdiff3/merge_current.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/new.png				/opt/trinity/share/doc/tde/HTML/it/kdiff3/new.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/open_dialog.png		/opt/trinity/share/doc/tde/HTML/it/kdiff3/open_dialog.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/screenshot_diff.png	/opt/trinity/share/doc/tde/HTML/it/kdiff3/screenshot_diff.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/screenshot_merge.png	/opt/trinity/share/doc/tde/HTML/it/kdiff3/screenshot_merge.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/triple_diff.png		/opt/trinity/share/doc/tde/HTML/it/kdiff3/triple_diff.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/white_space.png		/opt/trinity/share/doc/tde/HTML/it/kdiff3/white_space.png
+
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/dirbrowser.png			/opt/trinity/share/doc/tde/HTML/pt/kdiff3/dirbrowser.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/dirmergebig.png		/opt/trinity/share/doc/tde/HTML/pt/kdiff3/dirmergebig.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/iteminfo.png			/opt/trinity/share/doc/tde/HTML/pt/kdiff3/iteminfo.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/letter_by_letter.png	/opt/trinity/share/doc/tde/HTML/pt/kdiff3/letter_by_letter.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/merge_current.png		/opt/trinity/share/doc/tde/HTML/pt/kdiff3/merge_current.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/new.png				/opt/trinity/share/doc/tde/HTML/pt/kdiff3/new.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/open_dialog.png		/opt/trinity/share/doc/tde/HTML/pt/kdiff3/open_dialog.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/screenshot_diff.png	/opt/trinity/share/doc/tde/HTML/pt/kdiff3/screenshot_diff.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/screenshot_merge.png	/opt/trinity/share/doc/tde/HTML/pt/kdiff3/screenshot_merge.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/triple_diff.png		/opt/trinity/share/doc/tde/HTML/pt/kdiff3/triple_diff.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/white_space.png		/opt/trinity/share/doc/tde/HTML/pt/kdiff3/white_space.png
+
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/dirbrowser.png			/opt/trinity/share/doc/tde/HTML/sv/kdiff3/dirbrowser.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/dirmergebig.png		/opt/trinity/share/doc/tde/HTML/sv/kdiff3/dirmergebig.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/iteminfo.png			/opt/trinity/share/doc/tde/HTML/sv/kdiff3/iteminfo.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/letter_by_letter.png	/opt/trinity/share/doc/tde/HTML/sv/kdiff3/letter_by_letter.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/merge_current.png		/opt/trinity/share/doc/tde/HTML/sv/kdiff3/merge_current.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/new.png				/opt/trinity/share/doc/tde/HTML/sv/kdiff3/new.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/open_dialog.png		/opt/trinity/share/doc/tde/HTML/sv/kdiff3/open_dialog.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/screenshot_diff.png	/opt/trinity/share/doc/tde/HTML/sv/kdiff3/screenshot_diff.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/screenshot_merge.png	/opt/trinity/share/doc/tde/HTML/sv/kdiff3/screenshot_merge.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/triple_diff.png		/opt/trinity/share/doc/tde/HTML/sv/kdiff3/triple_diff.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/white_space.png		/opt/trinity/share/doc/tde/HTML/sv/kdiff3/white_space.png
+
+
+/opt/trinity/share/doc/tde/HTML/en/common						/opt/trinity/share/doc/kdiff3/html/common
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/dirbrowser.png			/opt/trinity/share/doc/kdiff3/html/dirbrowser.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/dirmergebig.png		/opt/trinity/share/doc/kdiff3/html/dirmergebig.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/iteminfo.png			/opt/trinity/share/doc/kdiff3/html/iteminfo.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/letter_by_letter.png	/opt/trinity/share/doc/kdiff3/html/letter_by_letter.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/merge_current.png		/opt/trinity/share/doc/kdiff3/html/merge_current.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/new.png				/opt/trinity/share/doc/kdiff3/html/new.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/open_dialog.png		/opt/trinity/share/doc/kdiff3/html/open_dialog.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/screenshot_diff.png	/opt/trinity/share/doc/kdiff3/html/screenshot_diff.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/screenshot_merge.png	/opt/trinity/share/doc/kdiff3/html/screenshot_merge.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/triple_diff.png		/opt/trinity/share/doc/kdiff3/html/triple_diff.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/white_space.png		/opt/trinity/share/doc/kdiff3/html/white_space.png
diff --git a/debian/_base/applications/development/kdiff3/debian/kdiff3-trinity.install b/debian/_base/applications/development/kdiff3/debian/kdiff3-trinity.install
new file mode 100644
index 000000000..0a666b7b0
--- /dev/null
+++ b/debian/_base/applications/development/kdiff3/debian/kdiff3-trinity.install
@@ -0,0 +1,9 @@
+debian/tmp/opt/trinity/bin
+debian/tmp/opt/trinity/lib
+debian/tmp/opt/trinity/share/icons
+debian/tmp/opt/trinity/share/locale
+debian/tmp/opt/trinity/share/applications
+debian/tmp/opt/trinity/share/applnk
+debian/tmp/opt/trinity/share/apps
+debian/tmp/opt/trinity/share/man
+debian/tmp/opt/trinity/share/services
diff --git a/debian/_base/applications/development/kdiff3/debian/patches/.gitignore b/debian/_base/applications/development/kdiff3/debian/patches/.gitignore
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/debian/_base/applications/development/kdiff3/debian/patches/.gitignore
diff --git a/debian/_base/applications/development/kdiff3/debian/rules b/debian/_base/applications/development/kdiff3/debian/rules
new file mode 100755
index 000000000..a6797f19a
--- /dev/null
+++ b/debian/_base/applications/development/kdiff3/debian/rules
@@ -0,0 +1,17 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
+include debian/cdbs/debian-tde.mk
+
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -DCONFIG_INSTALL_DIR="/etc/trinity" \
+ -DSYSCONF_INSTALL_DIR="/etc/trinity" \
+ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON"
diff --git a/debian/_base/applications/development/kdiff3/debian/source/format b/debian/_base/applications/development/kdiff3/debian/source/format
new file mode 100644
index 000000000..163aaf8d8
--- /dev/null
+++ b/debian/_base/applications/development/kdiff3/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/_base/applications/development/kdiff3/debian/source/options b/debian/_base/applications/development/kdiff3/debian/source/options
new file mode 100644
index 000000000..72f1f5450
--- /dev/null
+++ b/debian/_base/applications/development/kdiff3/debian/source/options
@@ -0,0 +1,6 @@
+# Use xz instead of gzip
+compression = "xz"
+compression-level = 9
+
+# Don't run differences
+diff-ignore = .*