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

25 files changed, 244 insertions, 10 deletions

diff --git a/debian/lenny/applications/kcmautostart/debian/changelog b/debian/lenny/applications/kcmautostart/debian/changelog
new file mode 100644
index 000000000..608bc541c
--- /dev/null
+++ b/debian/lenny/applications/kcmautostart/debian/changelog
@@ -0,0 +1,5 @@
+kcontrol-autostart-trinity (0.5-0ubuntu0) karmic; urgency=low
+
+  * Karmic rebuild
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 02 July 2009 16:08:00 -0600
diff --git a/debian/lenny/applications/kcmautostart/debian/compat b/debian/lenny/applications/kcmautostart/debian/compat
new file mode 100644
index 000000000..7ed6ff82d
--- /dev/null
+++ b/debian/lenny/applications/kcmautostart/debian/compat
@@ -0,0 +1 @@
+5
diff --git a/debian/lenny/applications/kcmautostart/debian/control b/debian/lenny/applications/kcmautostart/debian/control
new file mode 100644
index 000000000..3b4fd4872
--- /dev/null
+++ b/debian/lenny/applications/kcmautostart/debian/control
@@ -0,0 +1,16 @@
+Source: kcontrol-autostart-trinity
+Section: tde
+Priority: optional
+Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+XSBC-Original-Maintainer: Raphaël Pinson <raphink@raphink.net>
+Build-Depends: debhelper (>= 5), cdbs, tdelibs4-trinity-dev, automake, autoconf, libtool, libltdl-dev
+Standards-Version: 3.8.4
+
+Package: kcontrol-autostart-trinity
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: autostart module for the TDE control center
+ Autostart is a TDE control center module to configure which applications
+ start up when you login into a TDE session.
+ .
+  Homepage: http://www.kde-apps.org/content/download.php?content=45975
diff --git a/debian/lenny/applications/kcmautostart/debian/copyright b/debian/lenny/applications/kcmautostart/debian/copyright
new file mode 100644
index 000000000..68eb13461
--- /dev/null
+++ b/debian/lenny/applications/kcmautostart/debian/copyright
@@ -0,0 +1,32 @@
+This package was debianized by Raphaël Pinson <raphink@raphink.net> on
+Fri, 16 Dec 2005 19:52:51 +0100.
+
+It was downloaded from http://www.kde-apps.org/content/download.php?content=45975&id=1
+
+Upstream Author:  Stephen Leaf <smileaf@smileaf.org>
+
+Copyright (C) 1997 Janos Farkas (chexum@shadow.banki.hu)
+copyright (C) 2006 Stephen Leaf <smileaf@smileaf.org>
+
+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'.
+
+The Debian packaging is (C) 2007, Raphaël Pinson <raphink@raphink.net> 
+is licensed under the GPL, see above.
+
diff --git a/debian/lenny/applications/kcmautostart/debian/rules b/debian/lenny/applications/kcmautostart/debian/rules
new file mode 100644
index 000000000..242fb2c84
--- /dev/null
+++ b/debian/lenny/applications/kcmautostart/debian/rules
@@ -0,0 +1,24 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/debhelper.mk
+
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
+DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
+DEB_CONFIGURE_PREFIX := /opt/trinity
+DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
+
+cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
+
+post-patches:: debian/stamp-bootstrap
+
+debian/stamp-bootstrap:
+	! [ -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
+	
+	make -f admin/Makefile.common cvs
+	touch debian/stamp-bootstrap
diff --git a/debian/lenny/applications/kstreamripper/debian/control b/debian/lenny/applications/kstreamripper/debian/control
index 96ea4651d..505bc6682 100644
--- a/debian/lenny/applications/kstreamripper/debian/control
+++ b/debian/lenny/applications/kstreamripper/debian/control
@@ -2,7 +2,7 @@ Source: kstreamripper-trinity
 Section: sound 
 Priority: optional
 Maintainer: Michael Ablassmeier <abi@debian.org>
-Build-Depends: debhelper (>= 4.1.0), cdbs, libxmu-dev, libjpeg62-dev (>= 6b-9), tdelibs4-trinity-dev, scons
+Build-Depends: debhelper (>= 4.1.0), cdbs, libxmu-dev, libjpeg-dev, tdelibs4-trinity-dev, scons
 Standards-Version: 3.8.4
 
 Package: kstreamripper-trinity
diff --git a/debian/lenny/tdeutils/debian/control b/debian/lenny/tdeutils/debian/control
index 290f65d7f..8af135969 100644
--- a/debian/lenny/tdeutils/debian/control
+++ b/debian/lenny/tdeutils/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Fathi Boudra <fboudra@free.fr>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: libasound2-dev, ia32-libs [amd64], cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-trinity-dev, tdebase-trinity-dev, libkonq4-trinity-dev, libgmp3-dev, libsnmp-dev, libxpm-dev, python-dev, libxtst-dev, xutils, sharutils, automake, autoconf, libtool, libltdl-dev
+Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-trinity-dev, tdebase-trinity-dev, libkonq4-trinity-dev, libgmp3-dev, libsnmp-dev, libxpm-dev, python-dev, libxtst-dev, xutils, sharutils, automake, autoconf, libtool, libltdl-dev
 Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11, tdelibs4-trinity-doc
 Standards-Version: 3.8.4
 
diff --git a/debian/squeeze/applications/kcmautostart/debian/changelog b/debian/squeeze/applications/kcmautostart/debian/changelog
new file mode 100644
index 000000000..608bc541c
--- /dev/null
+++ b/debian/squeeze/applications/kcmautostart/debian/changelog
@@ -0,0 +1,5 @@
+kcontrol-autostart-trinity (0.5-0ubuntu0) karmic; urgency=low
+
+  * Karmic rebuild
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 02 July 2009 16:08:00 -0600
diff --git a/debian/squeeze/applications/kcmautostart/debian/compat b/debian/squeeze/applications/kcmautostart/debian/compat
new file mode 100644
index 000000000..7ed6ff82d
--- /dev/null
+++ b/debian/squeeze/applications/kcmautostart/debian/compat
@@ -0,0 +1 @@
+5
diff --git a/debian/squeeze/applications/kcmautostart/debian/control b/debian/squeeze/applications/kcmautostart/debian/control
new file mode 100644
index 000000000..3b4fd4872
--- /dev/null
+++ b/debian/squeeze/applications/kcmautostart/debian/control
@@ -0,0 +1,16 @@
+Source: kcontrol-autostart-trinity
+Section: tde
+Priority: optional
+Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+XSBC-Original-Maintainer: Raphaël Pinson <raphink@raphink.net>
+Build-Depends: debhelper (>= 5), cdbs, tdelibs4-trinity-dev, automake, autoconf, libtool, libltdl-dev
+Standards-Version: 3.8.4
+
+Package: kcontrol-autostart-trinity
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: autostart module for the TDE control center
+ Autostart is a TDE control center module to configure which applications
+ start up when you login into a TDE session.
+ .
+  Homepage: http://www.kde-apps.org/content/download.php?content=45975
diff --git a/debian/squeeze/applications/kcmautostart/debian/copyright b/debian/squeeze/applications/kcmautostart/debian/copyright
new file mode 100644
index 000000000..68eb13461
--- /dev/null
+++ b/debian/squeeze/applications/kcmautostart/debian/copyright
@@ -0,0 +1,32 @@
+This package was debianized by Raphaël Pinson <raphink@raphink.net> on
+Fri, 16 Dec 2005 19:52:51 +0100.
+
+It was downloaded from http://www.kde-apps.org/content/download.php?content=45975&id=1
+
+Upstream Author:  Stephen Leaf <smileaf@smileaf.org>
+
+Copyright (C) 1997 Janos Farkas (chexum@shadow.banki.hu)
+copyright (C) 2006 Stephen Leaf <smileaf@smileaf.org>
+
+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'.
+
+The Debian packaging is (C) 2007, Raphaël Pinson <raphink@raphink.net> 
+is licensed under the GPL, see above.
+
diff --git a/debian/squeeze/applications/kcmautostart/debian/rules b/debian/squeeze/applications/kcmautostart/debian/rules
new file mode 100644
index 000000000..242fb2c84
--- /dev/null
+++ b/debian/squeeze/applications/kcmautostart/debian/rules
@@ -0,0 +1,24 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/debhelper.mk
+
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
+DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
+DEB_CONFIGURE_PREFIX := /opt/trinity
+DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
+
+cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
+
+post-patches:: debian/stamp-bootstrap
+
+debian/stamp-bootstrap:
+	! [ -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
+	
+	make -f admin/Makefile.common cvs
+	touch debian/stamp-bootstrap
diff --git a/debian/squeeze/applications/kstreamripper/debian/control b/debian/squeeze/applications/kstreamripper/debian/control
index 96ea4651d..505bc6682 100644
--- a/debian/squeeze/applications/kstreamripper/debian/control
+++ b/debian/squeeze/applications/kstreamripper/debian/control
@@ -2,7 +2,7 @@ Source: kstreamripper-trinity
 Section: sound 
 Priority: optional
 Maintainer: Michael Ablassmeier <abi@debian.org>
-Build-Depends: debhelper (>= 4.1.0), cdbs, libxmu-dev, libjpeg62-dev (>= 6b-9), tdelibs4-trinity-dev, scons
+Build-Depends: debhelper (>= 4.1.0), cdbs, libxmu-dev, libjpeg-dev, tdelibs4-trinity-dev, scons
 Standards-Version: 3.8.4
 
 Package: kstreamripper-trinity
diff --git a/debian/squeeze/tdeutils/debian/control b/debian/squeeze/tdeutils/debian/control
index 290f65d7f..8af135969 100644
--- a/debian/squeeze/tdeutils/debian/control
+++ b/debian/squeeze/tdeutils/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Fathi Boudra <fboudra@free.fr>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: libasound2-dev, ia32-libs [amd64], cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-trinity-dev, tdebase-trinity-dev, libkonq4-trinity-dev, libgmp3-dev, libsnmp-dev, libxpm-dev, python-dev, libxtst-dev, xutils, sharutils, automake, autoconf, libtool, libltdl-dev
+Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-trinity-dev, tdebase-trinity-dev, libkonq4-trinity-dev, libgmp3-dev, libsnmp-dev, libxpm-dev, python-dev, libxtst-dev, xutils, sharutils, automake, autoconf, libtool, libltdl-dev
 Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11, tdelibs4-trinity-doc
 Standards-Version: 3.8.4
 
diff --git a/ubuntu/maverick/applications/kcmautostart/debian/changelog b/ubuntu/maverick/applications/kcmautostart/debian/changelog
new file mode 100644
index 000000000..608bc541c
--- /dev/null
+++ b/ubuntu/maverick/applications/kcmautostart/debian/changelog
@@ -0,0 +1,5 @@
+kcontrol-autostart-trinity (0.5-0ubuntu0) karmic; urgency=low
+
+  * Karmic rebuild
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 02 July 2009 16:08:00 -0600
diff --git a/ubuntu/maverick/applications/kcmautostart/debian/compat b/ubuntu/maverick/applications/kcmautostart/debian/compat
new file mode 100644
index 000000000..7ed6ff82d
--- /dev/null
+++ b/ubuntu/maverick/applications/kcmautostart/debian/compat
@@ -0,0 +1 @@
+5
diff --git a/ubuntu/maverick/applications/kcmautostart/debian/control b/ubuntu/maverick/applications/kcmautostart/debian/control
new file mode 100644
index 000000000..3b4fd4872
--- /dev/null
+++ b/ubuntu/maverick/applications/kcmautostart/debian/control
@@ -0,0 +1,16 @@
+Source: kcontrol-autostart-trinity
+Section: tde
+Priority: optional
+Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+XSBC-Original-Maintainer: Raphaël Pinson <raphink@raphink.net>
+Build-Depends: debhelper (>= 5), cdbs, tdelibs4-trinity-dev, automake, autoconf, libtool, libltdl-dev
+Standards-Version: 3.8.4
+
+Package: kcontrol-autostart-trinity
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: autostart module for the TDE control center
+ Autostart is a TDE control center module to configure which applications
+ start up when you login into a TDE session.
+ .
+  Homepage: http://www.kde-apps.org/content/download.php?content=45975
diff --git a/ubuntu/maverick/applications/kcmautostart/debian/copyright b/ubuntu/maverick/applications/kcmautostart/debian/copyright
new file mode 100644
index 000000000..68eb13461
--- /dev/null
+++ b/ubuntu/maverick/applications/kcmautostart/debian/copyright
@@ -0,0 +1,32 @@
+This package was debianized by Raphaël Pinson <raphink@raphink.net> on
+Fri, 16 Dec 2005 19:52:51 +0100.
+
+It was downloaded from http://www.kde-apps.org/content/download.php?content=45975&id=1
+
+Upstream Author:  Stephen Leaf <smileaf@smileaf.org>
+
+Copyright (C) 1997 Janos Farkas (chexum@shadow.banki.hu)
+copyright (C) 2006 Stephen Leaf <smileaf@smileaf.org>
+
+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'.
+
+The Debian packaging is (C) 2007, Raphaël Pinson <raphink@raphink.net> 
+is licensed under the GPL, see above.
+
diff --git a/ubuntu/maverick/applications/kcmautostart/debian/rules b/ubuntu/maverick/applications/kcmautostart/debian/rules
new file mode 100644
index 000000000..242fb2c84
--- /dev/null
+++ b/ubuntu/maverick/applications/kcmautostart/debian/rules
@@ -0,0 +1,24 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/debhelper.mk
+
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
+DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
+DEB_CONFIGURE_PREFIX := /opt/trinity
+DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
+
+cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
+
+post-patches:: debian/stamp-bootstrap
+
+debian/stamp-bootstrap:
+	! [ -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
+	
+	make -f admin/Makefile.common cvs
+	touch debian/stamp-bootstrap
diff --git a/ubuntu/maverick/applications/kstreamripper/debian/control b/ubuntu/maverick/applications/kstreamripper/debian/control
index 96ea4651d..505bc6682 100644
--- a/ubuntu/maverick/applications/kstreamripper/debian/control
+++ b/ubuntu/maverick/applications/kstreamripper/debian/control
@@ -2,7 +2,7 @@ Source: kstreamripper-trinity
 Section: sound 
 Priority: optional
 Maintainer: Michael Ablassmeier <abi@debian.org>
-Build-Depends: debhelper (>= 4.1.0), cdbs, libxmu-dev, libjpeg62-dev (>= 6b-9), tdelibs4-trinity-dev, scons
+Build-Depends: debhelper (>= 4.1.0), cdbs, libxmu-dev, libjpeg-dev, tdelibs4-trinity-dev, scons
 Standards-Version: 3.8.4
 
 Package: kstreamripper-trinity
diff --git a/ubuntu/maverick/applications/tde-guidance/debian/control b/ubuntu/maverick/applications/tde-guidance/debian/control
index 0a0b81471..1e6619c82 100644
--- a/ubuntu/maverick/applications/tde-guidance/debian/control
+++ b/ubuntu/maverick/applications/tde-guidance/debian/control
@@ -7,7 +7,7 @@ Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
 Build-Depends: cdbs, debhelper (>= 5), chrpath, tdelibs4-trinity-dev,
  libpythonize0-trinity-dev, libtool, libxml2-utils, libxss-dev, libxxf86vm-dev,
  pytdeextensions-trinity, pytqt-tools, python-tqt, python-trinity-trinity, python-trinity-trinity-dev, python-sip4-dev,
- python-support (>= 0.6), python2.6 (>= 2.5), python2.6-dev (>= 2.5), x11proto-scrnsaver-dev, python-tqt-dev, hwdata
+ python-support (>= 0.6), python-all (>= 2.5), python-all-dev (>= 2.5), x11proto-scrnsaver-dev, python-tqt-dev, hwdata
 Standards-Version: 3.8.4
 
 Package: tde-guidance-trinity
diff --git a/ubuntu/maverick/applications/tde-guidance/debian/python-distutils-jaunty.mk b/ubuntu/maverick/applications/tde-guidance/debian/python-distutils-jaunty.mk
index 9c5e5211f..72efb646f 100644
--- a/ubuntu/maverick/applications/tde-guidance/debian/python-distutils-jaunty.mk
+++ b/ubuntu/maverick/applications/tde-guidance/debian/python-distutils-jaunty.mk
@@ -83,7 +83,7 @@ endif # pysupport
 
 ifndef DEB_PYTHON_SYSTEM
 DEB_PYTHON_COMPILE_VERSION = 
-DEB_PYTHON_VERSIONS = 2.1 2.2 2.3 2.4 2.5 2.6
+DEB_PYTHON_VERSIONS = 2.1 2.2 2.3 2.4 2.5 2.6 2.7
 else
 # default package is the first one declared in 'debian/control'
 # (override if necessary)
diff --git a/ubuntu/maverick/applications/tde-guidance/debian/rules b/ubuntu/maverick/applications/tde-guidance/debian/rules
index e21db2b6b..df63d31b1 100755
--- a/ubuntu/maverick/applications/tde-guidance/debian/rules
+++ b/ubuntu/maverick/applications/tde-guidance/debian/rules
@@ -93,7 +93,7 @@ install/guidance-backends-trinity::
 	install -D -p -m0755 displayconfig/displayconfig-hwprobe.py \
 		$(PYSUPPORT_PATH)/guidance-backends-trinity/displayconfig-hwprobe.py
 
-	cp $(DEB_DESTDIR)/usr/lib/python2.6/site-packages/xf86misc.py $(PYSUPPORT_PATH)/guidance-backends-trinity
+	cp $(DEB_DESTDIR)/usr/lib/python*/site-packages/xf86misc.py $(PYSUPPORT_PATH)/guidance-backends-trinity
 	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/MicroHAL.py $(PYSUPPORT_PATH)/guidance-backends-trinity
 	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/ScanPCI.py $(PYSUPPORT_PATH)/guidance-backends-trinity
 	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/infimport.py $(PYSUPPORT_PATH)/guidance-backends-trinity
diff --git a/ubuntu/maverick/libraries/pytdeextensions/debian/control b/ubuntu/maverick/libraries/pytdeextensions/debian/control
index 19a63c726..73d813acb 100644
--- a/ubuntu/maverick/libraries/pytdeextensions/debian/control
+++ b/ubuntu/maverick/libraries/pytdeextensions/debian/control
@@ -5,7 +5,7 @@ Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
 Build-Depends: cdbs, debhelper (>= 5), chrpath, quilt, tdelibs4c2a-trinity, libtool,
  libxml2-utils, libxrandr-dev, libxxf86vm-dev, pytqt-tools, python-trinity-trinity,
- python-tqt-dev, python-sip4-dev, python-support (>= 0.6), python2.6, python2.6-dev
+ python-tqt-dev, python-sip4-dev, python-support (>= 0.6), python-all (>= 2.5), python-all-dev (>= 2.5)
 Standards-Version: 3.8.4
 
 Package: pytdeextensions-trinity
diff --git a/ubuntu/maverick/tdeutils/debian/control b/ubuntu/maverick/tdeutils/debian/control
index 290f65d7f..8af135969 100644
--- a/ubuntu/maverick/tdeutils/debian/control
+++ b/ubuntu/maverick/tdeutils/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Fathi Boudra <fboudra@free.fr>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: libasound2-dev, ia32-libs [amd64], cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-trinity-dev, tdebase-trinity-dev, libkonq4-trinity-dev, libgmp3-dev, libsnmp-dev, libxpm-dev, python-dev, libxtst-dev, xutils, sharutils, automake, autoconf, libtool, libltdl-dev
+Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-trinity-dev, tdebase-trinity-dev, libkonq4-trinity-dev, libgmp3-dev, libsnmp-dev, libxpm-dev, python-dev, libxtst-dev, xutils, sharutils, automake, autoconf, libtool, libltdl-dev
 Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11, tdelibs4-trinity-doc
 Standards-Version: 3.8.4