diff -u packagekit-gnome-0.3.13/debian/changelog packagekit-gnome-0.3.13/debian/changelog --- packagekit-gnome-0.3.13/debian/changelog +++ packagekit-gnome-0.3.13/debian/changelog @@ -1,3 +1,13 @@ +packagekit-gnome (0.3.13-0ubuntu2) jaunty; urgency=low + + * 05_fix_set_tooltip_text.patch: Fixes FTBFS on i386 and amd64 + Check GTK version, use gtk_status_icon_set_tooltip_text or + gtk_status_icon_set_tooltip where applicable (LP: #364443) + (Thanks to Michael Bienia) + * packagekit-gnome.install: Include usr/share/icons/hicolor (LP: #349572) + + -- Savvas Radevic Mon, 20 Apr 2009 19:28:06 +0000 + packagekit-gnome (0.3.13-0ubuntu1) jaunty; urgency=low * New upstream release diff -u packagekit-gnome-0.3.13/debian/packagekit-gnome.install packagekit-gnome-0.3.13/debian/packagekit-gnome.install --- packagekit-gnome-0.3.13/debian/packagekit-gnome.install +++ packagekit-gnome-0.3.13/debian/packagekit-gnome.install @@ -29,0 +30 @@ +debian/tmp/usr/share/icons/hicolor/ only in patch2: unchanged: --- packagekit-gnome-0.3.13.orig/debian/patches/05_fix_set_tooltip_text.patch +++ packagekit-gnome-0.3.13/debian/patches/05_fix_set_tooltip_text.patch @@ -0,0 +1,52 @@ +--- src/gpk-watch.c~ 2009-04-20 22:10:54.000000000 +0200 ++++ src/gpk-watch.c 2009-04-21 13:05:13.000000000 +0200 +@@ -109,7 +109,11 @@ + length = pk_task_list_get_size (watch->priv->tlist); + egg_debug ("refresh tooltip %i", length); + if (length == 0) { ++ #if GTK_CHECK_VERSION(2, 15, 3) ++ gtk_status_icon_set_tooltip_text (GTK_STATUS_ICON (watch->priv->sicon), "Doing nothing..."); ++ #else + gtk_status_icon_set_tooltip (GTK_STATUS_ICON (watch->priv->sicon), "Doing nothing..."); ++ #endif + return TRUE; + } + status = g_string_new (""); +@@ -143,7 +147,11 @@ + else + g_string_set_size (status, status->len-1); + ++#if GTK_CHECK_VERSION(2, 15, 3) ++ gtk_status_icon_set_tooltip_text (GTK_STATUS_ICON (watch->priv->sicon), status->str); ++#else + gtk_status_icon_set_tooltip (GTK_STATUS_ICON (watch->priv->sicon), status->str); ++#endif + g_string_free (status, TRUE); + return TRUE; + } +@@ -321,7 +329,11 @@ + restart == PK_RESTART_ENUM_SESSION) { + restart_message = gpk_restart_enum_to_localised_text (restart); + icon_name = gpk_restart_enum_to_icon_name (restart); ++ #if GTK_CHECK_VERSION(2, 15, 3) ++ gtk_status_icon_set_tooltip_text (GTK_STATUS_ICON (watch->priv->sicon_restart), restart_message); ++ #else + gtk_status_icon_set_tooltip (GTK_STATUS_ICON (watch->priv->sicon_restart), restart_message); ++ #endif + gpk_smart_icon_set_icon_name (watch->priv->sicon_restart, icon_name); + } + } +--- src/gpk-check-update.c~ 2009-04-20 22:10:54.000000000 +0200 ++++ src/gpk-check-update.c 2009-04-21 13:05:12.000000000 +0200 +@@ -774,7 +774,11 @@ + /* TRANSLATORS: tooltip: how many updates are waiting to be applied */ + g_string_append_printf (status_tooltip, ngettext ("There is %d update pending", + "There are %d updates pending", length), length); ++#if GTK_CHECK_VERSION(2, 15, 3) ++ gtk_status_icon_set_tooltip_text (GTK_STATUS_ICON (cupdate->priv->sicon), status_tooltip->str); ++#else + gtk_status_icon_set_tooltip (GTK_STATUS_ICON (cupdate->priv->sicon), status_tooltip->str); ++#endif + + /* is policy none? */ + if (update == GPK_UPDATE_ENUM_NONE) {