From ec82bfc595c3a59210cd4820c64853a0746593d9 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 17 Aug 2011 01:10:52 -0500 Subject: For now lock Ubuntu pykdeextensions to python2.6 The underlying code should support 2.7, but I don't want to split Natty out from the unified Ubuntu build system at this time --- ubuntu/maverick/libraries/pykdeextensions/debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ubuntu/maverick') 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 Uploaders: Fathi Boudra , Mark Purcell 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 -- cgit v1.2.1 From 1471ed2c2e8dbef0ef47d645db377d45abe59ded Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 17 Aug 2011 19:02:20 -0500 Subject: Fix kde-guidance FTBFS under Debian and Ubuntu --- ubuntu/maverick/applications/kde-guidance/debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ubuntu/maverick') diff --git a/ubuntu/maverick/applications/kde-guidance/debian/rules b/ubuntu/maverick/applications/kde-guidance/debian/rules index b388d4b12..0c7c4d602 100755 --- a/ubuntu/maverick/applications/kde-guidance/debian/rules +++ b/ubuntu/maverick/applications/kde-guidance/debian/rules @@ -12,7 +12,7 @@ DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp DEB_UPDATE_RCD_PARAMS := multiuser DEB_INSTALL_MANPAGES_kde-guidance-trinity := debian/displayconfig-trinity.1 debian/mountconfig-trinity.1 debian/serviceconfig-trinity.1 debian/userconfig-trinity.1 PYSUPPORT_PATH = $(DEB_DESTDIR)/opt/trinity/share/python-support -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include LDFLAGS_APPEND := -L/opt/trinity/lib install/kde-guidance-trinity:: -- cgit v1.2.1 From 1815130f968e61990d08cdf738dc57ad5bdb2682 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 17 Aug 2011 19:04:59 -0500 Subject: Lock Ubuntu kde-guidance python build dep to 2.6 --- ubuntu/maverick/applications/kde-guidance/debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ubuntu/maverick') 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 , Mark Purcell 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 -- cgit v1.2.1 From e88f8983cc1b4fe1b059956face0ac13b202240d Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 18 Aug 2011 01:27:38 -0500 Subject: Fix kdeguidance FTBFS --- ubuntu/maverick/applications/kde-guidance/debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ubuntu/maverick') diff --git a/ubuntu/maverick/applications/kde-guidance/debian/rules b/ubuntu/maverick/applications/kde-guidance/debian/rules index 0c7c4d602..b388d4b12 100755 --- a/ubuntu/maverick/applications/kde-guidance/debian/rules +++ b/ubuntu/maverick/applications/kde-guidance/debian/rules @@ -12,7 +12,7 @@ DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp DEB_UPDATE_RCD_PARAMS := multiuser DEB_INSTALL_MANPAGES_kde-guidance-trinity := debian/displayconfig-trinity.1 debian/mountconfig-trinity.1 debian/serviceconfig-trinity.1 debian/userconfig-trinity.1 PYSUPPORT_PATH = $(DEB_DESTDIR)/opt/trinity/share/python-support -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde LDFLAGS_APPEND := -L/opt/trinity/lib install/kde-guidance-trinity:: -- cgit v1.2.1 From b09f0db2c70dd7f52ce50782d68ed1967318f5d9 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 18 Aug 2011 12:25:26 -0500 Subject: Fix knetworkmanager FTBFS --- ubuntu/maverick/applications/knetworkmanager/debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ubuntu/maverick') 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, -- cgit v1.2.1 From 779143e082761c8ea8107af38f2c4765f17e68bb Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 19 Aug 2011 16:58:55 -0500 Subject: Add krootbacking binary to Ubuntu and Debian kdeartwork --- ubuntu/maverick/kdeartwork/debian/kscreensaver-trinity.install | 1 + 1 file changed, 1 insertion(+) (limited to 'ubuntu/maverick') diff --git a/ubuntu/maverick/kdeartwork/debian/kscreensaver-trinity.install b/ubuntu/maverick/kdeartwork/debian/kscreensaver-trinity.install index d65c099dc..8711152ba 100644 --- a/ubuntu/maverick/kdeartwork/debian/kscreensaver-trinity.install +++ b/ubuntu/maverick/kdeartwork/debian/kscreensaver-trinity.install @@ -1,3 +1,4 @@ +debian/tmp/opt/trinity/bin/krootbacking debian/tmp/opt/trinity/bin/kslideshow.kss debian/tmp/opt/trinity/bin/kpolygon.kss debian/tmp/opt/trinity/bin/krotation.kss -- cgit v1.2.1 From 53fd04138ca27a9534d4696dbf983a24f589495e Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 19 Aug 2011 17:32:43 -0500 Subject: Fix up kdeartwork under Debian and Ubuntu --- ubuntu/maverick/kdeartwork/debian/kscreensaver-trinity.install | 1 - ubuntu/maverick/kdeartwork/debian/kscreensaver-xsavers-trinity.install | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'ubuntu/maverick') diff --git a/ubuntu/maverick/kdeartwork/debian/kscreensaver-trinity.install b/ubuntu/maverick/kdeartwork/debian/kscreensaver-trinity.install index 8711152ba..d65c099dc 100644 --- a/ubuntu/maverick/kdeartwork/debian/kscreensaver-trinity.install +++ b/ubuntu/maverick/kdeartwork/debian/kscreensaver-trinity.install @@ -1,4 +1,3 @@ -debian/tmp/opt/trinity/bin/krootbacking debian/tmp/opt/trinity/bin/kslideshow.kss debian/tmp/opt/trinity/bin/kpolygon.kss debian/tmp/opt/trinity/bin/krotation.kss diff --git a/ubuntu/maverick/kdeartwork/debian/kscreensaver-xsavers-trinity.install b/ubuntu/maverick/kdeartwork/debian/kscreensaver-xsavers-trinity.install index af1bbc133..10fb6b475 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/usr/local/bin/xscreensaver-getimage-file +debian/tmp/usr/local/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 -- cgit v1.2.1 From 46b13ffe74ee67ad1a5d39cebb2cff0151c5ddad Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 19 Aug 2011 20:33:58 -0500 Subject: Fix kdeartwork FTBFS --- .../maverick/kdeartwork/debian/kscreensaver-xsavers-trinity.install | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ubuntu/maverick') diff --git a/ubuntu/maverick/kdeartwork/debian/kscreensaver-xsavers-trinity.install b/ubuntu/maverick/kdeartwork/debian/kscreensaver-xsavers-trinity.install index 10fb6b475..9d8130e98 100644 --- a/ubuntu/maverick/kdeartwork/debian/kscreensaver-xsavers-trinity.install +++ b/ubuntu/maverick/kdeartwork/debian/kscreensaver-xsavers-trinity.install @@ -1,5 +1,5 @@ -debian/tmp/usr/local/bin/xscreensaver-getimage-file -debian/tmp/usr/local/bin/xscreensaver-getimage +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 -- cgit v1.2.1 From 8bd1c5a1e6cce647afb0ee99a7d937fc8bca5342 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 19 Aug 2011 20:35:51 -0500 Subject: Second part of prior commit for Debian and Ubuntu --- .../debian/patches/debianize-xscreensaver-root-hack.diff | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 ubuntu/maverick/kdeartwork/debian/patches/debianize-xscreensaver-root-hack.diff (limited to 'ubuntu/maverick') 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 -- cgit v1.2.1 From ff90ca42326263cc8f50263efb91a4592c89e84c Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 20 Aug 2011 17:08:54 -0500 Subject: Remove obsolete preinst/postrm files for kdemultimedia in Debian and Ubuntu --- .../kdemultimedia/debian/kmix-trinity.postrm | 31 ----------------- .../kdemultimedia/debian/kmix-trinity.preinst | 39 ---------------------- 2 files changed, 70 deletions(-) delete mode 100644 ubuntu/maverick/kdemultimedia/debian/kmix-trinity.postrm delete mode 100644 ubuntu/maverick/kdemultimedia/debian/kmix-trinity.preinst (limited to 'ubuntu/maverick') 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 -- cgit v1.2.1