Merge lp:~apachelogger/packagekit/kubuntu-upgrade-support into lp:~packagekit/packagekit/ubuntu-lucid

[Harald Sitter]

[Anthony Mercatante (tonio)]

Tested the patch, seems fine with me.

review: Approve

=== added file 'debian/README.source'
--- debian/README.source	1970-01-01 00:00:00 +0000
+++ debian/README.source	2010-02-21 10:17:12 +0000
@@ -0,0 +1,6 @@
+This package uses quilt for upstream source code patch management. Please read
+/usr/share/doc/quilt/README.source for more information how to apply, unapply,
+add, modify or remove patches.
+
+Please note that /usr/share/doc/quilt/README.source is only available in quilt
+version 0.46-4.1 or later.

=== modified file 'debian/changelog'
--- debian/changelog	2010-01-27 20:26:51 +0000
+++ debian/changelog	2010-02-21 10:17:12 +0000
@@ -1,3 +1,29 @@
+packagekit (0.5.6-0ubuntu3) lucid; urgency=low
+
+  * Update VCS entries in debian/control for lucid
+  * Add add_kubuntu_upgrade_support.patch to enable distro upgrades on
+    Kubuntu (also sent upstream via dantii)
+
+ -- Harald Sitter <[e-mail]>  Sun, 21 Feb 2010 11:11:07 +0100
+
+packagekit (0.5.6-0ubuntu2) lucid; urgency=low
+
+  * Re-add fix_progress_crash.patch. Never was upstreamed and apparently
+    was dropped in 0.5.x (LP: #438279)
+
+ -- Jonathan Thomas <[e-mail]>  Mon, 15 Feb 2010 21:34:00 -0500
+
+packagekit (0.5.6-0ubuntu1) lucid; urgency=low
+
+  * Add build-depend on policykit-1 to prevent FTBFS
+  * Add build-depend on libxt-dev to prevent FTBFS
+  * Add build-depend on pm-utils for pm-utils support, prevents FTBFS
+  * Fix obsolete-relation-form-in-source warnings throughout the package
+  * Bump Standards-Version to 3.8.3:
+    - Add README.source for quilt patch system info
+
+ -- Jonathan Thomas <[e-mail]>  Wed, 27 Jan 2010 20:48:54 -0500
+
 packagekit (0.5.6) lucid; urgency=low
 
   * New upstream snapshot of the 0.5 series with the following highlights:

=== modified file 'debian/control'
--- debian/control	2009-11-06 06:42:03 +0000
+++ debian/control	2010-02-21 10:17:12 +0000
@@ -13,6 +13,7 @@
 	       network-manager-dev,
 	       libpolkit-gobject-1-dev,
 	       libpolkit-backend-1-dev,
+	       policykit-1,
 	       libapt-pkg-dev,
 	       autotools-dev,
 	       libtool,
@@ -31,12 +32,14 @@
 	       libgstreamer-plugins-base0.10-dev,
 	       libarchive-dev,
 	       libcppunit-dev,
-	       libqt4-dev
-Standards-Version: 3.8.1
+	       libqt4-dev,
+	       libxt-dev,
+	       pm-utils
+Standards-Version: 3.8.3
 XS-Python-Version: current
 Homepage: http://www.packagekit.org
-Vcs-Bzr: https://code.launchpad.net/~packagekit/packagekit/packagekit-karmic
-Vcs-Browser: http://bazaar.launchpad.net/~packagekit/packagekit/packagekit-karmic/files
+Vcs-Bzr: https://code.launchpad.net/~packagekit/packagekit/ubuntu-lucid
+Vcs-Browser: http://bazaar.launchpad.net/~packagekit/packagekit/ubuntu-lucid/files
 
 Package: packagekit
 Architecture: any
@@ -69,7 +72,7 @@
 	 python-gobject,
 	 python-dbus
 XB-Python-Version: ${python:Versions}
-Conflicts: packagekit (< 0.3.11)
+Conflicts: packagekit (<< 0.3.11)
 Description: PackageKit Python bindings
  PackageKit allows to perform simple software management tasks over a DBus 
  interface e.g refreshing the cache, updating, installing and removing 
@@ -80,7 +83,7 @@
 Package: gstreamer0.10-packagekit
 Architecture: any
 Section: libs
-Conflicts: gnome-app-install (< 0.5.12)
+Conflicts: gnome-app-install (<< 0.5.12)
 Depends: ${shlibs:Depends}, 
          ${misc:Depends},
 	 packagekit (= ${binary:Version})
@@ -210,7 +213,7 @@
 	 update-manager-core, 
 	 python-software-properties
 XB-Python-Version: ${python:Versions}
-Conflicts: packagekit (<0.3)
+Conflicts: packagekit (<< 0.3)
 Recommends: apt-xapian-index
 Description: APT backend for packagekit
  PackageKit allows to perform simple software management tasks over a DBus 

=== added file 'debian/patches/add_kubuntu_upgrade_support.patch'
--- debian/patches/add_kubuntu_upgrade_support.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/add_kubuntu_upgrade_support.patch	2010-02-21 10:17:12 +0000
@@ -0,0 +1,51 @@
+From 324a8e4cc857e8df5376613f7fa54bbb2ac86ad2 Mon Sep 17 00:00:00 2001
+From: Harald Sitter <[e-mail]>
+Date: Wed, 9 Dec 2009 09:59:23 +0100
+Subject: [PATCH] Add Kubuntu and KDialog support to pkg-upgrade-distro
+
+* Add Kubuntu support for upgrade (using env var exported by KPackageKit)
+* Add KDialog support as alternative to zenity and xmessage for the "system not recognized" message (also using env var exported by KPackageKit)
+---
+ data/pk-upgrade-distro.sh |   17 ++++++++++++-----
+ 1 files changed, 12 insertions(+), 5 deletions(-)
+
+diff --git a/data/pk-upgrade-distro.sh b/data/pk-upgrade-distro.sh
+index b173c43..7236e97 100755
+--- a/data/pk-upgrade-distro.sh
++++ b/data/pk-upgrade-distro.sh
+@@ -25,7 +25,13 @@ if [ -e /etc/fedora-release ]; then
+ 	fi
+ elif [ "$DISTRO" = "Ubuntu" ]; then
+ 	if [ -e /usr/bin/do-release-upgrade ]; then
+-		gksu "/usr/bin/do-release-upgrade -m desktop -f gtk -p"
++		if [ "$DESKTOP" = "kde" ]; then
++			PATH=`kde4-config --path exe` kdesu -- "/usr/bin/do-release-upgrade -d -m desktop -f kde -p"
++		else
++			gksu "/usr/bin/do-release-upgrade -m desktop -f gtk -p"
++		fi
++	elif [ "$DESKTOP" = "kde" ]; then
++		xdg-open http://www.kubuntu.org/getkubuntu
+ 	else
+ 		xdg-open http://www.ubuntu.com/getubuntu
+ 	fi
+@@ -34,12 +40,13 @@ elif [ -e /etc/SuSE-release ] && [ -x /usr/sbin/wagon ]; then
+ else
+ 	TITLE="System is not recognised"
+ 	TEXT="Your distribution was not recognised by the upgrade script.\nPlease file a but in your distribution bug tracker under the component PackageKit."
++	if [ "$DESKTOP" = "kde" ]; then
++		PATH=`kde4-config --path exe` kdialog --title "$TITLE" --sorry "$TEXT"
+ 	# do not dep on zenity in build scripts
+-	which zenity 2> /dev/null > /dev/null
+-	if [ "$?" -eq 0 ]; then
+-	    zenity --warning --title $TITLE --text $TEXT
++	elif [ "`which zenity 2> /dev/null > /dev/null; echo $?`" -eq 0 ]; then
++		zenity --warning --title $TITLE --text $TEXT
+ 	else
+-	    xmessage $TEXT
++		xmessage $TEXT
+ 	fi
+ fi
+ 
+-- 
+1.6.3.3
+

=== added file 'debian/patches/fix_progress_crash.patch'
--- debian/patches/fix_progress_crash.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix_progress_crash.patch	2010-02-21 10:17:12 +0000
@@ -0,0 +1,13 @@
+Index: packagekit-0.5.6/backends/apt/aptBackend.py
+===================================================================
+--- packagekit-0.5.6.orig/backends/apt/aptBackend.py	2010-02-15 21:32:59.205764881 -0500
++++ packagekit-0.5.6/backends/apt/aptBackend.py	2010-02-15 21:33:37.217762425 -0500
+@@ -408,6 +408,8 @@
+         if self.pprev < progress:
+             self._backend.percentage(int(progress))
+             self.pprev = progress
++        if not self._backend._cache.has_key(pkg_name):
++            return
+         # Emit a Package signal for the currently processed package
+         if pkg_name != self.last_pkg and self._backend._cache.has_key(pkg_name):
+             pkg = self._backend._cache[pkg_name]

=== modified file 'debian/patches/series'
--- debian/patches/series	2009-11-06 06:50:56 +0000
+++ debian/patches/series	2010-02-21 10:17:12 +0000
@@ -1,2 +1,4 @@
 vendor.patch
 defaults.patch
+fix_progress_crash.patch
+add_kubuntu_upgrade_support.patch