Merge lp:~debfx/packagekit/ubuntu-maverick into lp:~packagekit/packagekit/ubuntu-maverick

[Felix Geyer]

  * New upstream release.
  * Drop 20packagekit_error.diff, applied upstream.
  * Make packagekit depend on packagekit-backend-aptcc without alternative
    dependencies as the default config requires it. (LP: #613412)
    - Move the apt and smart backends to Suggests.
  * Add python and python-packagekit to the packagekit-backend-aptcc
    dependencies as get-distro-upgrade.py requires them. (LP: #614168)

=== modified file 'debian/changelog'
--- debian/changelog	2010-08-05 15:36:06 +0000
+++ debian/changelog	2010-08-08 12:49:40 +0000
@@ -1,3 +1,15 @@
+packagekit (0.6.7-0ubuntu1) UNRELEASED; urgency=low
+
+  * New upstream release.
+  * Drop 20packagekit_error.diff, applied upstream.
+  * Make packagekit depend on packagekit-backend-aptcc without alternative
+    dependencies as the default config requires it. (LP: #613412)
+    - Move the apt and smart backends to Suggests.
+  * Add python and python-packagekit to the packagekit-backend-aptcc
+    dependencies as get-distro-upgrade.py requires them. (LP: #614168)
+
+ -- Felix Geyer <[e-mail]>  Sun, 08 Aug 2010 12:46:44 +0200
+
 packagekit (0.6.6+20100703a-0ubuntu3) maverick; urgency=low
 
   * debian/control:

=== modified file 'debian/control'
--- debian/control	2010-08-04 14:20:40 +0000
+++ debian/control	2010-08-08 12:49:40 +0000
@@ -48,7 +48,8 @@
 	 ${python:Depends},
 	 libpackagekit-glib2-14 (= ${binary:Version}),
 	 dbus,
-	 packagekit-backend-aptcc | packagekit-backend-apt | packagekit-backend-smart
+	 packagekit-backend-aptcc
+Suggests: packagekit-backend-apt, packagekit-backend-smart
 Replaces: packagekit-backend-apt (<< 0.6.6+20100703-0ubuntu1)
 Description: provides a software installation daemon
  PackageKit allows to perform simple software management tasks over a DBus 
@@ -214,6 +215,8 @@
 Architecture: any
 Depends: ${shlibs:Depends}, 
          ${misc:Depends},
+	 python,
+	 python-packagekit (= ${source:Version})
 Description: Alternative APT backend for packagekit written in C++
  PackageKit allows to perform simple software management tasks over a DBus 
  interface e.g. refreshing the cache, updating, installing and removing 
@@ -221,4 +224,3 @@
  .
  This package provides an alternative backend which is writtin in C++ to
  target systems with low memory.
-

=== removed file 'debian/patches/20packagekit_error.diff'
--- debian/patches/20packagekit_error.diff	2010-08-05 15:30:59 +0000
+++ debian/patches/20packagekit_error.diff	1970-01-01 00:00:00 +0000
@@ -1,32 +0,0 @@
---- packagekit/backends/apt/20packagekit	2010-08-02 22:09:58.000000000 +0100
-+++ packagekit/backends/apt/20packagekit	2010-08-03 16:10:14.305782651 +0100
-@@ -3,10 +3,10 @@
- // Whenever the dpkg is called we might have different updates
- // i.e. a user removes a package that had an update
- DPkg::Post-Invoke {
--"/usr/bin/test -S /var/run/dbus/system_bus_socket && /usr/bin/dbus-send --print-reply --system --dest=org.freedesktop.PackageKit --type=method_call /org/freedesktop/PackageKit org.freedesktop.PackageKit.StateHasChanged string:'cache-update' > /dev/null";
-+"/usr/bin/test -e /usr/share/dbus-1/system-services/org.freedesktop.PackageKit.service && /usr/bin/test -S /var/run/dbus/system_bus_socket && /usr/bin/dbus-send --print-reply --system --dest=org.freedesktop.PackageKit --type=method_call /org/freedesktop/PackageKit org.freedesktop.PackageKit.StateHasChanged string:'cache-update' > /dev/null; /bin/echo > /dev/null";
- };
--
-+ 
- // When the apt cache is updated (i.e. apt-cache update)
- APT::Update::Post-Invoke-Success {
--"/usr/bin/test -S /var/run/dbus/system_bus_socket && /usr/bin/dbus-send --print-reply --system --dest=org.freedesktop.PackageKit --type=method_call /org/freedesktop/PackageKit org.freedesktop.PackageKit.StateHasChanged string:'cache-update' > /dev/null";
-+"/usr/bin/test -e /usr/share/dbus-1/system-services/org.freedesktop.PackageKit.service && /usr/bin/test -S /var/run/dbus/system_bus_socket && /usr/bin/dbus-send --print-reply --system --dest=org.freedesktop.PackageKit --type=method_call /org/freedesktop/PackageKit org.freedesktop.PackageKit.StateHasChanged string:'cache-update' > /dev/null; /bin/echo > /dev/null";
- };
---- packagekit/backends/aptcc/20packagekit	2010-08-02 22:09:58.000000000 +0100
-+++ packagekit/backends/aptcc/20packagekit	2010-08-03 16:10:14.305782651 +0100
-@@ -3,10 +3,10 @@
- // Whenever the dpkg is called we might have different updates
- // i.e. a user removes a package that had an update
- DPkg::Post-Invoke {
--"/usr/bin/test -S /var/run/dbus/system_bus_socket && /usr/bin/dbus-send --print-reply --system --dest=org.freedesktop.PackageKit --type=method_call /org/freedesktop/PackageKit org.freedesktop.PackageKit.StateHasChanged string:'cache-update' > /dev/null";
-+"/usr/bin/test -e /usr/share/dbus-1/system-services/org.freedesktop.PackageKit.service && /usr/bin/test -S /var/run/dbus/system_bus_socket && /usr/bin/dbus-send --print-reply --system --dest=org.freedesktop.PackageKit --type=method_call /org/freedesktop/PackageKit org.freedesktop.PackageKit.StateHasChanged string:'cache-update' > /dev/null; /bin/echo > /dev/null";
- };
--
-+ 
- // When the apt cache is updated (i.e. apt-cache update)
- APT::Update::Post-Invoke-Success {
--"/usr/bin/test -S /var/run/dbus/system_bus_socket && /usr/bin/dbus-send --print-reply --system --dest=org.freedesktop.PackageKit --type=method_call /org/freedesktop/PackageKit org.freedesktop.PackageKit.StateHasChanged string:'cache-update' > /dev/null";
-+"/usr/bin/test -e /usr/share/dbus-1/system-services/org.freedesktop.PackageKit.service && /usr/bin/test -S /var/run/dbus/system_bus_socket && /usr/bin/dbus-send --print-reply --system --dest=org.freedesktop.PackageKit --type=method_call /org/freedesktop/PackageKit org.freedesktop.PackageKit.StateHasChanged string:'cache-update' > /dev/null; /bin/echo > /dev/null";
- };

=== modified file 'debian/patches/series'
--- debian/patches/series	2010-08-05 15:30:59 +0000
+++ debian/patches/series	2010-08-08 12:49:40 +0000
@@ -1,3 +1,2 @@
 vendor.patch
 defaults.patch
-20packagekit_error.diff