diff -Nru brasero-2.32.0/debian/changelog brasero-2.32.0/debian/changelog --- brasero-2.32.0/debian/changelog 2011-01-06 18:27:29.000000000 -0500 +++ brasero-2.32.0/debian/changelog 2011-02-14 19:53:12.000000000 -0500 @@ -1,3 +1,15 @@ +brasero (2.32.0-0ubuntu2.2) maverick-proposed; urgency=low + + * debian/patches/40_fix_cdrdao_detection.patch: Disable brasero's + version check of the cdrdao binary, as it incorrectly parses the + warnings that are printed before the banner. (LP: #529696) + * debian/patches/41_fix_packagekit.patch: Don't crash when trying to use + the packagekit backend to install missing packages, for example, when + trying to copy an audio cd without having cdrdao installed. + (LP: #718969) + + -- Marc Deslauriers Mon, 14 Feb 2011 19:46:33 -0500 + brasero (2.32.0-0ubuntu2.1) maverick-proposed; urgency=low * Don't crash when running in a non-GNOME environment. (LP: #646902) diff -Nru brasero-2.32.0/debian/patches/40_fix_cdrdao_detection.patch brasero-2.32.0/debian/patches/40_fix_cdrdao_detection.patch --- brasero-2.32.0/debian/patches/40_fix_cdrdao_detection.patch 1969-12-31 19:00:00.000000000 -0500 +++ brasero-2.32.0/debian/patches/40_fix_cdrdao_detection.patch 2011-02-14 19:52:33.000000000 -0500 @@ -0,0 +1,18 @@ +Description: Disable brasero's version check of the cdrdao binary, as it + incorrectly parses the warnings that are printed before the banner. +Author: Marc Deslauriers +Forwarded: No, Ubuntu-specific + +Index: brasero-2.32.0/plugins/cdrdao/burn-cdrdao.c +=================================================================== +--- brasero-2.32.0.orig/plugins/cdrdao/burn-cdrdao.c 2011-02-13 11:28:04.000000000 -0500 ++++ brasero-2.32.0/plugins/cdrdao/burn-cdrdao.c 2011-02-13 11:31:18.000000000 -0500 +@@ -773,7 +773,7 @@ + gint version [3] = { 1, 2, 0}; + brasero_plugin_test_app (plugin, + "cdrdao", +- "version", ++ 0, + "Cdrdao version %d.%d.%d - (C) Andreas Mueller ", + version); + diff -Nru brasero-2.32.0/debian/patches/41_fix_packagekit.patch brasero-2.32.0/debian/patches/41_fix_packagekit.patch --- brasero-2.32.0/debian/patches/41_fix_packagekit.patch 1969-12-31 19:00:00.000000000 -0500 +++ brasero-2.32.0/debian/patches/41_fix_packagekit.patch 2011-02-14 19:47:08.000000000 -0500 @@ -0,0 +1,34 @@ +Description: fix packagekit backend +Author: Marc Deslauriers +Forwarded: Yes +Bug: https://bugzilla.gnome.org/show_bug.cgi?id=642324 +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/brasero/+bug/718969 + +Index: brasero-2.32.0/libbrasero-utils/brasero-pk.c +=================================================================== +--- brasero-2.32.0.orig/libbrasero-utils/brasero-pk.c 2011-02-13 12:38:28.000000000 -0500 ++++ brasero-2.32.0/libbrasero-utils/brasero-pk.c 2011-02-13 17:06:07.000000000 -0500 +@@ -85,7 +85,11 @@ + + if (priv->values != NULL) + g_variant_unref (priv->values); ++ priv->res = TRUE; + g_object_unref (priv->proxy); ++ ++ if (priv->loop) ++ g_main_loop_quit (priv->loop); + } + + static void +@@ -258,9 +262,9 @@ + + g_dbus_proxy_call (priv->proxy, + "InstallProvideFiles", +- g_variant_new ("(uass)", ++ g_variant_new ("(u^ass)", + xid, +- package, ++ missing_files->pdata, + "hide-confirm-search,hide-finished,hide-warning"), + G_DBUS_CALL_FLAGS_NONE, + -1, diff -Nru brasero-2.32.0/debian/patches/series brasero-2.32.0/debian/patches/series --- brasero-2.32.0/debian/patches/series 2011-01-06 18:10:03.000000000 -0500 +++ brasero-2.32.0/debian/patches/series 2011-02-13 12:38:18.000000000 -0500 @@ -3,3 +3,5 @@ 11_nautilus_menu_no_display.patch 31_link_libice.patch 32_non_gnome.patch +40_fix_cdrdao_detection.patch +41_fix_packagekit.patch