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

7 files changed, 16 insertions, 73 deletions

diff --git a/ubuntu/maverick/applications/kde-guidance/debian/control b/ubuntu/maverick/applications/kde-guidance/debian/control
index 454cdfd58..efe6cf0dc 100644
--- a/ubuntu/maverick/applications/kde-guidance/debian/control
+++ b/ubuntu/maverick/applications/kde-guidance/debian/control
@@ -7,7 +7,7 @@ Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
 Build-Depends: cdbs, debhelper (>= 5), chrpath, kdelibs4-trinity-dev,
  libpythonize0-trinity-dev, libtool, libxml2-utils, libxss-dev, libxxf86vm-dev,
  pykdeextensions-trinity, pyqt-tools, python-qt3 (>= 3.17.2-1ubuntu2), python-trinity-trinity, python-trinity-trinity-dev, python-sip4-dev,
- python-support (>= 0.6), python (>= 2.5), python-dev (>= 2.5), x11proto-scrnsaver-dev, python-qt-dev, hwdata
+ python-support (>= 0.6), python2.6 (>= 2.5), python2.6-dev (>= 2.5), x11proto-scrnsaver-dev, python-qt-dev, hwdata
 Standards-Version: 3.8.4
 
 Package: kde-guidance-trinity
diff --git a/ubuntu/maverick/applications/knetworkmanager/debian/control b/ubuntu/maverick/applications/knetworkmanager/debian/control
index d1bde2e36..1f32d831d 100644
--- a/ubuntu/maverick/applications/knetworkmanager/debian/control
+++ b/ubuntu/maverick/applications/knetworkmanager/debian/control
@@ -10,7 +10,7 @@ Build-Depends: cdbs,
  libnm-glib-dev (>= 0.7.0),
  network-manager-dev (>= 0.7.0),
  libhal-dev,
- libdbus-1-qt3-dev (>= 0.8.1),
+ libdbus-1-tqt-dev,
  libiw-dev,
  libnl-dev (>= 1.1),
  quilt,
diff --git a/ubuntu/maverick/kdeartwork/debian/kscreensaver-xsavers-trinity.install b/ubuntu/maverick/kdeartwork/debian/kscreensaver-xsavers-trinity.install
index af1bbc133..9d8130e98 100644
--- a/ubuntu/maverick/kdeartwork/debian/kscreensaver-xsavers-trinity.install
+++ b/ubuntu/maverick/kdeartwork/debian/kscreensaver-xsavers-trinity.install
@@ -1,3 +1,6 @@
+debian/tmp/opt/trinity/bin/xscreensaver-getimage-file
+debian/tmp/opt/trinity/bin/xscreensaver-getimage
+debian/tmp/opt/trinity/bin/krootbacking
 debian/tmp/opt/trinity/bin/kxsconfig
 debian/tmp/opt/trinity/bin/kxsrun
 debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/antinspect.desktop
