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

17 files changed, 459 insertions, 13 deletions

diff --git a/debian/lenny/dependencies/libart-lgpl/debian/changelog b/debian/lenny/dependencies/libart-lgpl/debian/changelog
new file mode 100644
index 000000000..f4083d923
--- /dev/null
+++ b/debian/lenny/dependencies/libart-lgpl/debian/changelog
@@ -0,0 +1,252 @@
+libart-lgpl (2.3.22-0debian0) lenny; urgency=low
+
+  * Build patched/maintained TDE version instead of unmaintained upstream
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 07 Dec 2011 17:50:00 -0600
+
+libart-lgpl (2.3.21-1) unstable; urgency=low
+
+  [ Loic Minier ]
+  * Properly anchor package name regexp.
+
+  [ Sebastian Dröge ]
+  * New upstream bugfix release:
+    + debian/control.in:
+      - Update Standards-Version and build-depend on autotools-dev.
+    + debian/patches/70_relibtoolize.patch:
+      - Regenerated for the new version.
+
+ -- Sebastian Dröge <slomo@debian.org>  Sun, 25 Apr 2010 11:35:30 +0200
+
+libart-lgpl (2.3.20-2) unstable; urgency=low
+
+  * Let libart-2.0-dev depend on shlibs:Depends.
+  * Extract library package name from control instead of hardcoding it in
+    rules.
+  * New patch, 60_libart-config-static, adds --static flag to libart2-config
+    to avoid -lm in the output of --libs; please consider switching to
+    pkg-config instead; GNOME #531278; closes: #375812.
+  * Fix copyright to state LGPL 2 or later as checked with licensecheck;
+    thanks Thomas Viehmann; closes: #478766.
+
+ -- Loic Minier <lool@dooz.org>  Sat, 03 May 2008 22:21:18 +0200
+
+libart-lgpl (2.3.20-1) unstable; urgency=low
+
+  [ Kilian Krause ]
+  * Use binary:version and source:Version for binNMU-safe uploads as
+    added in dpkg-dev 1.13.19. Add to Build-Depends accordingly.
+
+  [ Sebastian Dröge ]
+  * New upstream bugfix release:
+    + debian/patches/90_fix-headers-for-cplusplus.patch:
+      - Dropped, merged upstream.
+    + debian/patches/70_relibtoolize.patch:
+      - Regenerated for the new version.
+  * debian/control.in:
+    + Update Standards-Version to 3.7.3, no additional changes needed.
+
+ -- Sebastian Dröge <slomo@debian.org>  Wed, 30 Jan 2008 13:38:26 +0100
+
+libart-lgpl (2.3.19-3) unstable; urgency=low
+
+  * Upload to unstable; drop check-dist include.
+  * Wrap build-deps and deps.
+  * Drop libc6-dev dep in libart-2.0-dev.
+  * Add ${misc:Depends}.
+
+ -- Loic Minier <lool@dooz.org>  Wed, 11 Apr 2007 16:23:30 +0200
+
+libart-lgpl (2.3.19-2) experimental; urgency=high
+
+  * Use clean-la.mk and require gnome-pkg-tools 0.7.
+  * New patch, 90_fix-headers-for-cplusplus.patch, fixes linking with C++
+    applications; GNOME #413197; SVN r278; closes: #417568.
+  * Rename patch 070_relibtoolize to 70_relibtoolize.
+
+ -- Loic Minier <lool@dooz.org>  Tue, 03 Apr 2007 15:23:09 +0200
+
+libart-lgpl (2.3.19-1) experimental; urgency=low
+
+  * Add a get-orig-source target to retrieve the upstream tarball.
+  * Add complete licensing information in copyright file.
+  * Update upstream URL in copyright file.
+  * Bump up Standards-Version to 3.7.2.
+  * Use debian/libart-2.0-dev.manpages instead of
+    DEB_INSTALL_MANPAGES_libart-2.0-dev.
+  * Use HTTP in watch file and track all branches.
+  * Include CDBS's utils.
+  * New upstream releases with API additions.
+    - Include the new check-dist Makefile to prevent accidental uploads to
+      unstable; bump build-dep on gnome-pkg-tools to >= 0.10.
+    - Set shlibs to >= 2.3.18.
+    - Update and rename relibtoolizing patch, 070_relibtoolize.
+  * Drop useless libart-2.0-dev.files.
+  * Drop build-dep on libc6-dev | libc-dev; doh.
+  * Bump up DebHelper compatibility level to 5.
+
+ -- Loic Minier <lool@dooz.org>  Wed, 28 Feb 2007 15:20:45 +0100
+
+libart-lgpl (2.3.17-1) unstable; urgency=low
+
+  * GNOME Team Upload.
+  * New upstream release.
+  * debian/patches/001_relibtoolize.patch:
+    - updated.
+  * debian/watch:
+    - added.
+
+ -- Sebastien Bacher <seb128@debian.org>  Tue, 25 Jan 2005 23:51:07 +0100
+
+libart-lgpl (2.3.16-6) unstable; urgency=low
+
+  * Relibtoolize (Closes: #260639)
+
+ -- Ondřej Surý <ondrej@debian.org>  Wed, 21 Jul 2004 17:27:15 +0200
+
+libart-lgpl (2.3.16-5) unstable; urgency=low
+
+  * Set shlibs version to current.
+
+ -- Ondřej Surý <ondrej@debian.org>  Mon, 19 Apr 2004 18:49:50 +0200
+
+libart-lgpl (2.3.16-4) unstable; urgency=low
+
+  * Gnome Team upload.
+  * Setting again the shlibs file.
+
+ -- Sebastien Bacher <seb128@debian.org>  Thu, 15 Apr 2004 19:35:09 +0200
+
+libart-lgpl (2.3.16-3) unstable; urgency=low
+
+  * New maintainer (Closes: #238891)
+
+ -- Ondřej Surý <ondrej@debian.org>  Sat, 20 Mar 2004 15:14:54 +0100
+
+libart-lgpl (2.3.16-2) unstable; urgency=low
+
+  * Orphaned package.
+
+ -- Christian Marillat <marillat@debian.org>  Fri, 19 Mar 2004 16:06:24 +0100
+
+libart-lgpl (2.3.16-1) unstable; urgency=low
+
+  * New upstream release.
+  * Fix an "assertion failed" who crash gdm (Closes: #208919)
+
+ -- Christian Marillat <marillat@debian.org>  Wed, 10 Sep 2003 09:48:22 +0200
+
+libart-lgpl (2.3.15-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Christian Marillat <marillat@debian.org>  Tue,  2 Sep 2003 14:14:16 +0200
+
+libart-lgpl (2.3.14-2) unstable; urgency=low
+
+  * Compiled with -mieee for alpha (Closes: #207748)
+
+ -- Christian Marillat <marillat@debian.org>  Fri, 29 Aug 2003 19:24:46 +0200
+
+libart-lgpl (2.3.14-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Christian Marillat <marillat@debian.org>  Fri,  8 Aug 2003 10:23:11 +0200
+
+libart-lgpl (2.3.13-1) unstable; urgency=low
+
+  * new upstream release.
+
+ -- Christian Marillat <marillat@debian.org>  Fri, 11 Jul 2003 14:59:55 +0200
+
+libart-lgpl (2.3.12-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Christian Marillat <marillat@debian.org>  Mon,  5 May 2003 12:58:07 +0200
+
+libart-lgpl (2.3.11-4) unstable; urgency=low
+
+  * Update section
+
+ -- Christian Marillat <marillat@debian.org>  Tue,  1 Apr 2003 18:52:25 +0200
+
+libart-lgpl (2.3.11-3) unstable; urgency=low
+
+  * Add a patche to fix configure for mipsel
+
+ -- Christian Marillat <marillat@debian.org>  Sat, 18 Jan 2003 10:11:41 +0100
+
+libart-lgpl (2.3.11-2) unstable; urgency=low
+
+  * Update description (Closes: #177003)
+
+ -- Christian Marillat <marillat@debian.org>  Fri, 17 Jan 2003 21:27:15 +0100
+
+libart-lgpl (2.3.11-1) unstable; urgency=low
+
+  * New upstream release.
+  * Bump Standards-Version to 3.5.8
+
+ -- Christian Marillat <marillat@debian.org>  Tue,  7 Jan 2003 19:40:48 +0100
+
+libart-lgpl (2.3.10-4) unstable; urgency=low
+
+  * Update to standards version 3.5.7
+
+ -- Christian Marillat <marillat@debian.org>  Sat, 21 Sep 2002 14:41:00 +0200
+
+libart-lgpl (2.3.10-3) unstable; urgency=low
+
+  * Replace libc6-dev by libc-dev for -dev package.
+
+ -- Christian Marillat <marillat@debian.org>  Thu,  5 Sep 2002 18:25:28 +0200
+
+libart-lgpl (2.3.10-2) unstable; urgency=low
+
+  * Move libc6-dev dependency in the -dev package.
+
+ -- Christian Marillat <marillat@debian.org>  Thu,  8 Aug 2002 14:34:51 +0200
+
+libart-lgpl (2.3.10-1) unstable; urgency=low
+
+  * New upstream release (Closes: #151622)
+
+ -- Christian Marillat <marillat@debian.org>  Tue,  2 Jul 2002 01:38:03 +0200
+
+libart-lgpl (2.3.9-2) unstable; urgency=low
+
+  * debian/control add a versioned dependency for the -dev package
+    (Closes: #151369)
+
+ -- Christian Marillat <marillat@debian.org>  Sat, 29 Jun 2002 17:39:39 +0200
+
+libart-lgpl (2.3.9-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Christian Marillat <marillat@debian.org>  Tue, 25 Jun 2002 10:26:05 +0200
+
+libart-lgpl (2.3.8-2) unstable; urgency=low
+
+  * Add support for DEB_HOST_GNU_TYPE DEB_BUILD_GNU_TYPE and
+    DEB_BUILD_OPTIONS
+
+ -- Christian Marillat <marillat@debian.org>  Wed, 15 May 2002 22:28:40 +0200
+
+libart-lgpl (2.3.8-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Christian Marillat <marillat@debian.org>  Mon, 14 Jan 2002 10:58:19 +0100
+
+libart-lgpl (2.3.7-1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- Christian Marillat <marillat@debian.org>  Mon, 19 Nov 2001 18:29:06 +0100
+
+Local variables:
+mode: debian-changelog
+End:
diff --git a/debian/lenny/dependencies/libart-lgpl/debian/compat b/debian/lenny/dependencies/libart-lgpl/debian/compat
new file mode 100644
index 000000000..7ed6ff82d
--- /dev/null
+++ b/debian/lenny/dependencies/libart-lgpl/debian/compat
@@ -0,0 +1 @@
+5
diff --git a/debian/lenny/dependencies/libart-lgpl/debian/control b/debian/lenny/dependencies/libart-lgpl/debian/control
new file mode 100644
index 000000000..b797b51d4
--- /dev/null
+++ b/debian/lenny/dependencies/libart-lgpl/debian/control
@@ -0,0 +1,42 @@
+# This file is autogenerated. DO NOT EDIT!
+# 
+# Modifications should be made to debian/control.in instead.
+# This file is regenerated automatically in the clean target.
+
+Source: libart-lgpl
+Section: devel
+Priority: optional
+Maintainer: Josselin Mouette <joss@debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Loic Minier <lool@dooz.org>, Sebastian Dröge <slomo@debian.org>, Sebastien Bacher <seb128@debian.org>
+Standards-Version: 3.8.4
+Build-Depends: debhelper (>= 5),
+               gnome-pkg-tools (>= 0.7),
+               cdbs,
+               dpkg-dev (>= 1.13.19),
+               automake, autoconf, libtool, libltdl-dev
+
+Package: libart-2.0-2
+Architecture: any
+Section: libs
+Depends: ${misc:Depends},
+         ${shlibs:Depends}
+Description: Library of functions for 2D graphics - runtime files
+ A library of functions for 2D graphics supporting a superset of the
+ PostScript imaging model, designed to be integrated with graphics, artwork,
+ and illustration programs. It is written in optimized C, and is fully
+ compatible with C++. With a small footprint of 10,000 lines of code, it is
+ especially suitable for embedded applications.
+
+Package: libart-2.0-dev
+Architecture: any
+Section: libdevel
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+         libart-2.0-2 (= ${binary:Version}),
+         pkg-config
+Description: Library of functions for 2D graphics - development files
+ A library of functions for 2D graphics supporting a superset of the
+ PostScript imaging model, designed to be integrated with graphics, artwork,
+ and illustration programs. It is written in optimized C, and is fully
+ compatible with C++. With a small footprint of 10,000 lines of code, it is
+ especially suitable for embedded applications.
diff --git a/debian/lenny/dependencies/libart-lgpl/debian/control.in b/debian/lenny/dependencies/libart-lgpl/debian/control.in
new file mode 100644
index 000000000..12f7ab436
--- /dev/null
+++ b/debian/lenny/dependencies/libart-lgpl/debian/control.in
@@ -0,0 +1,37 @@
+Source: libart-lgpl
+Section: devel
+Priority: optional
+Maintainer: Josselin Mouette <joss@debian.org>
+Uploaders: @GNOME_TEAM@
+Standards-Version: 3.8.4
+Build-Depends: debhelper (>= 5),
+               gnome-pkg-tools (>= 0.7),
+               cdbs,
+               dpkg-dev (>= 1.13.19),
+               autotools-dev
+
+Package: libart-2.0-2
+Architecture: any
+Section: libs
+Depends: ${misc:Depends},
+         ${shlibs:Depends}
+Description: Library of functions for 2D graphics - runtime files
+ A library of functions for 2D graphics supporting a superset of the
+ PostScript imaging model, designed to be integrated with graphics, artwork,
+ and illustration programs. It is written in optimized C, and is fully
+ compatible with C++. With a small footprint of 10,000 lines of code, it is
+ especially suitable for embedded applications.
+
+Package: libart-2.0-dev
+Architecture: any
+Section: libdevel
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+         libart-2.0-2 (= ${binary:Version}),
+         pkg-config
+Description: Library of functions for 2D graphics - development files
+ A library of functions for 2D graphics supporting a superset of the
+ PostScript imaging model, designed to be integrated with graphics, artwork,
+ and illustration programs. It is written in optimized C, and is fully
+ compatible with C++. With a small footprint of 10,000 lines of code, it is
+ especially suitable for embedded applications.
diff --git a/debian/lenny/dependencies/libart-lgpl/debian/copyright b/debian/lenny/dependencies/libart-lgpl/debian/copyright
new file mode 100644
index 000000000..6c6d40347
--- /dev/null
+++ b/debian/lenny/dependencies/libart-lgpl/debian/copyright
@@ -0,0 +1,27 @@
+This package was debianized by  Christian Marillat <marillat@debian.org> on
+Mon, 19 Nov 2001 18:29:06 +0100
+
+It was downloaded from http://ftp.gnome.org/pub/GNOME/sources/libart_lgpl/
+
+Upstream Author: Raph Levien <raph@acm.org>
+
+Copyright: 1998, 1999, 2000, 2001 Raph Levien <raph@acm.org>
+
+License:
+
+    This package is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2 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
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser 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 Lesser General
+Public License can be found in `/usr/share/common-licenses/LGPL'.
diff --git a/debian/lenny/dependencies/libart-lgpl/debian/libart-2.0-2.install b/debian/lenny/dependencies/libart-lgpl/debian/libart-2.0-2.install
new file mode 100644
index 000000000..be04efa71
--- /dev/null
+++ b/debian/lenny/dependencies/libart-lgpl/debian/libart-2.0-2.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libart_lgpl_2.so.*
diff --git a/debian/lenny/dependencies/libart-lgpl/debian/libart-2.0-dev.install b/debian/lenny/dependencies/libart-lgpl/debian/libart-2.0-dev.install
new file mode 100644
index 000000000..154d573e6
--- /dev/null
+++ b/debian/lenny/dependencies/libart-lgpl/debian/libart-2.0-dev.install
@@ -0,0 +1,6 @@
+debian/tmp/usr/include
+debian/tmp/usr/lib/pkgconfig
+debian/tmp/usr/bin/libart2-config
+debian/tmp/usr/lib/libart_lgpl_2.a
+debian/tmp/usr/lib/libart_lgpl_2.la
+debian/tmp/usr/lib/libart_lgpl_2.so
diff --git a/debian/lenny/dependencies/libart-lgpl/debian/libart-2.0-dev.manpages b/debian/lenny/dependencies/libart-lgpl/debian/libart-2.0-dev.manpages
new file mode 100644
index 000000000..d9f908cc0
--- /dev/null
+++ b/debian/lenny/dependencies/libart-lgpl/debian/libart-2.0-dev.manpages
@@ -0,0 +1 @@
+debian/libart2-config.1
diff --git a/debian/lenny/dependencies/libart-lgpl/debian/libart2-config.1 b/debian/lenny/dependencies/libart-lgpl/debian/libart2-config.1
new file mode 100644
index 000000000..7439b2923
--- /dev/null
+++ b/debian/lenny/dependencies/libart-lgpl/debian/libart2-config.1
@@ -0,0 +1,52 @@
+.\" This manpage has been automatically generated by docbook2man 
+.\" from a DocBook document.  This tool can be found at:
+.\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> 
+.\" Please send any bug reports, improvements, comments, patches, 
+.\" etc. to Steve Cheng <steve@ggi-project.org>.
+.TH "LIBART2-CONFIG" "1" "08 August 2003" "" ""
+.SH NAME
+libart2-config \- script to get information about the installed version of libart 2.x
+.SH SYNOPSIS
+
+\fBlibart2-config\fR [ \fB --prefix\fI[=DIR]\fB \fR ] [ \fB --exec-prefix\fI[=DIR]\fB \fR ] [ \fB --libs \fR ] [ \fB --cflags \fR ] [ \fB --version \fR ]
+
+.SH "DESCRIPTION"
+.PP
+\fBlibart2-config\fR is a tool that is used to determine
+the compiler and linker flags that should be used to compile and
+link programs that use \fIlibart\fR library.
+.SH "OPTIONS"
+.TP
+\fB--prefix=PREFIX\fR
+If specified, use \fIPREFIX\fR instead
+of the installation prefix that
+\fIlibart\fR was built with when computing
+the output for the \fB--cflags\fR and
+\fB--libs\fR options. This option is also used for
+the exec prefix if \fB--exec-prefix\fR was
+not specified. This option must be specified before any
+\fB--libs\fR or \fB--cflags\fR options.
+.TP
+\fB--exec-prefix=PREFIX\fR
+If specified, use \fIPREFIX\fR instead
+of the installation exec prefix that
+\fIlibart\fR was built with when computing
+the output for the \fB--cflags\fR and
+\fB--libs\fR options. This option must be specified
+before any \fB--libs\fR or \fB--cflags\fR options.
+.TP
+\fB--libs\fR
+Print the linker flags that are necessary to link a
+\fIlibart\fR program.
+.TP
+\fB--cflags\fR
+Print the compiler flags that are necessary to compile a
+\fIlibart\fR program.
+.TP
+\fB--version\fR
+Print the currently installed version of
+\fIlibart\fR on the standard output.
+.SH "AUTHOR"
+.PP
+This manual page was written by Christian Marillat <marillat@debian.org> for
+the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/lenny/dependencies/libart-lgpl/debian/rules b/debian/lenny/dependencies/libart-lgpl/debian/rules
new file mode 100755
index 000000000..4390434f7
--- /dev/null
+++ b/debian/lenny/dependencies/libart-lgpl/debian/rules
@@ -0,0 +1,22 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/utils.mk
+include /usr/share/cdbs/1/class/gnome.mk
+include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
+include /usr/share/gnome-pkg-tools/1/rules/clean-la.mk
+-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
+
+makebuilddir/kvpnc-trinity::
+	cp -Rp /usr/share/aclocal/libtool.m4 libtool.m4.in
+	cp -Rp /usr/share/libtool/config/ltmain.sh ltmain.sh
+	autoconf
+	automake
+
+libart-2.0-N := $(shell sed -rn 's/^Package:[[:space:]]*(libart-2\.0-[0-9]+)[[:space:]]*$$/\1/p' debian/control)
+
+GNOME_MODULE := libart_lgpl
+
+DEB_DH_MAKESHLIBS_ARGS_$(libart-2.0-N) += -V '$(libart-2.0-N)(>= 2.3.18)'
+
diff --git a/debian/lenny/dependencies/libart-lgpl/debian/watch b/debian/lenny/dependencies/libart-lgpl/debian/watch
new file mode 100644
index 000000000..8acf72053
--- /dev/null
+++ b/debian/lenny/dependencies/libart-lgpl/debian/watch
@@ -0,0 +1,4 @@
+version=2
+http://ftp.gnome.org/pub/GNOME/sources/libart_lgpl/([\d\.]+)/ \
+        libart_lgpl-(.*)\.tar\.gz \
+        debian uupdate
diff --git a/debian/lenny/dependencies/python-tqt/debian/control b/debian/lenny/dependencies/python-tqt/debian/control
index 9354c760b..dffd4d77c 100644
--- a/debian/lenny/dependencies/python-tqt/debian/control
+++ b/debian/lenny/dependencies/python-tqt/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>
 Uploaders: Torsten Marek <shlomme@debian.org>, Bernd Zeimetz <bzed@debian.org>, Michael Casadevall <mcasadevall@debian.org>
-Build-Depends: debhelper (>= 6.0.7~), python-all-dev (>= 2.3.5-10), libtqt3-mt-dev (>= 3:3.3.4-4), tqt3-dev-tools (>= 3:3.3.4-4), tqt3-apps-dev (>= 3:3.3.4-4), python-sip-dev (>= 4.10.0-2ubuntu1), libqscintilla-dev (>= 1.7), python-support (>= 0.7.1), python-sip-dbg, python-all-dbg
+Build-Depends: debhelper (>= 6.0.7~), python-all-dev (>= 2.3.5-10), libtqtinterface-dev, tqt3-dev-tools, tqt3-apps-dev, python-sip-dev (>= 4.10.0-2ubuntu1), libtqscintilla-dev, python-support (>= 0.7.1), python-sip-dbg, python-all-dbg
 Standards-Version: 3.8.4
 
 Package: python-tqt
@@ -72,7 +72,7 @@ Package: python-tqtext-dbg
 Priority: extra
 Section: debug
 Architecture: any
-Depends: ${shlibs:Depends}, python-dbg, python-qtext (= ${binary:Version}), python-tqt-dbg (= ${binary:Version}), ${misc:Depends}
+Depends: ${shlibs:Depends}, python-dbg, python-tqtext (= ${binary:Version}), python-tqt-dbg (= ${binary:Version}), ${misc:Depends}
 Description: TQt debug extensions for PyQt
  PyQt debug Extensions. Contains:
  .
diff --git a/debian/lenny/dependencies/python-tqt/debian/rules b/debian/lenny/dependencies/python-tqt/debian/rules
index 0e74c131e..ebb91c6e4 100755
--- a/debian/lenny/dependencies/python-tqt/debian/rules
+++ b/debian/lenny/dependencies/python-tqt/debian/rules
@@ -25,6 +25,7 @@ ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 else
 	CXXFLAGS += -O1
 endif
+CXXFLAGS += "-I/usr/include/tqt"
 
 PYTHONS	:= $(shell pyversions -vr debian/control)
 
@@ -44,7 +45,7 @@ build-%/configure-stamp:
 	mkdir -p build-$*
 	cd build-$* && echo yes \
                 | python$* ../configure.py \
-                        -c -n /usr/include/qscintilla \
+                        -c -n /usr/include/tqscintilla \
                         -o /usr/lib -u -j $(SPLIT) \
                         -d /usr/lib/python$*/$(call py_sitename,$*) \
                         -l /usr/include/python$* \
@@ -58,13 +59,13 @@ dbg-build-%/configure-stamp:
 	mkdir -p dbg-build-$*
 	cd dbg-build-$* && echo yes \
                 | python$*-dbg ../configure.py \
-                        -c -n /usr/include/qscintilla \
+                        -c -n /usr/include/tqscintilla \
                         -o /usr/lib -u -j $(SPLIT) \
                         -d /usr/lib/python$*/$(call py_sitename,$*) \
                         -l /usr/include/python$*_d \
                         -v /usr/share/sip/tqt \
                         -m /usr/lib/python$*/config_d \
-                        CXXFLAGS_RELEASE="" CXXFLAGS="-O0 -g" STRIP=""
+                        CXXFLAGS_RELEASE="" CXXFLAGS="-O0 -g -I/usr/include/tqt" STRIP=""
 	touch $@
 
 build: $(PYTHONS:%=build-%/build-stamp) $(PYTHONS:%=dbg-build-%/build-stamp)
@@ -87,7 +88,7 @@ install-indep: configure
 	for version in ${PYTHONS}; do\
 		pylib=$$(python$$version -c 'from distutils import sysconfig; print sysconfig.get_python_lib()'); \
 		mkdir -p debian/python-tqt-dev/$$pylib;\
-		install -m 644 -o root -g root build-$$version/pytqtconfig.py debian/python-tqt-dev/$$pylib;\
+		install -m 644 -o root -g root build-$$version/pyqtconfig.py debian/python-tqt-dev/$$pylib;\
 	done
 	dh_install -i
 
@@ -105,7 +106,7 @@ install-arch: build
 	  mkdir -p debian/python-tqt-gl-dbg/$$pylib;\
 	  mv debian/python-tqt-dbg/$$pylib/qtgl.so \
              debian/python-tqt-gl-dbg/$$pylib/;\
-	  mkdir -p debian/python-qtext-dbg/$$pylib;\
+	  mkdir -p debian/python-tqtext-dbg/$$pylib;\
 	  mv debian/python-tqt-dbg/$$pylib/qtext.so \
              debian/python-tqtext-dbg/$$pylib/;\
 	done
diff --git a/debian/lenny/dependencies/qt3/debian/changelog b/debian/lenny/dependencies/qt3/debian/changelog
index 24e9a2fab..018cd497a 100644
--- a/debian/lenny/dependencies/qt3/debian/changelog
+++ b/debian/lenny/dependencies/qt3/debian/changelog
@@ -499,7 +499,7 @@ qt-x11-free (3:3.3.7-1ubuntu3) feisty; urgency=low
 qt-x11-free (3:3.3.7-1ubuntu2) feisty; urgency=low
 
   * Remove kubuntu_05_gcc_hidden_visibility.dpatch from 00list
-    of patches, it caused pyqt and pykde to hide init methods which
+    of patches, it caused pyqt and pytde to hide init methods which
     are needed to load modules and it broke skim.
 
  -- Jonathan Riddell <jriddell@ubuntu.com>  Mon,  4 Dec 2006 13:48:56 +0000
diff --git a/debian/lenny/dependencies/tqscintilla/debian/control b/debian/lenny/dependencies/tqscintilla/debian/control
index b6651b56b..a38122ffd 100644
--- a/debian/lenny/dependencies/tqscintilla/debian/control
+++ b/debian/lenny/dependencies/tqscintilla/debian/control
@@ -3,8 +3,8 @@ Section: libs
 Priority: optional
 Maintainer: Ricardo Javier Cardenes Medina <rcardenes@debian.org>
 Uploaders: Torsten Marek <shlomme@debian.org>
-Build-Depends: debhelper (>> 5.0.0), libtqt3-mt-dev, tqt3-dev-tools
-Standards-Version: 3.7.2
+Build-Depends: debhelper (>> 5.0.0), libtqt3-mt-dev, tqt3-dev-tools, libtqtinterface-dev
+Standards-Version: 3.8.4
 
 Package: libtqscintilla7
 Section: libs
diff --git a/debian/lenny/dependencies/tqscintilla/debian/libtqscintilla-doc.install b/debian/lenny/dependencies/tqscintilla/debian/libtqscintilla-doc.install
index 37ac20176..005276324 100644
--- a/debian/lenny/dependencies/tqscintilla/debian/libtqscintilla-doc.install
+++ b/debian/lenny/dependencies/tqscintilla/debian/libtqscintilla-doc.install
@@ -1 +1 @@
-usr/share/doc/libqscintilla-doc
+usr/share/doc/libtqscintilla-doc
diff --git a/debian/lenny/dependencies/tqscintilla/debian/libtqscintilla7.install b/debian/lenny/dependencies/tqscintilla/debian/libtqscintilla7.install
index 9497944d7..2cfef7f8a 100644
--- a/debian/lenny/dependencies/tqscintilla/debian/libtqscintilla7.install
+++ b/debian/lenny/dependencies/tqscintilla/debian/libtqscintilla7.install
@@ -1,3 +1,3 @@
 usr/lib/*.so.*
-usr/lib/qt3/plugins/designer/*.so
-usr/share/qt3/translations/*.qm
+usr/lib/tqt3/plugins/designer/*.so
+usr/share/tqt3/translations/*.qm