diff -Nru packagekit-0.8.12/debian/changelog packagekit-0.8.12/debian/changelog --- packagekit-0.8.12/debian/changelog 2014-02-25 01:12:52.000000000 +0800 +++ packagekit-0.8.12/debian/changelog 2014-04-01 20:49:01.000000000 +0800 @@ -1,3 +1,9 @@ +packagekit (0.8.12-1ubuntu4) trusty; urgency=low + + * increase timeout for aptcc. LP: #1001376 + + -- Rolf Leggewie Tue, 01 Apr 2014 20:47:03 +0800 + packagekit (0.8.12-1ubuntu3) trusty; urgency=medium * Change p-b-aptcc backend helper shebang from python2 to python3. (LP: diff -Nru packagekit-0.8.12/debian/patches/LP-1001376.patch packagekit-0.8.12/debian/patches/LP-1001376.patch --- packagekit-0.8.12/debian/patches/LP-1001376.patch 1970-01-01 08:00:00.000000000 +0800 +++ packagekit-0.8.12/debian/patches/LP-1001376.patch 2014-04-01 20:44:40.000000000 +0800 @@ -0,0 +1,21 @@ +Subject: increase aptcc timeout from 1 to 4. LP: #1001376 + +backported from upstream commit b7058ab0be16d0dfc58db1aaa1e69041c8606428 + +diff --git a/backends/aptcc/20packagekit b/backends/aptcc/20packagekit +index 98fe23f..705cc2f 100644 (file) +--- a/backends/aptcc/20packagekit ++++ b/backends/aptcc/20packagekit +@@ -4,10 +4,10 @@ + // Whenever dpkg is called we might have different updates + // i.e. if an user removes a package that had an update + DPkg::Post-Invoke { +-"/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/gdbus call --system --dest org.freedesktop.PackageKit --object-path /org/freedesktop/PackageKit --timeout 1 --method org.freedesktop.PackageKit.StateHasChanged cache-update > /dev/null; /bin/echo > /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/gdbus call --system --dest org.freedesktop.PackageKit --object-path /org/freedesktop/PackageKit --timeout 4 --method org.freedesktop.PackageKit.StateHasChanged cache-update > /dev/null; /bin/echo > /dev/null"; + }; + + // When Apt's cache is updated (i.e. apt-cache update) + APT::Update::Post-Invoke-Success { +-"/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/gdbus call --system --dest org.freedesktop.PackageKit --object-path /org/freedesktop/PackageKit --timeout 1 --method org.freedesktop.PackageKit.StateHasChanged cache-update > /dev/null; /bin/echo > /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/gdbus call --system --dest org.freedesktop.PackageKit --object-path /org/freedesktop/PackageKit --timeout 4 --method org.freedesktop.PackageKit.StateHasChanged cache-update > /dev/null; /bin/echo > /dev/null"; + }; diff -Nru packagekit-0.8.12/debian/patches/series packagekit-0.8.12/debian/patches/series --- packagekit-0.8.12/debian/patches/series 2014-02-23 06:24:56.000000000 +0800 +++ packagekit-0.8.12/debian/patches/series 2014-04-01 20:46:40.000000000 +0800 @@ -1,3 +1,4 @@ vendor-debian.diff defaults.diff policy.diff +LP-1001376.patch diff -Nru packagekit-0.8.12/debian/patches/ubuntu.series packagekit-0.8.12/debian/patches/ubuntu.series --- packagekit-0.8.12/debian/patches/ubuntu.series 2014-02-25 01:13:34.000000000 +0800 +++ packagekit-0.8.12/debian/patches/ubuntu.series 2014-04-01 20:46:45.000000000 +0800 @@ -2,3 +2,4 @@ defaults.diff policy.diff python3.patch +LP-1001376.patch