diff --git a/ubuntu/maverick/kdeartwork/debian/patches/debianize-xscreensaver-root-hack.diff b/ubuntu/maverick/kdeartwork/debian/patches/debianize-xscreensaver-root-hack.diff
new file mode 100644
index 000000000..b8a55ad56
--- /dev/null
+++ b/ubuntu/maverick/kdeartwork/debian/patches/debianize-xscreensaver-root-hack.diff
@@ -0,0 +1,10 @@
+diff -urN kscreensaver/krootbacking/Makefile.am kscreensaver/krootbacking/Makefile.am
+--- kscreensaver/krootbacking/Makefile.am	2011-08-19 19:27:09.000000000 -0500
++++ kscreensaver/krootbacking/Makefile.am	2011-08-19 20:06:36.000000000 -0500
+@@ -9,5 +9,5 @@
+ 
+ noinst_HEADERS = krootbacking.h
+ 
+-hackdir = /usr/local/bin/
++hackdir = /opt/trinity/bin/
+ hack_DATA = xscreensaver-getimage xscreensaver-getimage-file
diff --git a/ubuntu/maverick/kdemultimedia/debian/kmix-trinity.postrm b/ubuntu/maverick/kdemultimedia/debian/kmix-trinity.postrm
deleted file mode 100644
index 80792fb72..000000000
--- a/ubuntu/maverick/kdemultimedia/debian/kmix-trinity.postrm
+++ /dev/null
@@ -1,31 +0,0 @@
-#! /bin/sh -e
-
-case "$1" in
-    purge)
-    ;;
-
-    remove)
-	mkdir -p /etc/xdg/menus
-	dpkg-divert --remove --rename /etc/xdg/menus/kde-information.menu
-	rm -rf /etc/xdg/menus.kde4
-
-	mkdir -p /usr/share/autostart
-        dpkg-divert --remove --rename /usr/share/autostart/kmix_autostart.desktop
-        #dpkg-divert --remove --rename /usr/share/autostart/restore_kmix_volumes.desktop
-        #mkdir -p /opt/trinity/share/autostart/restore_kmix_volumes.desktop
-        #dpkg-divert --remove --rename /opt/trinity/share/autostart/restore_kmix_volumes.desktop
-        #rm -f /opt/trinity/share/autostart/restore_kmix_volumes.desktop
-    ;;
-
-    upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-    ;;
-
-    *)
-        echo "postrm called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-#DEBHELPER#
-
-exit 0
diff --git a/ubuntu/maverick/kdemultimedia/debian/kmix-trinity.preinst b/ubuntu/maverick/kdemultimedia/debian/kmix-trinity.preinst
deleted file mode 100644
index 251742f38..000000000
--- a/ubuntu/maverick/kdemultimedia/debian/kmix-trinity.preinst
+++ /dev/null
@@ -1,39 +0,0 @@
-#! /bin/sh -e
-
-case "$1" in
-
-    upgrade)
-	mkdir -p /usr/share/autostart.bkp
-        dpkg-divert --add --rename --divert /usr/share/autostart.bkp/kmix_autostart.desktop /usr/share/autostart/kmix_autostart.desktop
-        rm -f /usr/share/autostart/kmix_autostart.desktop
-	#dpkg-divert --add --rename --divert /usr/share/autostart.bkp/restore_kmix_volumes.desktop /usr/share/autostart/restore_kmix_volumes.desktop
-	#rm -f /usr/share/autostart/restore_kmix_volumes.desktop
-	#mkdir -p /opt/trinity/share/autostart.bkp/restore_kmix_volumes.desktop
-	#dpkg-divert --add --rename --divert /opt/trinity/share/autostart.bkp/restore_kmix_volumes.desktop /opt/trinity/share/autostart/restore_kmix_volumes.desktop
-	#rm -f /opt/trinity/share/autostart/restore_kmix_volumes.desktop
-    ;;
-
-    install)
-	mkdir -p /usr/share/autostart.bkp
-        dpkg-divert --add --rename --divert /usr/share/autostart.bkp/kmix_autostart.desktop /usr/share/autostart/kmix_autostart.desktop
-        rm -f /usr/share/autostart/kmix_autostart.desktop
-        #dpkg-divert --add --rename --divert /usr/share/autostart.bkp/restore_kmix_volumes.desktop /usr/share/autostart/restore_kmix_volumes.desktop
-        #rm -f /usr/share/autostart/restore_kmix_volumes.desktop
-        #mkdir -p /opt/trinity/share/autostart.bkp/restore_kmix_volumes.desktop
-        #dpkg-divert --add --rename --divert /opt/trinity/share/autostart.bkp/restore_kmix_volumes.desktop /opt/trinity/share/autostart/restore_kmix_volumes.desktop
-        #rm -f /opt/trinity/share/autostart/restore_kmix_volumes.desktop
-    ;;
-
-    abort-upgrade)
-    ;;
-
-    *)
-        echo "preinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-
-esac
-
-#DEBHELPER#
-
-exit 0
diff --git a/ubuntu/maverick/libraries/pykdeextensions/debian/control b/ubuntu/maverick/libraries/pykdeextensions/debian/control
index 958752553..bc40bf165 100644
--- a/ubuntu/maverick/libraries/pykdeextensions/debian/control
+++ b/ubuntu/maverick/libraries/pykdeextensions/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, kdelibs4c2a-trinity, libtool,
  libxml2-utils, libxrandr-dev, libxxf86vm-dev, pyqt-tools, python-trinity-trinity,
- python-qt-dev, python-sip4-dev, python-support (>= 0.6), python (>= 2.5), python-dev (>= 2.5)
+ python-qt-dev, python-sip4-dev, python-support (>= 0.6), python2.6, python2.6-dev
 Standards-Version: 3.8.4
 
 Package: pykdeextensions-trinity