diff -u packagekit-gnome-2.27.2/debian/changelog packagekit-gnome-2.27.2/debian/changelog --- packagekit-gnome-2.27.2/debian/changelog +++ packagekit-gnome-2.27.2/debian/changelog @@ -1,3 +1,11 @@ +packagekit-gnome (2.27.2-0ubuntu3) karmic; urgency=low + + * Add drop_devkit.patch: Drop check for devkit-gobject from configure.ac and + configure, it's a stale dependency. + * debian/control: Drop libdevkit-gobject-dev build dependency. (LP: #406426) + + -- Martin Pitt Wed, 29 Jul 2009 17:32:07 +0200 + packagekit-gnome (2.27.2-0ubuntu2) karmic; urgency=low * Fixed debian/control: diff -u packagekit-gnome-2.27.2/debian/control packagekit-gnome-2.27.2/debian/control --- packagekit-gnome-2.27.2/debian/control +++ packagekit-gnome-2.27.2/debian/control @@ -25,7 +25,6 @@ python-dev, python-central (>= 0.5), libdevkit-power-gobject-dev (>= 007), - libdevkit-gobject-dev (>= 001), libapt-pkg-dev Standards-Version: 3.8.1 Homepage: http://www.packagekit.org diff -u packagekit-gnome-2.27.2/debian/patches/series packagekit-gnome-2.27.2/debian/patches/series --- packagekit-gnome-2.27.2/debian/patches/series +++ packagekit-gnome-2.27.2/debian/patches/series @@ -1,2 +1,3 @@ +drop_devkit.patch fix_path_to_gstreamer_helper.patch defaults.patch only in patch2: unchanged: --- packagekit-gnome-2.27.2.orig/debian/patches/drop_devkit.patch +++ packagekit-gnome-2.27.2/debian/patches/drop_devkit.patch @@ -0,0 +1,77 @@ +Index: packagekit-gnome-2.27.2/configure +=================================================================== +--- packagekit-gnome-2.27.2.orig/configure 2009-07-29 17:33:31.587696199 +0200 ++++ packagekit-gnome-2.27.2/configure 2009-07-29 17:34:00.431694095 +0200 +@@ -15671,16 +15671,13 @@ + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" +- devkit-gobject >= \$DEVKIT_REQUIRED + devkit-power-gobject >= \$DEVKIT_POWER_REQUIRED\"") >&5 + ($PKG_CONFIG --exists --print-errors " +- devkit-gobject >= $DEVKIT_REQUIRED + devkit-power-gobject >= $DEVKIT_POWER_REQUIRED") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_DEVKIT_CFLAGS=`$PKG_CONFIG --cflags " +- devkit-gobject >= $DEVKIT_REQUIRED + devkit-power-gobject >= $DEVKIT_POWER_REQUIRED" 2>/dev/null` + else + pkg_failed=yes +@@ -15693,16 +15690,13 @@ + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" +- devkit-gobject >= \$DEVKIT_REQUIRED + devkit-power-gobject >= \$DEVKIT_POWER_REQUIRED\"") >&5 + ($PKG_CONFIG --exists --print-errors " +- devkit-gobject >= $DEVKIT_REQUIRED + devkit-power-gobject >= $DEVKIT_POWER_REQUIRED") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_DEVKIT_LIBS=`$PKG_CONFIG --libs " +- devkit-gobject >= $DEVKIT_REQUIRED + devkit-power-gobject >= $DEVKIT_POWER_REQUIRED" 2>/dev/null` + else + pkg_failed=yes +@@ -15722,18 +15716,15 @@ + fi + if test $_pkg_short_errors_supported = yes; then + DEVKIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " +- devkit-gobject >= $DEVKIT_REQUIRED + devkit-power-gobject >= $DEVKIT_POWER_REQUIRED" 2>&1` + else + DEVKIT_PKG_ERRORS=`$PKG_CONFIG --print-errors " +- devkit-gobject >= $DEVKIT_REQUIRED + devkit-power-gobject >= $DEVKIT_POWER_REQUIRED" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$DEVKIT_PKG_ERRORS" >&5 + + { { $as_echo "$as_me:$LINENO: error: Package requirements ( +- devkit-gobject >= $DEVKIT_REQUIRED + devkit-power-gobject >= $DEVKIT_POWER_REQUIRED) were not met: + + $DEVKIT_PKG_ERRORS +@@ -15746,7 +15737,6 @@ + See the pkg-config man page for more details. + " >&5 + $as_echo "$as_me: error: Package requirements ( +- devkit-gobject >= $DEVKIT_REQUIRED + devkit-power-gobject >= $DEVKIT_POWER_REQUIRED) were not met: + + $DEVKIT_PKG_ERRORS +Index: packagekit-gnome-2.27.2/configure.ac +=================================================================== +--- packagekit-gnome-2.27.2.orig/configure.ac 2009-07-29 17:33:34.019714924 +0200 ++++ packagekit-gnome-2.27.2/configure.ac 2009-07-29 17:33:39.955738632 +0200 +@@ -158,7 +158,6 @@ + AC_SUBST(UNIQUE_LIBS) + + PKG_CHECK_MODULES(DEVKIT, [ +- devkit-gobject >= $DEVKIT_REQUIRED + devkit-power-gobject >= $DEVKIT_POWER_REQUIRED]) + AC_SUBST(DEVKIT_CFLAGS) + AC_SUBST(DEVKIT_LIBS)