Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging

72 files changed, 2019 insertions, 30 deletions

diff --git a/ubuntu/maverick/applications/kscope/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kscope/debian/cdbs/debian-qt-kde.mk
new file mode 100644
index 000000000..d81e0a12f
--- /dev/null
+++ b/ubuntu/maverick/applications/kscope/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:
+ifndef _cdbs_class_cmake
+	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;
+endif
+	touch debian/stamp-cvs-make
+
+include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
+#include debian/cdbs/uploaders.mk
+
+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::
+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 debian/stamp-cvs-make
+
+endif
diff --git a/ubuntu/maverick/applications/kscope/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kscope/debian/cdbs/kde.mk
new file mode 100644
index 000000000..023886fc8
--- /dev/null
+++ b/ubuntu/maverick/applications/kscope/debian/cdbs/kde.mk
@@ -0,0 +1,99 @@
+# -*- 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
+
+ifndef _cdbs_class_cmake
+include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
+endif
+
+export kde_cgidir  = \$${libdir}/cgi-bin
+export kde_confdir = \$${sysconfdir}/trinity
+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"
+DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+
+$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
+	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
+
+cleanbuilddir::
+	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
+
+common-build-arch common-build-indep:: debian/stamp-kde-apidox
+debian/stamp-kde-apidox:
+	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
+	touch $@
+
+common-install-prehook-impl::
+	mkdir -p po
+	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
+	-for file in po/*pot; do \
+		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
+	done
+
+common-install-arch common-install-indep:: common-install-kde-apidox
+common-install-kde-apidox::
+	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
+
+clean::
+	rm -f debian/stamp-kde-apidox
+	rm -rf po/*.pot
+
+# This is a convenience target for calling manually.  It's not part of
+# the build process.
+buildprep: clean apply-patches
+	$(MAKE) -f admin/Makefile.common dist
+	debian/rules clean
+
+endif
diff --git a/ubuntu/maverick/applications/kscope/debian/cdbs/versions.pl b/ubuntu/maverick/applications/kscope/debian/cdbs/versions.pl
new file mode 100644
index 000000000..75c9add4b
--- /dev/null
+++ b/ubuntu/maverick/applications/kscope/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 "KDE-Version3=$version3\n";
+print "KDE-Version2=$version2\n";
+print "KDE-Next-Version3=$version3_next\n";
+print "KDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/maverick/applications/kscope/debian/changelog b/ubuntu/maverick/applications/kscope/debian/changelog
new file mode 100644
index 000000000..d3689c28f
--- /dev/null
+++ b/ubuntu/maverick/applications/kscope/debian/changelog
@@ -0,0 +1,97 @@
+kscope-trinity (1.6.2-1ubuntu1) maverick; urgency=low
+
+  * Initial Release for TDE
+
+ -- Slávek Banko <slavek.banko@axis.cz>  Mon, 07 Sep 2013 23:43:53 +0200
+
+kscope (1.6.2-1ubuntu1) maverick; urgency=low
+
+  * Port to Ubuntu.
+
+ -- Eugene San (eugenesan) <eugenesan@gmail.com>  Fri, 04 Feb 2011 22:02:59 +0200
+
+kscope (1.6.2-1) unstable; urgency=low
+
+  * New upstream release (bugfix release).
+  * Bump Standards-Version to 3.8.0 (no changes needed).
+
+ -- Fathi Boudra <fabo@debian.org>  Sat, 09 Aug 2008 10:20:14 +0200
+
+kscope (1.6.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Refresh patches.
+  * Bump Standards-Version to 3.7.3.
+  * Use Homepage, Vcs-Browser and Vcs-Svn fields.
+  * Switch to quilt patch system.
+  * Remove embedded copy of GFDL as it can be found in common-licences.
+
+ -- Fathi Boudra <fabo@debian.org>  Sat, 01 Mar 2008 19:33:31 +0100
+
+kscope (1.6.0-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Fathi Boudra <fboudra@free.fr>  Thu, 12 Jul 2007 21:22:32 +0200
+
+kscope (1.5.2-1) unstable; urgency=low
+
+  * New upstream release. (Closes: #420874)
+
+ -- Fathi Boudra <fboudra@free.fr>  Tue, 15 May 2007 19:47:50 +0200
+
+kscope (1.5.1-2) unstable; urgency=low
+
+  * Upload to unstable
+
+ -- Mark Purcell <msp@debian.org>  Sat,  3 Mar 2007 13:23:12 +0000
+
+kscope (1.5.1-1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Fathi Boudra <fboudra@free.fr>  Thu, 15 Feb 2007 18:56:31 +0100
+
+kscope (1.5.0-1) unstable; urgency=low
+
+  * New upstream release
+  * Add ./debian/rules get-orig-source for http://buildserver.net
+  * Build-Depends: autotools-dev fixes outdated-autotools-helper-file
+
+ -- Mark Purcell <msp@debian.org>  Wed,  7 Feb 2007 21:08:10 +0000
+
+kscope (1.4.2-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Fathi Boudra <fboudra@free.fr>  Mon, 16 Oct 2006 22:03:21 +0200
+
+kscope (1.4.1-2) unstable; urgency=low
+
+  * Add patch to load default config
+
+ -- Fathi Boudra <fboudra@free.fr>  Fri,  8 Sep 2006 18:13:30 +0200
+
+kscope (1.4.1-1) unstable; urgency=low
+
+  * New upstream release
+  * Remove 11_crashfix.diff, merged upstream
+
+ -- Fathi Boudra <fboudra@free.fr>  Thu, 24 Aug 2006 12:24:23 +0200
+
+kscope (1.4.0-1) unstable; urgency=low
+
+  * New upstream release
+  * Merge kubuntu patches, thanks to Tom Albers <tomalbers@kde.nl>
+  * Add kscope manpage from kubuntu package,
+    thanks to Jonathan Patrick Davies <jpatrick@ubuntu.com>
+  * Update copyright file: add kscope manpage license
+
+ -- Fathi Boudra <fboudra@free.fr>  Thu, 10 Aug 2006 14:42:31 +0200
+
+kscope (1.3.4-1) unstable; urgency=low
+
+  * Initial release (Closes: #309669)
+
+ -- Fathi Boudra <fboudra@free.fr>  Fri, 28 Apr 2006 08:05:15 +0100
+
diff --git a/ubuntu/maverick/applications/kscope/debian/compat b/ubuntu/maverick/applications/kscope/debian/compat
new file mode 100644
index 000000000..7ed6ff82d
--- /dev/null
+++ b/ubuntu/maverick/applications/kscope/debian/compat
@@ -0,0 +1 @@
+5
diff --git a/ubuntu/maverick/applications/kscope/debian/control b/ubuntu/maverick/applications/kscope/debian/control
new file mode 100644
index 000000000..f48fa899a
--- /dev/null
+++ b/ubuntu/maverick/applications/kscope/debian/control
@@ -0,0 +1,45 @@
+Source: kscope-trinity
+Section: tde
+Priority: optional
+Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
+Uploaders: Fathi Boudra <fabo@debian.org>, Mark Purcell <msp@debian.org>
+Build-Depends: cdbs, debhelper (>= 5), quilt, automake, libtool, bison, flex,
+ tdebase-trinity-dev, docbook2x, docbook-xml
+Standards-Version: 3.8.0
+Homepage: http://kscope.sourceforge.net
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/kde-extras/kscope/?op=log
+Vcs-Svn: svn://svn.debian.org/pkg-kde/kde-extras/kscope/trunk
+
+Package: kscope-trinity
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, cscope, exuberant-ctags, graphviz
+Description: source editing environment for TDE
+ KScope is a TDE front-end to Cscope. It provides a source-editing environment
+ for large C projects. KScope is focused on source editing and analysis.
+ .
+ KScope is built around an efficient mechanism for code-navigation, which
+ allows the user to run queries on the code.
+ .
+ The types of queries KScope can run include:
+   * Get all references to a symbol
+   * Find the definition of a symbol
+   * Find all functions called by or calling to a function
+   * Find an EGrep pattern
+   * Find all files #including some file
+ .
+ These queries are handled by an underlying Cscope process. KScope simply
+ serves as a front-end to this process, feeding it with queries, and parsing
+ its output into result lists. The items in those lists can later be selected
+ to open an editor at the matching line.
+ .
+ Main Features:
+  * Multiple editor windows (using your favourite TDE editor)
+  * Project management
+  * Front-end to most Cscope queries
+  * Tag list for every open editor
+  * Call-tree window
+  * Session management, including saving and restoring queries
+  * Works with externally-built cscope.out files
+ .
+  Homepage: http://kscope.sourceforge.net
diff --git a/ubuntu/maverick/applications/kscope/debian/copyright b/ubuntu/maverick/applications/kscope/debian/copyright
new file mode 100644
index 000000000..6149f4244
--- /dev/null
+++ b/ubuntu/maverick/applications/kscope/debian/copyright
@@ -0,0 +1,62 @@
+This package was debianized by Fathi Boudra <fboudra@free.fr> on
+Tue, 11 Apr 2006 11:44:04 +0200.
+
+It was downloaded from http://kscope.sourceforge.net
+
+Copyright Holder: Elad Lahav <elad_lahav@users.sf.net>
+
+The kscope manpage is © 2006 Jonathan Patrick Davies <jpatrick@ubuntu.com>
+and is licensed under the GPL, see below.
+
+manpage license:
+
+   This package 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 package 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 package; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL-2'.
+
+kscope license:
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. 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.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+
+On Debian systems, the complete text of the BSD License can be 
+found in `/usr/share/common-licenses/BSD'.
+
+The documentations provided with kscope is distributed under
+the GNU Free Documentation License (FDL). They are considered free with
+regards to the Debian Free Software Guidelines (DFSG) because they don't
+contain any unmodifiable parts (invariant sections).
+
+On Debian systems, the complete text of the GNU Free Documentation
+License can be found in `/usr/share/common-licenses/GFDL'.
diff --git a/ubuntu/maverick/applications/kscope/debian/docs b/ubuntu/maverick/applications/kscope/debian/docs
new file mode 100644
index 000000000..1333ed77b
--- /dev/null
+++ b/ubuntu/maverick/applications/kscope/debian/docs
@@ -0,0 +1 @@
+TODO
diff --git a/ubuntu/maverick/applications/kscope/debian/kscope.xml b/ubuntu/maverick/applications/kscope/debian/kscope.xml
new file mode 100644
index 000000000..a70b1be45
--- /dev/null
+++ b/ubuntu/maverick/applications/kscope/debian/kscope.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+]>
+<refentry>
+  <refentryinfo>
+    <author>
+      <firstname>Jonathan Patrick</firstname>
+      <surname>Davies</surname>
+      <email>jpatrick@ubuntu.com</email>
+    </author>
+    <copyright>
+      <year>2006</year>
+      <holder>Jonathan Patrick Davies</holder>
+    </copyright>
+    <!-- XXX IMPORTANT XXX -->
+    <!-- Keep this date up to date: -->
+    <date>2006-02-18</date>
+    <!--  ^^^^^^^^^^ -->
+  </refentryinfo>
+  <refmeta>
+    <refentrytitle>kscope</refentrytitle>
+    <manvolnum>1</manvolnum>
+  </refmeta>
+  <refnamediv>
+    <refname>kscope</refname>
+    <refpurpose>a source browsing and editing environment</refpurpose>
+  </refnamediv>
+  <refsynopsisdiv>
+    <cmdsynopsis>
+      <command>kscope</command>
+      <arg choice="opt">
+        <option><replaceable>Qt-options</replaceable></option>
+      </arg>
+      <arg choice="opt">
+        <option><replaceable>TDE-options</replaceable></option>
+      </arg>
+    </cmdsynopsis>
+  </refsynopsisdiv>
+  <refsect1>
+    <title>DESCRIPTION</title>
+    <para>
+      KScope is a source browsing and editing environment for large projects written
+      in C (such as the Linux kernel).
+    </para>
+    <para>
+      KScope uses the Cscope code analysis engine to provide valuable information to
+      coders.
+    </para>
+    <para>
+      KScope also provides call-tree and call-graph views that can help developers
+      by visualising the relationships between different functions in the code base.
+    </para>
+  </refsect1>
+  <refsect1>
+    <title>OPTIONS</title>
+    <para>
+      All <productname>TDE</productname> and <productname>Qt</productname>
+      programs accept a some common command-line options.  KScope has no
+      application-specific options.
+    </para>
+    <para>
+      <variablelist>
+        <title>Generic options:</title>
+        <varlistentry>
+          <term> <option>--help</option> </term>
+          <listitem> <para>Show help about options</para> </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term> <option>--help-qt</option> </term>
+          <listitem> <para>Show Qt specific options</para> </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term> <option>--help-tde</option> </term>
+          <listitem> <para>Show TDE specific options</para> </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term> <option>--help-all</option> </term>
+          <listitem> <para>Show all options</para> </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term> <option>--author</option> </term>
+          <listitem> <para>Show author information</para> </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term> <option>-v</option>, <option>--version</option> </term>
+          <listitem> <para>Show version information</para> </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term> <option>--license</option> </term>
+          <listitem> <para>Show license information</para> </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term> <option>--</option> </term>
+          <listitem> <para>Indicates end of options</para> </listitem>
+        </varlistentry>
+      </variablelist>
+      <!-- TODO * add all the rest of the options, but maybe find an automated
+      way to keep it up to date -->
+    </para>
+  </refsect1>
+  <refsect1>
+    <title>AUTHOR</title>
+    <para>
+      KScope was written by Elad Lahav <email>elad_lahav@users.sf.net</email>.
+    </para>
+   </refsect1>
+  <refsect1>
+    <title>COPYRIGHT</title>
+    <para>
+      This manual page was written by Jonathan Patrick Davies
+      <email>jpatrick@ubuntu.com</email> for the
+      <productname>Ubuntu</productname> system (but may be used by others).
+      Permission is granted to copy, distribute and/or modify this document
+      under the terms of the <acronym>GNU</acronym> General Public License,
+      Version 2 or any later version published by the Free Software Foundation.
+    </para>
+    <para>
+      On Debian systems, the complete text of the GNU General Public
+      License can be found in
+      <filename>/usr/share/common-licenses/GPL</filename>.
+    </para>
+  </refsect1>
+</refentry>
diff --git a/ubuntu/maverick/applications/kscope/debian/manpages b/ubuntu/maverick/applications/kscope/debian/manpages
new file mode 100644
index 000000000..03ff43b50
--- /dev/null
+++ b/ubuntu/maverick/applications/kscope/debian/manpages
@@ -0,0 +1 @@
+kscope.1
diff --git a/ubuntu/maverick/applications/kscope/debian/patches/04_am_maintainer_mode.diff b/ubuntu/maverick/applications/kscope/debian/patches/04_am_maintainer_mode.diff
new file mode 100644
index 000000000..391a80285
--- /dev/null
+++ b/ubuntu/maverick/applications/kscope/debian/patches/04_am_maintainer_mode.diff
@@ -0,0 +1,11 @@
+--- a/admin/configure.in.min
++++ b/admin/configure.in.min
+@@ -38,6 +38,8 @@
+ dnl Automake doc recommends to do this only here. (Janos)
+ AM_INIT_AUTOMAKE(@MODULENAME@, @VERSION@) dnl searches for some needed programs
+ 
++AM_MAINTAINER_MODE
++
+ KDE_SET_PREFIX
+ 
+ dnl generate the config header
diff --git a/ubuntu/maverick/applications/kscope/debian/patches/06_disable_no_undefined.diff b/ubuntu/maverick/applications/kscope/debian/patches/06_disable_no_undefined.diff
new file mode 100644
index 000000000..05c932c3c
--- /dev/null
+++ b/ubuntu/maverick/applications/kscope/debian/patches/06_disable_no_undefined.diff
@@ -0,0 +1,18 @@
+--- a/admin/acinclude.m4.in
++++ b/admin/acinclude.m4.in
+@@ -1689,15 +1689,6 @@
+        KDE_USE_CLOSURE_TRUE="#"
+        KDE_USE_CLOSURE_FALSE=""
+        KDE_NO_UNDEFINED=""
+-       case $host in 
+-         *-*-linux-gnu)
+-           KDE_CHECK_COMPILER_FLAG([Wl,--no-undefined],
+-                [KDE_CHECK_COMPILER_FLAG([Wl,--allow-shlib-undefined],
+-		[KDE_NO_UNDEFINED="-Wl,--no-undefined -Wl,--allow-shlib-undefined"],
+-		[KDE_NO_UNDEFINED=""])],
+-	    [KDE_NO_UNDEFINED=""])
+-           ;;
+-       esac
+   fi
+   AC_SUBST(KDE_USE_CLOSURE_TRUE)
+   AC_SUBST(KDE_USE_CLOSURE_FALSE)
diff --git a/ubuntu/maverick/applications/kscope/debian/patches/series b/ubuntu/maverick/applications/kscope/debian/patches/series
new file mode 100644
index 000000000..b8743ddd9
--- /dev/null
+++ b/ubuntu/maverick/applications/kscope/debian/patches/series
@@ -0,0 +1,2 @@
+04_am_maintainer_mode.diff
+06_disable_no_undefined.diff
diff --git a/ubuntu/maverick/applications/kscope/debian/rules b/ubuntu/maverick/applications/kscope/debian/rules
new file mode 100755
index 000000000..65883a481
--- /dev/null
+++ b/ubuntu/maverick/applications/kscope/debian/rules
@@ -0,0 +1,40 @@
+#!/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
+include /usr/share/cdbs/1/rules/utils.mk
+
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include
+DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
+DEB_CONFIGURE_PREFIX := /opt/trinity
+DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
+
+DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
+                               && echo xz || echo bzip2)
+
+post-patches:: debian/stamp-bootstrap
+
+debian/stamp-bootstrap:
+	dh_testdir
+
+	# Regenerate build system
+	! [ -f /usr/share/libtool/ltmain.sh ] || \
+	cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
+	! [ -f /usr/share/libtool/config/ltmain.sh ] || \
+	cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
+	cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
+
+	autoreconf --install && automake -f && \
+	$(MAKE) -f admin/Makefile.common && \
+	touch debian/stamp-bootstrap
+
+build/kscope-trinity::
+	/usr/bin/docbook2x-man debian/kscope.xml
+
+binary-install/kscope-trinity::
+	mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
+
+clean::
+	rm -f kscope.1
+	rm -f debian/stamp-bootstrap
diff --git a/ubuntu/maverick/applications/kscope/debian/source/format b/ubuntu/maverick/applications/kscope/debian/source/format
new file mode 100644
index 000000000..89ae9db8f
--- /dev/null
+++ b/ubuntu/maverick/applications/kscope/debian/source/format
@@ -0,0 +1 @@
+3.0 (native)
diff --git a/ubuntu/maverick/applications/kscope/debian/source/options b/ubuntu/maverick/applications/kscope/debian/source/options
new file mode 100644
index 000000000..72f1f5450
--- /dev/null
+++ b/ubuntu/maverick/applications/kscope/debian/source/options
@@ -0,0 +1,6 @@
+# Use xz instead of gzip
+compression = "xz"
+compression-level = 9
+
+# Don't run differences
+diff-ignore = .*
diff --git a/ubuntu/maverick/applications/kscope/debian/watch b/ubuntu/maverick/applications/kscope/debian/watch
new file mode 100644
index 000000000..6825f61dd
--- /dev/null
+++ b/ubuntu/maverick/applications/kscope/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://sf.net/kscope/kscope-(.*)\.tar\.gz debian svn-upgrade
diff --git a/ubuntu/maverick/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff b/ubuntu/maverick/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff
index 826d4e236..0729793b7 100644
--- a/ubuntu/maverick/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff
+++ b/ubuntu/maverick/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff
@@ -14,16 +14,16 @@ index 7c45fcf..b933832 100644
  	}
  	else
  	{
--// 		if (getenv("USER") != "root")
+-// 		if (getenv("USER") != TQString("root"))
 -// 		{
 -// 			KMessageBox::error( 0, I18N_NOOP( "Kvpnc must be started as root!" ) );
 -// 			exit(0);
 -// 		}
-+ 		if (getenv("USER") != "root")
-+ 		{
-+ 			KMessageBox::error( 0, I18N_NOOP( "Kvpnc must be started as root!" ) );
-+ 			exit(0);
-+ 		}
++		if (getenv("USER") != TQString("root"))
++		{
++			KMessageBox::error( 0, I18N_NOOP( "Kvpnc must be started as root!" ) );
++			exit(0);
++		}
  
  		TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
  
diff --git a/ubuntu/maverick/applications/kvpnc/debian/patches/series b/ubuntu/maverick/applications/kvpnc/debian/patches/series
index 09040ada9..d29c3ca91 100644
--- a/ubuntu/maverick/applications/kvpnc/debian/patches/series
+++ b/ubuntu/maverick/applications/kvpnc/debian/patches/series
@@ -1,2 +1,2 @@
-10_su-to-root_usage.diff
+# 10_su-to-root_usage.diff
 13_add_kuser_issuperuser.diff
diff --git a/ubuntu/maverick/applications/tdepowersave/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/tdepowersave/debian/cdbs/debian-qt-kde.mk
index c807eed8c..33a932634 100644
--- a/ubuntu/maverick/applications/tdepowersave/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/tdepowersave/debian/cdbs/debian-qt-kde.mk
@@ -10,9 +10,11 @@ _cdbs_class_debian-qt-kde := 1
 # Note: This _must_ be included before autotools.mk, or it won't work.
 common-configure-arch common-configure-indep:: debian/stamp-cvs-make
 debian/stamp-cvs-make:
+ifndef _cdbs_class_cmake
 	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
 	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
 	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
+endif
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
@@ -98,6 +100,7 @@ binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	done
 
 clean::
+ifndef _cdbs_class_cmake
 	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
 		cd $(DEB_SRCDIR); \
 		find . -name Makefile.in -print | \
@@ -106,6 +109,7 @@ clean::
 			configure configure.files configure.in stamp-h.in \
 			subdirs; \
 	fi
+endif
 	rm -f debian/stamp-cvs-make
 
 endif
diff --git a/ubuntu/maverick/applications/tdepowersave/debian/cdbs/kde.mk b/ubuntu/maverick/applications/tdepowersave/debian/cdbs/kde.mk
index 765560c89..023886fc8 100644
--- a/ubuntu/maverick/applications/tdepowersave/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/tdepowersave/debian/cdbs/kde.mk
@@ -35,7 +35,9 @@ else
 DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
 endif
 
+ifndef _cdbs_class_cmake
 include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
+endif
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
@@ -59,7 +61,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/ubuntu/maverick/applications/tdepowersave/debian/control b/ubuntu/maverick/applications/tdepowersave/debian/control
index ca4a5def2..7882039dd 100644
--- a/ubuntu/maverick/applications/tdepowersave/debian/control
+++ b/ubuntu/maverick/applications/tdepowersave/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Michael Biebl <biebl@debian.org>
-Build-Depends: cdbs, debhelper (>= 5.0.0), quilt, tdelibs14-trinity-dev, libxss-dev, libxtst-dev, libdbus-1-dev (>= 0.6), libdbus-tqt-1-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>= 5.0.0), quilt, tdelibs14-trinity-dev, libxss-dev, libxtst-dev, libdbus-1-dev (>= 0.6), libdbus-tqt-1-dev, cmake, automake, autoconf, libtool, libltdl-dev
 Build-Conflicts: autoconf2.13
 Standards-Version: 3.8.4
 Homepage: http://sourceforge.net/projects/powersave/
diff --git a/ubuntu/maverick/applications/tdepowersave/debian/rules b/ubuntu/maverick/applications/tdepowersave/debian/rules
index f74a76605..a891b0150 100755
--- a/ubuntu/maverick/applications/tdepowersave/debian/rules
+++ b/ubuntu/maverick/applications/tdepowersave/debian/rules
@@ -1,5 +1,6 @@
 #!/usr/bin/make -f
   
+include /usr/share/cdbs/1/class/cmake.mk
 include debian/cdbs/kde.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
@@ -17,9 +18,20 @@ DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinit
 DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
                                && echo xz || echo bzip2)
 
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -DCONFIG_INSTALL_DIR="/etc/trinity" \
+ -DSYSCONF_INSTALL_DIR="/etc/trinity" \
+ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DBUILD_ALL="ON"
+
 post-patches:: debian/stamp-bootstrap
 
 debian/stamp-bootstrap:
+ifndef _cdbs_class_cmake
 	! [ -f /usr/share/libtool/ltmain.sh ] || \
 	cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
 	! [ -f /usr/share/libtool/config/ltmain.sh ] || \
@@ -27,6 +39,7 @@ debian/stamp-bootstrap:
 	cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
 		
 	make -f admin/Makefile.common cvs
+endif
 	touch debian/stamp-bootstrap
 
 install/tdepowersave-trinity::
diff --git a/ubuntu/maverick/tdelibs/debian/control b/ubuntu/maverick/tdelibs/debian/control
index 305e3ca68..11250f1d4 100644
--- a/ubuntu/maverick/tdelibs/debian/control
+++ b/ubuntu/maverick/tdelibs/debian/control
@@ -62,7 +62,7 @@ Replaces: kdelibs4c2a-kde3 (<< 4:14.0.0~), kdelibs4c2a-trinity (<< 4:14.0.0~), t
 Breaks: kdelibs4c2a-kde3 (<< 4:14.0.0~), kdelibs4c2a-trinity (<< 4:14.0.0~), tdelibs4c2a-trinity
 Depends: ${shlibs:Depends}, tdelibs-data-trinity,
  tdelibs-data-trinity, libart-2.0-2 (>= 4:14.0.0~), perl, xbase-clients, sudo
-Recommends: xdg-user-dirs
+Recommends: xdg-user-dirs, consolekit
 Suggests: fam, perl-suid
 Description: core libraries and binaries for all TDE applications
  This package contains all the shared libraries and common core binaries
diff --git a/ubuntu/precise/applications/kscope/debian/cdbs/debian-qt-kde.mk b/ubuntu/precise/applications/kscope/debian/cdbs/debian-qt-kde.mk
new file mode 100644
index 000000000..d81e0a12f
--- /dev/null
+++ b/ubuntu/precise/applications/kscope/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:
+ifndef _cdbs_class_cmake
+	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;
+endif
+	touch debian/stamp-cvs-make
+
+include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
+#include debian/cdbs/uploaders.mk
+
+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::
+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 debian/stamp-cvs-make
+
+endif
diff --git a/ubuntu/precise/applications/kscope/debian/cdbs/kde.mk b/ubuntu/precise/applications/kscope/debian/cdbs/kde.mk
new file mode 100644
index 000000000..023886fc8
--- /dev/null
+++ b/ubuntu/precise/applications/kscope/debian/cdbs/kde.mk
@@ -0,0 +1,99 @@
+# -*- 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
+
+ifndef _cdbs_class_cmake
+include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
+endif
+
+export kde_cgidir  = \$${libdir}/cgi-bin
+export kde_confdir = \$${sysconfdir}/trinity
+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"
+DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+
+$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
+	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
+
+cleanbuilddir::
+	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
+
+common-build-arch common-build-indep:: debian/stamp-kde-apidox
+debian/stamp-kde-apidox:
+	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
+	touch $@
+
+common-install-prehook-impl::
+	mkdir -p po
+	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
+	-for file in po/*pot; do \
+		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
+	done
+
+common-install-arch common-install-indep:: common-install-kde-apidox
+common-install-kde-apidox::
+	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
+
+clean::
+	rm -f debian/stamp-kde-apidox
+	rm -rf po/*.pot
+
+# This is a convenience target for calling manually.  It's not part of
+# the build process.
+buildprep: clean apply-patches
+	$(MAKE) -f admin/Makefile.common dist
+	debian/rules clean
+
+endif
diff --git a/ubuntu/precise/applications/kscope/debian/cdbs/versions.pl b/ubuntu/precise/applications/kscope/debian/cdbs/versions.pl
new file mode 100644
index 000000000..75c9add4b
--- /dev/null
+++ b/ubuntu/precise/applications/kscope/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 "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/precise/applications/kscope/debian/changelog b/ubuntu/precise/applications/kscope/debian/changelog
new file mode 100644
index 000000000..d3689c28f
--- /dev/null
+++ b/ubuntu/precise/applications/kscope/debian/changelog
@@ -0,0 +1,97 @@
+kscope-trinity (1.6.2-1ubuntu1) maverick; urgency=low
+
+  * Initial Release for TDE
+
+ -- Slávek Banko <slavek.banko@axis.cz>  Mon, 07 Sep 2013 23:43:53 +0200
+
+kscope (1.6.2-1ubuntu1) maverick; urgency=low
+
+  * Port to Ubuntu.
+
+ -- Eugene San (eugenesan) <eugenesan@gmail.com>  Fri, 04 Feb 2011 22:02:59 +0200
+
+kscope (1.6.2-1) unstable; urgency=low
+
+  * New upstream release (bugfix release).
+  * Bump Standards-Version to 3.8.0 (no changes needed).
+
+ -- Fathi Boudra <fabo@debian.org>  Sat, 09 Aug 2008 10:20:14 +0200
+
+kscope (1.6.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Refresh patches.
+  * Bump Standards-Version to 3.7.3.
+  * Use Homepage, Vcs-Browser and Vcs-Svn fields.
+  * Switch to quilt patch system.
+  * Remove embedded copy of GFDL as it can be found in common-licences.
+
+ -- Fathi Boudra <fabo@debian.org>  Sat, 01 Mar 2008 19:33:31 +0100
+
+kscope (1.6.0-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Fathi Boudra <fboudra@free.fr>  Thu, 12 Jul 2007 21:22:32 +0200
+
+kscope (1.5.2-1) unstable; urgency=low
+
+  * New upstream release. (Closes: #420874)
+
+ -- Fathi Boudra <fboudra@free.fr>  Tue, 15 May 2007 19:47:50 +0200
+
+kscope (1.5.1-2) unstable; urgency=low
+
+  * Upload to unstable
+
+ -- Mark Purcell <msp@debian.org>  Sat,  3 Mar 2007 13:23:12 +0000
+
+kscope (1.5.1-1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Fathi Boudra <fboudra@free.fr>  Thu, 15 Feb 2007 18:56:31 +0100
+
+kscope (1.5.0-1) unstable; urgency=low
+
+  * New upstream release
+  * Add ./debian/rules get-orig-source for http://buildserver.net
+  * Build-Depends: autotools-dev fixes outdated-autotools-helper-file
+
+ -- Mark Purcell <msp@debian.org>  Wed,  7 Feb 2007 21:08:10 +0000
+
+kscope (1.4.2-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Fathi Boudra <fboudra@free.fr>  Mon, 16 Oct 2006 22:03:21 +0200
+
+kscope (1.4.1-2) unstable; urgency=low
+
+  * Add patch to load default config
+
+ -- Fathi Boudra <fboudra@free.fr>  Fri,  8 Sep 2006 18:13:30 +0200
+
+kscope (1.4.1-1) unstable; urgency=low
+
+  * New upstream release
+  * Remove 11_crashfix.diff, merged upstream
+
+ -- Fathi Boudra <fboudra@free.fr>  Thu, 24 Aug 2006 12:24:23 +0200
+
+kscope (1.4.0-1) unstable; urgency=low
+
+  * New upstream release
+  * Merge kubuntu patches, thanks to Tom Albers <tomalbers@kde.nl>
+  * Add kscope manpage from kubuntu package,
+    thanks to Jonathan Patrick Davies <jpatrick@ubuntu.com>
+  * Update copyright file: add kscope manpage license
+
+ -- Fathi Boudra <fboudra@free.fr>  Thu, 10 Aug 2006 14:42:31 +0200
+
+kscope (1.3.4-1) unstable; urgency=low
+
+  * Initial release (Closes: #309669)
+
+ -- Fathi Boudra <fboudra@free.fr>  Fri, 28 Apr 2006 08:05:15 +0100
+
diff --git a/ubuntu/precise/applications/kscope/debian/compat b/ubuntu/precise/applications/kscope/debian/compat
new file mode 100644
index 000000000..7ed6ff82d
--- /dev/null
+++ b/ubuntu/precise/applications/kscope/debian/compat
@@ -0,0 +1 @@
+5
diff --git a/ubuntu/precise/applications/kscope/debian/control b/ubuntu/precise/applications/kscope/debian/control
new file mode 100644
index 000000000..f48fa899a
--- /dev/null
+++ b/ubuntu/precise/applications/kscope/debian/control
@@ -0,0 +1,45 @@
+Source: kscope-trinity
+Section: tde
+Priority: optional
+Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
+Uploaders: Fathi Boudra <fabo@debian.org>, Mark Purcell <msp@debian.org>
+Build-Depends: cdbs, debhelper (>= 5), quilt, automake, libtool, bison, flex,
+ tdebase-trinity-dev, docbook2x, docbook-xml
+Standards-Version: 3.8.0
+Homepage: http://kscope.sourceforge.net
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/kde-extras/kscope/?op=log
+Vcs-Svn: svn://svn.debian.org/pkg-kde/kde-extras/kscope/trunk
+
+Package: kscope-trinity
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, cscope, exuberant-ctags, graphviz
+Description: source editing environment for TDE
+ KScope is a TDE front-end to Cscope. It provides a source-editing environment
+ for large C projects. KScope is focused on source editing and analysis.
+ .
+ KScope is built around an efficient mechanism for code-navigation, which
+ allows the user to run queries on the code.
+ .
+ The types of queries KScope can run include:
+   * Get all references to a symbol
+   * Find the definition of a symbol
+   * Find all functions called by or calling to a function
+   * Find an EGrep pattern
+   * Find all files #including some file
+ .
+ These queries are handled by an underlying Cscope process. KScope simply
+ serves as a front-end to this process, feeding it with queries, and parsing
+ its output into result lists. The items in those lists can later be selected
+ to open an editor at the matching line.
+ .
+ Main Features:
+  * Multiple editor windows (using your favourite TDE editor)
+  * Project management
+  * Front-end to most Cscope queries
+  * Tag list for every open editor
+  * Call-tree window
+  * Session management, including saving and restoring queries
+  * Works with externally-built cscope.out files
+ .
+  Homepage: http://kscope.sourceforge.net
diff --git a/ubuntu/precise/applications/kscope/debian/copyright b/ubuntu/precise/applications/kscope/debian/copyright
new file mode 100644
index 000000000..6149f4244
--- /dev/null
+++ b/ubuntu/precise/applications/kscope/debian/copyright
@@ -0,0 +1,62 @@
+This package was debianized by Fathi Boudra <fboudra@free.fr> on
+Tue, 11 Apr 2006 11:44:04 +0200.
+
+It was downloaded from http://kscope.sourceforge.net
+
+Copyright Holder: Elad Lahav <elad_lahav@users.sf.net>
+
+The kscope manpage is © 2006 Jonathan Patrick Davies <jpatrick@ubuntu.com>
+and is licensed under the GPL, see below.
+
+manpage license:
+
+   This package 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 package 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 package; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL-2'.
+
+kscope license:
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. 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.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+
+On Debian systems, the complete text of the BSD License can be 
+found in `/usr/share/common-licenses/BSD'.
+
+The documentations provided with kscope is distributed under
+the GNU Free Documentation License (FDL). They are considered free with
+regards to the Debian Free Software Guidelines (DFSG) because they don't
+contain any unmodifiable parts (invariant sections).
+
+On Debian systems, the complete text of the GNU Free Documentation
+License can be found in `/usr/share/common-licenses/GFDL'.
diff --git a/ubuntu/precise/applications/kscope/debian/docs b/ubuntu/precise/applications/kscope/debian/docs
new file mode 100644
index 000000000..1333ed77b
--- /dev/null
+++ b/ubuntu/precise/applications/kscope/debian/docs
@@ -0,0 +1 @@
+TODO
diff --git a/ubuntu/precise/applications/kscope/debian/kscope.xml b/ubuntu/precise/applications/kscope/debian/kscope.xml
new file mode 100644
index 000000000..a70b1be45
--- /dev/null
+++ b/ubuntu/precise/applications/kscope/debian/kscope.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+]>
+<refentry>
+  <refentryinfo>
+    <author>
+      <firstname>Jonathan Patrick</firstname>
+      <surname>Davies</surname>
+      <email>jpatrick@ubuntu.com</email>
+    </author>
+    <copyright>
+      <year>2006</year>
+      <holder>Jonathan Patrick Davies</holder>
+    </copyright>
+    <!-- XXX IMPORTANT XXX -->
+    <!-- Keep this date up to date: -->
+    <date>2006-02-18</date>
+    <!--  ^^^^^^^^^^ -->
+  </refentryinfo>
+  <refmeta>
+    <refentrytitle>kscope</refentrytitle>
+    <manvolnum>1</manvolnum>
+  </refmeta>
+  <refnamediv>
+    <refname>kscope</refname>
+    <refpurpose>a source browsing and editing environment</refpurpose>
+  </refnamediv>
+  <refsynopsisdiv>
+    <cmdsynopsis>
+      <command>kscope</command>
+      <arg choice="opt">
+        <option><replaceable>Qt-options</replaceable></option>
+      </arg>
+      <arg choice="opt">
+        <option><replaceable>TDE-options</replaceable></option>
+      </arg>
+    </cmdsynopsis>
+  </refsynopsisdiv>
+  <refsect1>
+    <title>DESCRIPTION</title>
+    <para>
+      KScope is a source browsing and editing environment for large projects written
+      in C (such as the Linux kernel).
+    </para>
+    <para>
+      KScope uses the Cscope code analysis engine to provide valuable information to
+      coders.
+    </para>
+    <para>
+      KScope also provides call-tree and call-graph views that can help developers
+      by visualising the relationships between different functions in the code base.
+    </para>
+  </refsect1>
+  <refsect1>
+    <title>OPTIONS</title>
+    <para>
+      All <productname>TDE</productname> and <productname>Qt</productname>
+      programs accept a some common command-line options.  KScope has no
+      application-specific options.
+    </para>
+    <para>
+      <variablelist>
+        <title>Generic options:</title>
+        <varlistentry>
+          <term> <option>--help</option> </term>
+          <listitem> <para>Show help about options</para> </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term> <option>--help-qt</option> </term>
+          <listitem> <para>Show Qt specific options</para> </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term> <option>--help-tde</option> </term>
+          <listitem> <para>Show TDE specific options</para> </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term> <option>--help-all</option> </term>
+          <listitem> <para>Show all options</para> </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term> <option>--author</option> </term>
+          <listitem> <para>Show author information</para> </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term> <option>-v</option>, <option>--version</option> </term>
+          <listitem> <para>Show version information</para> </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term> <option>--license</option> </term>
+          <listitem> <para>Show license information</para> </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term> <option>--</option> </term>
+          <listitem> <para>Indicates end of options</para> </listitem>
+        </varlistentry>
+      </variablelist>
+      <!-- TODO * add all the rest of the options, but maybe find an automated
+      way to keep it up to date -->
+    </para>
+  </refsect1>
+  <refsect1>
+    <title>AUTHOR</title>
+    <para>
+      KScope was written by Elad Lahav <email>elad_lahav@users.sf.net</email>.
+    </para>
+   </refsect1>
+  <refsect1>
+    <title>COPYRIGHT</title>
+    <para>
+      This manual page was written by Jonathan Patrick Davies
+      <email>jpatrick@ubuntu.com</email> for the
+      <productname>Ubuntu</productname> system (but may be used by others).
+      Permission is granted to copy, distribute and/or modify this document
+      under the terms of the <acronym>GNU</acronym> General Public License,
+      Version 2 or any later version published by the Free Software Foundation.
+    </para>
+    <para>
+      On Debian systems, the complete text of the GNU General Public
+      License can be found in
+      <filename>/usr/share/common-licenses/GPL</filename>.
+    </para>
+  </refsect1>
+</refentry>
diff --git a/ubuntu/precise/applications/kscope/debian/manpages b/ubuntu/precise/applications/kscope/debian/manpages
new file mode 100644
index 000000000..03ff43b50
--- /dev/null
+++ b/ubuntu/precise/applications/kscope/debian/manpages
@@ -0,0 +1 @@
+kscope.1
diff --git a/ubuntu/precise/applications/kscope/debian/patches/04_am_maintainer_mode.diff b/ubuntu/precise/applications/kscope/debian/patches/04_am_maintainer_mode.diff
new file mode 100644
index 000000000..391a80285
--- /dev/null
+++ b/ubuntu/precise/applications/kscope/debian/patches/04_am_maintainer_mode.diff
@@ -0,0 +1,11 @@
+--- a/admin/configure.in.min
++++ b/admin/configure.in.min
+@@ -38,6 +38,8 @@
+ dnl Automake doc recommends to do this only here. (Janos)
+ AM_INIT_AUTOMAKE(@MODULENAME@, @VERSION@) dnl searches for some needed programs
+ 
++AM_MAINTAINER_MODE
++
+ KDE_SET_PREFIX
+ 
+ dnl generate the config header
diff --git a/ubuntu/precise/applications/kscope/debian/patches/06_disable_no_undefined.diff b/ubuntu/precise/applications/kscope/debian/patches/06_disable_no_undefined.diff
new file mode 100644
index 000000000..05c932c3c
--- /dev/null
+++ b/ubuntu/precise/applications/kscope/debian/patches/06_disable_no_undefined.diff
@@ -0,0 +1,18 @@
+--- a/admin/acinclude.m4.in
++++ b/admin/acinclude.m4.in
+@@ -1689,15 +1689,6 @@
+        KDE_USE_CLOSURE_TRUE="#"
+        KDE_USE_CLOSURE_FALSE=""
+        KDE_NO_UNDEFINED=""
+-       case $host in 
+-         *-*-linux-gnu)
+-           KDE_CHECK_COMPILER_FLAG([Wl,--no-undefined],
+-                [KDE_CHECK_COMPILER_FLAG([Wl,--allow-shlib-undefined],
+-		[KDE_NO_UNDEFINED="-Wl,--no-undefined -Wl,--allow-shlib-undefined"],
+-		[KDE_NO_UNDEFINED=""])],
+-	    [KDE_NO_UNDEFINED=""])
+-           ;;
+-       esac
+   fi
+   AC_SUBST(KDE_USE_CLOSURE_TRUE)
+   AC_SUBST(KDE_USE_CLOSURE_FALSE)
diff --git a/ubuntu/precise/applications/kscope/debian/patches/series b/ubuntu/precise/applications/kscope/debian/patches/series
new file mode 100644
index 000000000..b8743ddd9
--- /dev/null
+++ b/ubuntu/precise/applications/kscope/debian/patches/series
@@ -0,0 +1,2 @@
+04_am_maintainer_mode.diff
+06_disable_no_undefined.diff
diff --git a/ubuntu/precise/applications/kscope/debian/rules b/ubuntu/precise/applications/kscope/debian/rules
new file mode 100755
index 000000000..65883a481
--- /dev/null
+++ b/ubuntu/precise/applications/kscope/debian/rules
@@ -0,0 +1,40 @@
+#!/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
+include /usr/share/cdbs/1/rules/utils.mk
+
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include
+DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
+DEB_CONFIGURE_PREFIX := /opt/trinity
+DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
+
+DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
+                               && echo xz || echo bzip2)
+
+post-patches:: debian/stamp-bootstrap
+
+debian/stamp-bootstrap:
+	dh_testdir
+
+	# Regenerate build system
+	! [ -f /usr/share/libtool/ltmain.sh ] || \
+	cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
+	! [ -f /usr/share/libtool/config/ltmain.sh ] || \
+	cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
+	cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
+
+	autoreconf --install && automake -f && \
+	$(MAKE) -f admin/Makefile.common && \
+	touch debian/stamp-bootstrap
+
+build/kscope-trinity::
+	/usr/bin/docbook2x-man debian/kscope.xml
+
+binary-install/kscope-trinity::
+	mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
+
+clean::
+	rm -f kscope.1
+	rm -f debian/stamp-bootstrap
diff --git a/ubuntu/precise/applications/kscope/debian/source/format b/ubuntu/precise/applications/kscope/debian/source/format
new file mode 100644
index 000000000..89ae9db8f
--- /dev/null
+++ b/ubuntu/precise/applications/kscope/debian/source/format
@@ -0,0 +1 @@
+3.0 (native)
diff --git a/ubuntu/precise/applications/kscope/debian/source/options b/ubuntu/precise/applications/kscope/debian/source/options
new file mode 100644
index 000000000..72f1f5450
--- /dev/null
+++ b/ubuntu/precise/applications/kscope/debian/source/options
@@ -0,0 +1,6 @@
+# Use xz instead of gzip
+compression = "xz"
+compression-level = 9
+
+# Don't run differences
+diff-ignore = .*
diff --git a/ubuntu/precise/applications/kscope/debian/watch b/ubuntu/precise/applications/kscope/debian/watch
new file mode 100644
index 000000000..6825f61dd
--- /dev/null
+++ b/ubuntu/precise/applications/kscope/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://sf.net/kscope/kscope-(.*)\.tar\.gz debian svn-upgrade
diff --git a/ubuntu/precise/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff b/ubuntu/precise/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff
index 826d4e236..0729793b7 100644
--- a/ubuntu/precise/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff
+++ b/ubuntu/precise/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff
@@ -14,16 +14,16 @@ index 7c45fcf..b933832 100644
  	}
  	else
  	{
--// 		if (getenv("USER") != "root")
+-// 		if (getenv("USER") != TQString("root"))
 -// 		{
 -// 			KMessageBox::error( 0, I18N_NOOP( "Kvpnc must be started as root!" ) );
 -// 			exit(0);
 -// 		}
-+ 		if (getenv("USER") != "root")
-+ 		{
-+ 			KMessageBox::error( 0, I18N_NOOP( "Kvpnc must be started as root!" ) );
-+ 			exit(0);
-+ 		}
++		if (getenv("USER") != TQString("root"))
++		{
++			KMessageBox::error( 0, I18N_NOOP( "Kvpnc must be started as root!" ) );
++			exit(0);
++		}
  
  		TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
  
diff --git a/ubuntu/precise/applications/kvpnc/debian/patches/series b/ubuntu/precise/applications/kvpnc/debian/patches/series
index 09040ada9..d29c3ca91 100644
--- a/ubuntu/precise/applications/kvpnc/debian/patches/series
+++ b/ubuntu/precise/applications/kvpnc/debian/patches/series
@@ -1,2 +1,2 @@
-10_su-to-root_usage.diff
+# 10_su-to-root_usage.diff
 13_add_kuser_issuperuser.diff
diff --git a/ubuntu/precise/applications/tdepowersave/debian/cdbs/debian-qt-kde.mk b/ubuntu/precise/applications/tdepowersave/debian/cdbs/debian-qt-kde.mk
index c807eed8c..33a932634 100644
--- a/ubuntu/precise/applications/tdepowersave/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/precise/applications/tdepowersave/debian/cdbs/debian-qt-kde.mk
@@ -10,9 +10,11 @@ _cdbs_class_debian-qt-kde := 1
 # Note: This _must_ be included before autotools.mk, or it won't work.
 common-configure-arch common-configure-indep:: debian/stamp-cvs-make
 debian/stamp-cvs-make:
+ifndef _cdbs_class_cmake
 	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
 	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
 	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
+endif
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
@@ -98,6 +100,7 @@ binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	done
 
 clean::
+ifndef _cdbs_class_cmake
 	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
 		cd $(DEB_SRCDIR); \
 		find . -name Makefile.in -print | \
@@ -106,6 +109,7 @@ clean::
 			configure configure.files configure.in stamp-h.in \
 			subdirs; \
 	fi
+endif
 	rm -f debian/stamp-cvs-make
 
 endif
diff --git a/ubuntu/precise/applications/tdepowersave/debian/cdbs/kde.mk b/ubuntu/precise/applications/tdepowersave/debian/cdbs/kde.mk
index 765560c89..023886fc8 100644
--- a/ubuntu/precise/applications/tdepowersave/debian/cdbs/kde.mk
+++ b/ubuntu/precise/applications/tdepowersave/debian/cdbs/kde.mk
@@ -35,7 +35,9 @@ else
 DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
 endif
 
+ifndef _cdbs_class_cmake
 include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
+endif
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
@@ -59,7 +61,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/ubuntu/precise/applications/tdepowersave/debian/control b/ubuntu/precise/applications/tdepowersave/debian/control
index ca4a5def2..7882039dd 100644
--- a/ubuntu/precise/applications/tdepowersave/debian/control
+++ b/ubuntu/precise/applications/tdepowersave/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Michael Biebl <biebl@debian.org>
-Build-Depends: cdbs, debhelper (>= 5.0.0), quilt, tdelibs14-trinity-dev, libxss-dev, libxtst-dev, libdbus-1-dev (>= 0.6), libdbus-tqt-1-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>= 5.0.0), quilt, tdelibs14-trinity-dev, libxss-dev, libxtst-dev, libdbus-1-dev (>= 0.6), libdbus-tqt-1-dev, cmake, automake, autoconf, libtool, libltdl-dev
 Build-Conflicts: autoconf2.13
 Standards-Version: 3.8.4
 Homepage: http://sourceforge.net/projects/powersave/
diff --git a/ubuntu/precise/applications/tdepowersave/debian/rules b/ubuntu/precise/applications/tdepowersave/debian/rules
index f74a76605..a891b0150 100755
--- a/ubuntu/precise/applications/tdepowersave/debian/rules
+++ b/ubuntu/precise/applications/tdepowersave/debian/rules
@@ -1,5 +1,6 @@
 #!/usr/bin/make -f
   
+include /usr/share/cdbs/1/class/cmake.mk
 include debian/cdbs/kde.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
@@ -17,9 +18,20 @@ DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinit
 DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
                                && echo xz || echo bzip2)
 
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -DCONFIG_INSTALL_DIR="/etc/trinity" \
+ -DSYSCONF_INSTALL_DIR="/etc/trinity" \
+ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DBUILD_ALL="ON"
+
 post-patches:: debian/stamp-bootstrap
 
 debian/stamp-bootstrap:
+ifndef _cdbs_class_cmake
 	! [ -f /usr/share/libtool/ltmain.sh ] || \
 	cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
 	! [ -f /usr/share/libtool/config/ltmain.sh ] || \
@@ -27,6 +39,7 @@ debian/stamp-bootstrap:
 	cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
 		
 	make -f admin/Makefile.common cvs
+endif
 	touch debian/stamp-bootstrap
 
 install/tdepowersave-trinity::
diff --git a/ubuntu/precise/tdelibs/debian/control b/ubuntu/precise/tdelibs/debian/control
index 305e3ca68..11250f1d4 100644
--- a/ubuntu/precise/tdelibs/debian/control
+++ b/ubuntu/precise/tdelibs/debian/control
@@ -62,7 +62,7 @@ Replaces: kdelibs4c2a-kde3 (<< 4:14.0.0~), kdelibs4c2a-trinity (<< 4:14.0.0~), t
 Breaks: kdelibs4c2a-kde3 (<< 4:14.0.0~), kdelibs4c2a-trinity (<< 4:14.0.0~), tdelibs4c2a-trinity
 Depends: ${shlibs:Depends}, tdelibs-data-trinity,
  tdelibs-data-trinity, libart-2.0-2 (>= 4:14.0.0~), perl, xbase-clients, sudo
-Recommends: xdg-user-dirs
+Recommends: xdg-user-dirs, consolekit
 Suggests: fam, perl-suid
 Description: core libraries and binaries for all TDE applications
  This package contains all the shared libraries and common core binaries
diff --git a/ubuntu/raring/applications/kscope/debian/cdbs/debian-qt-kde.mk b/ubuntu/raring/applications/kscope/debian/cdbs/debian-qt-kde.mk
new file mode 100644
index 000000000..d81e0a12f
--- /dev/null
+++ b/ubuntu/raring/applications/kscope/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:
+ifndef _cdbs_class_cmake
+	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;
+endif
+	touch debian/stamp-cvs-make
+
+include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
+#include debian/cdbs/uploaders.mk
+
+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::
+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 debian/stamp-cvs-make
+
+endif
diff --git a/ubuntu/raring/applications/kscope/debian/cdbs/kde.mk b/ubuntu/raring/applications/kscope/debian/cdbs/kde.mk
new file mode 100644
index 000000000..023886fc8
--- /dev/null
+++ b/ubuntu/raring/applications/kscope/debian/cdbs/kde.mk
@@ -0,0 +1,99 @@
+# -*- 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
+
+ifndef _cdbs_class_cmake
+include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
+endif
+
+export kde_cgidir  = \$${libdir}/cgi-bin
+export kde_confdir = \$${sysconfdir}/trinity
+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"
+DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+
+$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
+	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
+
+cleanbuilddir::
+	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
+
+common-build-arch common-build-indep:: debian/stamp-kde-apidox
+debian/stamp-kde-apidox:
+	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
+	touch $@
+
+common-install-prehook-impl::
+	mkdir -p po
+	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
+	-for file in po/*pot; do \
+		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
+	done
+
+common-install-arch common-install-indep:: common-install-kde-apidox
+common-install-kde-apidox::
+	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
+
+clean::
+	rm -f debian/stamp-kde-apidox
+	rm -rf po/*.pot
+
+# This is a convenience target for calling manually.  It's not part of
+# the build process.
+buildprep: clean apply-patches
+	$(MAKE) -f admin/Makefile.common dist
+	debian/rules clean
+
+endif
diff --git a/ubuntu/raring/applications/kscope/debian/cdbs/versions.pl b/ubuntu/raring/applications/kscope/debian/cdbs/versions.pl
new file mode 100644
index 000000000..75c9add4b
--- /dev/null
+++ b/ubuntu/raring/applications/kscope/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 "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/raring/applications/kscope/debian/changelog b/ubuntu/raring/applications/kscope/debian/changelog
new file mode 100644
index 000000000..d3689c28f
--- /dev/null
+++ b/ubuntu/raring/applications/kscope/debian/changelog
@@ -0,0 +1,97 @@
+kscope-trinity (1.6.2-1ubuntu1) maverick; urgency=low
+
+  * Initial Release for TDE
+
+ -- Slávek Banko <slavek.banko@axis.cz>  Mon, 07 Sep 2013 23:43:53 +0200
+
+kscope (1.6.2-1ubuntu1) maverick; urgency=low
+
+  * Port to Ubuntu.
+
+ -- Eugene San (eugenesan) <eugenesan@gmail.com>  Fri, 04 Feb 2011 22:02:59 +0200
+
+kscope (1.6.2-1) unstable; urgency=low
+
+  * New upstream release (bugfix release).
+  * Bump Standards-Version to 3.8.0 (no changes needed).
+
+ -- Fathi Boudra <fabo@debian.org>  Sat, 09 Aug 2008 10:20:14 +0200
+
+kscope (1.6.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Refresh patches.
+  * Bump Standards-Version to 3.7.3.
+  * Use Homepage, Vcs-Browser and Vcs-Svn fields.
+  * Switch to quilt patch system.
+  * Remove embedded copy of GFDL as it can be found in common-licences.
+
+ -- Fathi Boudra <fabo@debian.org>  Sat, 01 Mar 2008 19:33:31 +0100
+
+kscope (1.6.0-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Fathi Boudra <fboudra@free.fr>  Thu, 12 Jul 2007 21:22:32 +0200
+
+kscope (1.5.2-1) unstable; urgency=low
+
+  * New upstream release. (Closes: #420874)
+
+ -- Fathi Boudra <fboudra@free.fr>  Tue, 15 May 2007 19:47:50 +0200
+
+kscope (1.5.1-2) unstable; urgency=low
+
+  * Upload to unstable
+
+ -- Mark Purcell <msp@debian.org>  Sat,  3 Mar 2007 13:23:12 +0000
+
+kscope (1.5.1-1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Fathi Boudra <fboudra@free.fr>  Thu, 15 Feb 2007 18:56:31 +0100
+
+kscope (1.5.0-1) unstable; urgency=low
+
+  * New upstream release
+  * Add ./debian/rules get-orig-source for http://buildserver.net
+  * Build-Depends: autotools-dev fixes outdated-autotools-helper-file
+
+ -- Mark Purcell <msp@debian.org>  Wed,  7 Feb 2007 21:08:10 +0000
+
+kscope (1.4.2-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Fathi Boudra <fboudra@free.fr>  Mon, 16 Oct 2006 22:03:21 +0200
+
+kscope (1.4.1-2) unstable; urgency=low
+
+  * Add patch to load default config
+
+ -- Fathi Boudra <fboudra@free.fr>  Fri,  8 Sep 2006 18:13:30 +0200
+
+kscope (1.4.1-1) unstable; urgency=low
+
+  * New upstream release
+  * Remove 11_crashfix.diff, merged upstream
+
+ -- Fathi Boudra <fboudra@free.fr>  Thu, 24 Aug 2006 12:24:23 +0200
+
+kscope (1.4.0-1) unstable; urgency=low
+
+  * New upstream release
+  * Merge kubuntu patches, thanks to Tom Albers <tomalbers@kde.nl>
+  * Add kscope manpage from kubuntu package,
+    thanks to Jonathan Patrick Davies <jpatrick@ubuntu.com>
+  * Update copyright file: add kscope manpage license
+
+ -- Fathi Boudra <fboudra@free.fr>  Thu, 10 Aug 2006 14:42:31 +0200
+
+kscope (1.3.4-1) unstable; urgency=low
+
+  * Initial release (Closes: #309669)
+
+ -- Fathi Boudra <fboudra@free.fr>  Fri, 28 Apr 2006 08:05:15 +0100
+
diff --git a/ubuntu/raring/applications/kscope/debian/compat b/ubuntu/raring/applications/kscope/debian/compat
new file mode 100644
index 000000000..7ed6ff82d
--- /dev/null
+++ b/ubuntu/raring/applications/kscope/debian/compat
@@ -0,0 +1 @@
+5
diff --git a/ubuntu/raring/applications/kscope/debian/control b/ubuntu/raring/applications/kscope/debian/control
new file mode 100644
index 000000000..f48fa899a
--- /dev/null
+++ b/ubuntu/raring/applications/kscope/debian/control
@@ -0,0 +1,45 @@
+Source: kscope-trinity
+Section: tde
+Priority: optional
+Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
+Uploaders: Fathi Boudra <fabo@debian.org>, Mark Purcell <msp@debian.org>
+Build-Depends: cdbs, debhelper (>= 5), quilt, automake, libtool, bison, flex,
+ tdebase-trinity-dev, docbook2x, docbook-xml
+Standards-Version: 3.8.0
+Homepage: http://kscope.sourceforge.net
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/kde-extras/kscope/?op=log
+Vcs-Svn: svn://svn.debian.org/pkg-kde/kde-extras/kscope/trunk
+
+Package: kscope-trinity
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, cscope, exuberant-ctags, graphviz
+Description: source editing environment for TDE
+ KScope is a TDE front-end to Cscope. It provides a source-editing environment
+ for large C projects. KScope is focused on source editing and analysis.
+ .
+ KScope is built around an efficient mechanism for code-navigation, which
+ allows the user to run queries on the code.
+ .
+ The types of queries KScope can run include:
+   * Get all references to a symbol
+   * Find the definition of a symbol
+   * Find all functions called by or calling to a function
+   * Find an EGrep pattern
+   * Find all files #including some file
+ .
+ These queries are handled by an underlying Cscope process. KScope simply
+ serves as a front-end to this process, feeding it with queries, and parsing
+ its output into result lists. The items in those lists can later be selected
+ to open an editor at the matching line.
+ .
+ Main Features:
+  * Multiple editor windows (using your favourite TDE editor)
+  * Project management
+  * Front-end to most Cscope queries
+  * Tag list for every open editor
+  * Call-tree window
+  * Session management, including saving and restoring queries
+  * Works with externally-built cscope.out files
+ .
+  Homepage: http://kscope.sourceforge.net
diff --git a/ubuntu/raring/applications/kscope/debian/copyright b/ubuntu/raring/applications/kscope/debian/copyright
new file mode 100644
index 000000000..6149f4244
--- /dev/null
+++ b/ubuntu/raring/applications/kscope/debian/copyright
@@ -0,0 +1,62 @@
+This package was debianized by Fathi Boudra <fboudra@free.fr> on
+Tue, 11 Apr 2006 11:44:04 +0200.
+
+It was downloaded from http://kscope.sourceforge.net
+
+Copyright Holder: Elad Lahav <elad_lahav@users.sf.net>
+
+The kscope manpage is © 2006 Jonathan Patrick Davies <jpatrick@ubuntu.com>
+and is licensed under the GPL, see below.
+
+manpage license:
+
+   This package 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 package 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 package; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL-2'.
+
+kscope license:
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. 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.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+
+On Debian systems, the complete text of the BSD License can be 
+found in `/usr/share/common-licenses/BSD'.
+
+The documentations provided with kscope is distributed under
+the GNU Free Documentation License (FDL). They are considered free with
+regards to the Debian Free Software Guidelines (DFSG) because they don't
+contain any unmodifiable parts (invariant sections).
+
+On Debian systems, the complete text of the GNU Free Documentation
+License can be found in `/usr/share/common-licenses/GFDL'.
diff --git a/ubuntu/raring/applications/kscope/debian/docs b/ubuntu/raring/applications/kscope/debian/docs
new file mode 100644
index 000000000..1333ed77b
--- /dev/null
+++ b/ubuntu/raring/applications/kscope/debian/docs
@@ -0,0 +1 @@
+TODO
diff --git a/ubuntu/raring/applications/kscope/debian/kscope.xml b/ubuntu/raring/applications/kscope/debian/kscope.xml
new file mode 100644
index 000000000..a70b1be45
--- /dev/null
+++ b/ubuntu/raring/applications/kscope/debian/kscope.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+]>
+<refentry>
+  <refentryinfo>
+    <author>
+      <firstname>Jonathan Patrick</firstname>
+      <surname>Davies</surname>
+      <email>jpatrick@ubuntu.com</email>
+    </author>
+    <copyright>
+      <year>2006</year>
+      <holder>Jonathan Patrick Davies</holder>
+    </copyright>
+    <!-- XXX IMPORTANT XXX -->
+    <!-- Keep this date up to date: -->
+    <date>2006-02-18</date>
+    <!--  ^^^^^^^^^^ -->
+  </refentryinfo>
+  <refmeta>
+    <refentrytitle>kscope</refentrytitle>
+    <manvolnum>1</manvolnum>
+  </refmeta>
+  <refnamediv>
+    <refname>kscope</refname>
+    <refpurpose>a source browsing and editing environment</refpurpose>
+  </refnamediv>
+  <refsynopsisdiv>
+    <cmdsynopsis>
+      <command>kscope</command>
+      <arg choice="opt">
+        <option><replaceable>Qt-options</replaceable></option>
+      </arg>
+      <arg choice="opt">
+        <option><replaceable>TDE-options</replaceable></option>
+      </arg>
+    </cmdsynopsis>
+  </refsynopsisdiv>
+  <refsect1>
+    <title>DESCRIPTION</title>
+    <para>
+      KScope is a source browsing and editing environment for large projects written
+      in C (such as the Linux kernel).
+    </para>
+    <para>
+      KScope uses the Cscope code analysis engine to provide valuable information to
+      coders.
+    </para>
+    <para>
+      KScope also provides call-tree and call-graph views that can help developers
+      by visualising the relationships between different functions in the code base.
+    </para>
+  </refsect1>
+  <refsect1>
+    <title>OPTIONS</title>
+    <para>
+      All <productname>TDE</productname> and <productname>Qt</productname>
+      programs accept a some common command-line options.  KScope has no
+      application-specific options.
+    </para>
+    <para>
+      <variablelist>
+        <title>Generic options:</title>
+        <varlistentry>
+          <term> <option>--help</option> </term>
+          <listitem> <para>Show help about options</para> </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term> <option>--help-qt</option> </term>
+          <listitem> <para>Show Qt specific options</para> </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term> <option>--help-tde</option> </term>
+          <listitem> <para>Show TDE specific options</para> </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term> <option>--help-all</option> </term>
+          <listitem> <para>Show all options</para> </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term> <option>--author</option> </term>
+          <listitem> <para>Show author information</para> </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term> <option>-v</option>, <option>--version</option> </term>
+          <listitem> <para>Show version information</para> </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term> <option>--license</option> </term>
+          <listitem> <para>Show license information</para> </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term> <option>--</option> </term>
+          <listitem> <para>Indicates end of options</para> </listitem>
+        </varlistentry>
+      </variablelist>
+      <!-- TODO * add all the rest of the options, but maybe find an automated
+      way to keep it up to date -->
+    </para>
+  </refsect1>
+  <refsect1>
+    <title>AUTHOR</title>
+    <para>
+      KScope was written by Elad Lahav <email>elad_lahav@users.sf.net</email>.
+    </para>
+   </refsect1>
+  <refsect1>
+    <title>COPYRIGHT</title>
+    <para>
+      This manual page was written by Jonathan Patrick Davies
+      <email>jpatrick@ubuntu.com</email> for the
+      <productname>Ubuntu</productname> system (but may be used by others).
+      Permission is granted to copy, distribute and/or modify this document
+      under the terms of the <acronym>GNU</acronym> General Public License,
+      Version 2 or any later version published by the Free Software Foundation.
+    </para>
+    <para>
+      On Debian systems, the complete text of the GNU General Public
+      License can be found in
+      <filename>/usr/share/common-licenses/GPL</filename>.
+    </para>
+  </refsect1>
+</refentry>
diff --git a/ubuntu/raring/applications/kscope/debian/manpages b/ubuntu/raring/applications/kscope/debian/manpages
new file mode 100644
index 000000000..03ff43b50
--- /dev/null
+++ b/ubuntu/raring/applications/kscope/debian/manpages
@@ -0,0 +1 @@
+kscope.1
diff --git a/ubuntu/raring/applications/kscope/debian/patches/04_am_maintainer_mode.diff b/ubuntu/raring/applications/kscope/debian/patches/04_am_maintainer_mode.diff
new file mode 100644
index 000000000..391a80285
--- /dev/null
+++ b/ubuntu/raring/applications/kscope/debian/patches/04_am_maintainer_mode.diff
@@ -0,0 +1,11 @@
+--- a/admin/configure.in.min
++++ b/admin/configure.in.min
+@@ -38,6 +38,8 @@
+ dnl Automake doc recommends to do this only here. (Janos)
+ AM_INIT_AUTOMAKE(@MODULENAME@, @VERSION@) dnl searches for some needed programs
+ 
++AM_MAINTAINER_MODE
++
+ KDE_SET_PREFIX
+ 
+ dnl generate the config header
diff --git a/ubuntu/raring/applications/kscope/debian/patches/06_disable_no_undefined.diff b/ubuntu/raring/applications/kscope/debian/patches/06_disable_no_undefined.diff
new file mode 100644
index 000000000..05c932c3c
--- /dev/null
+++ b/ubuntu/raring/applications/kscope/debian/patches/06_disable_no_undefined.diff
@@ -0,0 +1,18 @@
+--- a/admin/acinclude.m4.in
++++ b/admin/acinclude.m4.in
+@@ -1689,15 +1689,6 @@
+        KDE_USE_CLOSURE_TRUE="#"
+        KDE_USE_CLOSURE_FALSE=""
+        KDE_NO_UNDEFINED=""
+-       case $host in 
+-         *-*-linux-gnu)
+-           KDE_CHECK_COMPILER_FLAG([Wl,--no-undefined],
+-                [KDE_CHECK_COMPILER_FLAG([Wl,--allow-shlib-undefined],
+-		[KDE_NO_UNDEFINED="-Wl,--no-undefined -Wl,--allow-shlib-undefined"],
+-		[KDE_NO_UNDEFINED=""])],
+-	    [KDE_NO_UNDEFINED=""])
+-           ;;
+-       esac
+   fi
+   AC_SUBST(KDE_USE_CLOSURE_TRUE)
+   AC_SUBST(KDE_USE_CLOSURE_FALSE)
diff --git a/ubuntu/raring/applications/kscope/debian/patches/series b/ubuntu/raring/applications/kscope/debian/patches/series
new file mode 100644
index 000000000..b8743ddd9
--- /dev/null
+++ b/ubuntu/raring/applications/kscope/debian/patches/series
@@ -0,0 +1,2 @@
+04_am_maintainer_mode.diff
+06_disable_no_undefined.diff
diff --git a/ubuntu/raring/applications/kscope/debian/rules b/ubuntu/raring/applications/kscope/debian/rules
new file mode 100755
index 000000000..65883a481
--- /dev/null
+++ b/ubuntu/raring/applications/kscope/debian/rules
@@ -0,0 +1,40 @@
+#!/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
+include /usr/share/cdbs/1/rules/utils.mk
+
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include
+DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
+DEB_CONFIGURE_PREFIX := /opt/trinity
+DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
+
+DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
+                               && echo xz || echo bzip2)
+
+post-patches:: debian/stamp-bootstrap
+
+debian/stamp-bootstrap:
+	dh_testdir
+
+	# Regenerate build system
+	! [ -f /usr/share/libtool/ltmain.sh ] || \
+	cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
+	! [ -f /usr/share/libtool/config/ltmain.sh ] || \
+	cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
+	cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
+
+	autoreconf --install && automake -f && \
+	$(MAKE) -f admin/Makefile.common && \
+	touch debian/stamp-bootstrap
+
+build/kscope-trinity::
+	/usr/bin/docbook2x-man debian/kscope.xml
+
+binary-install/kscope-trinity::
+	mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
+
+clean::
+	rm -f kscope.1
+	rm -f debian/stamp-bootstrap
diff --git a/ubuntu/raring/applications/kscope/debian/source/format b/ubuntu/raring/applications/kscope/debian/source/format
new file mode 100644
index 000000000..89ae9db8f
--- /dev/null
+++ b/ubuntu/raring/applications/kscope/debian/source/format
@@ -0,0 +1 @@
+3.0 (native)
diff --git a/ubuntu/raring/applications/kscope/debian/source/options b/ubuntu/raring/applications/kscope/debian/source/options
new file mode 100644
index 000000000..72f1f5450
--- /dev/null
+++ b/ubuntu/raring/applications/kscope/debian/source/options
@@ -0,0 +1,6 @@
+# Use xz instead of gzip
+compression = "xz"
+compression-level = 9
+
+# Don't run differences
+diff-ignore = .*
diff --git a/ubuntu/raring/applications/kscope/debian/watch b/ubuntu/raring/applications/kscope/debian/watch
new file mode 100644
index 000000000..6825f61dd
--- /dev/null
+++ b/ubuntu/raring/applications/kscope/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://sf.net/kscope/kscope-(.*)\.tar\.gz debian svn-upgrade
diff --git a/ubuntu/raring/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff b/ubuntu/raring/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff
index 826d4e236..0729793b7 100644
--- a/ubuntu/raring/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff
+++ b/ubuntu/raring/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff
@@ -14,16 +14,16 @@ index 7c45fcf..b933832 100644
  	}
  	else
  	{
--// 		if (getenv("USER") != "root")
+-// 		if (getenv("USER") != TQString("root"))
 -// 		{
 -// 			KMessageBox::error( 0, I18N_NOOP( "Kvpnc must be started as root!" ) );
 -// 			exit(0);
 -// 		}
-+ 		if (getenv("USER") != "root")
-+ 		{
-+ 			KMessageBox::error( 0, I18N_NOOP( "Kvpnc must be started as root!" ) );
-+ 			exit(0);
-+ 		}
++		if (getenv("USER") != TQString("root"))
++		{
++			KMessageBox::error( 0, I18N_NOOP( "Kvpnc must be started as root!" ) );
++			exit(0);
++		}
  
  		TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
  
diff --git a/ubuntu/raring/applications/kvpnc/debian/patches/series b/ubuntu/raring/applications/kvpnc/debian/patches/series
index 09040ada9..d29c3ca91 100644
--- a/ubuntu/raring/applications/kvpnc/debian/patches/series
+++ b/ubuntu/raring/applications/kvpnc/debian/patches/series
@@ -1,2 +1,2 @@
-10_su-to-root_usage.diff
+# 10_su-to-root_usage.diff
 13_add_kuser_issuperuser.diff
diff --git a/ubuntu/raring/applications/tdepowersave/debian/cdbs/debian-qt-kde.mk b/ubuntu/raring/applications/tdepowersave/debian/cdbs/debian-qt-kde.mk
index c807eed8c..33a932634 100644
--- a/ubuntu/raring/applications/tdepowersave/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/raring/applications/tdepowersave/debian/cdbs/debian-qt-kde.mk
@@ -10,9 +10,11 @@ _cdbs_class_debian-qt-kde := 1
 # Note: This _must_ be included before autotools.mk, or it won't work.
 common-configure-arch common-configure-indep:: debian/stamp-cvs-make
 debian/stamp-cvs-make:
+ifndef _cdbs_class_cmake
 	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
 	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
 	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
+endif
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
@@ -98,6 +100,7 @@ binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	done
 
 clean::
+ifndef _cdbs_class_cmake
 	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
 		cd $(DEB_SRCDIR); \
 		find . -name Makefile.in -print | \
@@ -106,6 +109,7 @@ clean::
 			configure configure.files configure.in stamp-h.in \
 			subdirs; \
 	fi
+endif
 	rm -f debian/stamp-cvs-make
 
 endif
diff --git a/ubuntu/raring/applications/tdepowersave/debian/cdbs/kde.mk b/ubuntu/raring/applications/tdepowersave/debian/cdbs/kde.mk
index 765560c89..023886fc8 100644
--- a/ubuntu/raring/applications/tdepowersave/debian/cdbs/kde.mk
+++ b/ubuntu/raring/applications/tdepowersave/debian/cdbs/kde.mk
@@ -35,7 +35,9 @@ else
 DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
 endif
 
+ifndef _cdbs_class_cmake
 include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
+endif
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
@@ -59,7 +61,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/ubuntu/raring/applications/tdepowersave/debian/control b/ubuntu/raring/applications/tdepowersave/debian/control
index ca4a5def2..7882039dd 100644
--- a/ubuntu/raring/applications/tdepowersave/debian/control
+++ b/ubuntu/raring/applications/tdepowersave/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Michael Biebl <biebl@debian.org>
-Build-Depends: cdbs, debhelper (>= 5.0.0), quilt, tdelibs14-trinity-dev, libxss-dev, libxtst-dev, libdbus-1-dev (>= 0.6), libdbus-tqt-1-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>= 5.0.0), quilt, tdelibs14-trinity-dev, libxss-dev, libxtst-dev, libdbus-1-dev (>= 0.6), libdbus-tqt-1-dev, cmake, automake, autoconf, libtool, libltdl-dev
 Build-Conflicts: autoconf2.13
 Standards-Version: 3.8.4
 Homepage: http://sourceforge.net/projects/powersave/
diff --git a/ubuntu/raring/applications/tdepowersave/debian/rules b/ubuntu/raring/applications/tdepowersave/debian/rules
index f74a76605..a891b0150 100755
--- a/ubuntu/raring/applications/tdepowersave/debian/rules
+++ b/ubuntu/raring/applications/tdepowersave/debian/rules
@@ -1,5 +1,6 @@
 #!/usr/bin/make -f
   
+include /usr/share/cdbs/1/class/cmake.mk
 include debian/cdbs/kde.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
@@ -17,9 +18,20 @@ DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinit
 DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
                                && echo xz || echo bzip2)
 
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -DCONFIG_INSTALL_DIR="/etc/trinity" \
+ -DSYSCONF_INSTALL_DIR="/etc/trinity" \
+ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DBUILD_ALL="ON"
+
 post-patches:: debian/stamp-bootstrap
 
 debian/stamp-bootstrap:
+ifndef _cdbs_class_cmake
 	! [ -f /usr/share/libtool/ltmain.sh ] || \
 	cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
 	! [ -f /usr/share/libtool/config/ltmain.sh ] || \
@@ -27,6 +39,7 @@ debian/stamp-bootstrap:
 	cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
 		
 	make -f admin/Makefile.common cvs
+endif
 	touch debian/stamp-bootstrap
 
 install/tdepowersave-trinity::
diff --git a/ubuntu/raring/tdelibs/debian/control b/ubuntu/raring/tdelibs/debian/control
index 305e3ca68..11250f1d4 100644
--- a/ubuntu/raring/tdelibs/debian/control
+++ b/ubuntu/raring/tdelibs/debian/control
@@ -62,7 +62,7 @@ Replaces: kdelibs4c2a-kde3 (<< 4:14.0.0~), kdelibs4c2a-trinity (<< 4:14.0.0~), t
 Breaks: kdelibs4c2a-kde3 (<< 4:14.0.0~), kdelibs4c2a-trinity (<< 4:14.0.0~), tdelibs4c2a-trinity
 Depends: ${shlibs:Depends}, tdelibs-data-trinity,
  tdelibs-data-trinity, libart-2.0-2 (>= 4:14.0.0~), perl, xbase-clients, sudo
-Recommends: xdg-user-dirs
+Recommends: xdg-user-dirs, consolekit
 Suggests: fam, perl-suid
 Description: core libraries and binaries for all TDE applications
  This package contains all the shared libraries and common core binaries