diff -Nru brasero-3.0.0/debian/brasero-cdrkit.debhelper.log brasero-3.0.0/debian/brasero-cdrkit.debhelper.log --- brasero-3.0.0/debian/brasero-cdrkit.debhelper.log 2011-05-26 18:43:04.000000000 +0000 +++ brasero-3.0.0/debian/brasero-cdrkit.debhelper.log 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -dh_autoreconf_clean diff -Nru brasero-3.0.0/debian/brasero-common.debhelper.log brasero-3.0.0/debian/brasero-common.debhelper.log --- brasero-3.0.0/debian/brasero-common.debhelper.log 2011-05-26 18:43:04.000000000 +0000 +++ brasero-3.0.0/debian/brasero-common.debhelper.log 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -dh_autoreconf_clean diff -Nru brasero-3.0.0/debian/brasero.debhelper.log brasero-3.0.0/debian/brasero.debhelper.log --- brasero-3.0.0/debian/brasero.debhelper.log 2011-05-26 18:43:04.000000000 +0000 +++ brasero-3.0.0/debian/brasero.debhelper.log 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -dh_autoreconf_clean diff -Nru brasero-3.0.0/debian/changelog brasero-3.0.0/debian/changelog --- brasero-3.0.0/debian/changelog 2011-05-26 18:42:57.000000000 +0000 +++ brasero-3.0.0/debian/changelog 2011-08-19 08:29:26.000000000 +0000 @@ -1,8 +1,23 @@ -brasero (3.0.0-1ubuntu2~natty1) natty; urgency=low +brasero (3.0.0-1ubuntu4~natty1) natty; urgency=low * Copied from oneiric - -- Rico Tzschichholz Thu, 26 May 2011 20:42:57 +0200 + -- Rico Tzschichholz Fri, 19 Aug 2011 10:29:26 +0200 + +brasero (3.0.0-1ubuntu4) oneiric; urgency=low + + * debian/control.in: + - Have brasero-cdrkit Suggest, not Recommend, dvdauthor as it isn't + in main. + + -- Michael Terry Fri, 12 Aug 2011 09:54:49 -0400 + +brasero (3.0.0-1ubuntu3) oneiric; urgency=low + + * debian/patches/013_unity_launcher_progress: Display burn progress + in Brasero's Unity launcher icon. + + -- Bilal Akhtar Sat, 23 Jul 2011 10:52:47 +0300 brasero (3.0.0-1ubuntu2) oneiric; urgency=low diff -Nru brasero-3.0.0/debian/control brasero-3.0.0/debian/control --- brasero-3.0.0/debian/control 2011-05-26 18:43:04.000000000 +0000 +++ brasero-3.0.0/debian/control 2011-08-19 08:29:30.000000000 +0000 @@ -35,7 +35,8 @@ libunique-dev (>= 1.0.0), intltool (>= 0.35.0), libappindicator3-dev (>= 0.0.7), - liblaunchpad-integration-3.0-dev + liblaunchpad-integration-3.0-dev, + libunity-dev Uploaders: Andreas Henriksson , Debian GNOME Maintainers , Josselin Mouette , Michael Biebl Standards-Version: 3.9.0 Homepage: http://www.gnome.org/projects/brasero/ @@ -91,8 +92,7 @@ libbrasero-media3-1 (= ${binary:Version}), genisoimage, wodim -Recommends: dvdauthor -Suggests: readom +Suggests: dvdauthor, readom Description: cdrkit extensions for the Brasero burning application Brasero is a simple application to burn, copy and erase CD and DVD media. diff -Nru brasero-3.0.0/debian/control.in brasero-3.0.0/debian/control.in --- brasero-3.0.0/debian/control.in 2011-05-24 10:34:05.000000000 +0000 +++ brasero-3.0.0/debian/control.in 2011-08-12 13:55:23.000000000 +0000 @@ -30,7 +30,8 @@ libunique-dev (>= 1.0.0), intltool (>= 0.35.0), libappindicator3-dev (>= 0.0.7), - liblaunchpad-integration-3.0-dev + liblaunchpad-integration-3.0-dev, + libunity-dev Uploaders: @GNOME_TEAM@ Standards-Version: 3.9.0 Homepage: http://www.gnome.org/projects/brasero/ @@ -86,8 +87,7 @@ libbrasero-media3-1 (= ${binary:Version}), genisoimage, wodim -Recommends: dvdauthor -Suggests: readom +Suggests: dvdauthor, readom Description: cdrkit extensions for the Brasero burning application Brasero is a simple application to burn, copy and erase CD and DVD media. diff -Nru brasero-3.0.0/debian/libbrasero-media3-1.debhelper.log brasero-3.0.0/debian/libbrasero-media3-1.debhelper.log --- brasero-3.0.0/debian/libbrasero-media3-1.debhelper.log 2011-05-26 18:43:04.000000000 +0000 +++ brasero-3.0.0/debian/libbrasero-media3-1.debhelper.log 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -dh_autoreconf_clean diff -Nru brasero-3.0.0/debian/libbrasero-media3-dev.debhelper.log brasero-3.0.0/debian/libbrasero-media3-dev.debhelper.log --- brasero-3.0.0/debian/libbrasero-media3-dev.debhelper.log 2011-05-26 18:43:04.000000000 +0000 +++ brasero-3.0.0/debian/libbrasero-media3-dev.debhelper.log 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -dh_autoreconf_clean diff -Nru brasero-3.0.0/debian/patches/013_unity_launcher_progress.patch brasero-3.0.0/debian/patches/013_unity_launcher_progress.patch --- brasero-3.0.0/debian/patches/013_unity_launcher_progress.patch 1970-01-01 00:00:00.000000000 +0000 +++ brasero-3.0.0/debian/patches/013_unity_launcher_progress.patch 2011-08-12 13:55:23.000000000 +0000 @@ -0,0 +1,113 @@ +Description: Show burn progress in Unity launcher + This patch makes Brasero show burn progress in the + Unity launcher. The support is disabled by default, + to enable it, brasero should be configured with --enable-unity +Author: Bilal Akhtar +Forwarded: https://bugzilla.gnome.org/show_bug.cgi?id=655161 +--- a/configure.in ++++ b/configure.in +@@ -390,6 +390,21 @@ + fi + AM_CONDITIONAL(HAVE_APP_INDICATOR, test x"$enable_appindicator" = xyes) + ++dnl *************** check for unity *********************** ++ ++AC_ARG_ENABLE(unity, ++ AS_HELP_STRING([--enable-unity],[Build support for integration in Unity launcher [[default=no]]]), ++ [enable_unity=$enableval], ++ [enable_unity="no"]) ++ ++if test x"$enable_unity" = "xyes"; then ++ PKG_CHECK_MODULES(UNITY, unity) ++ AC_SUBST(UNITY_CFLAGS) ++ AC_SUBST(UNITY_LIBS) ++ AC_DEFINE(HAVE_UNITY, 1, [Unity launcher support]) ++fi ++AM_CONDITIONAL(HAVE_UNITY, test x"$enable_unity" = xyes) ++ + BEAGLE_REQUIRED=0.3.0 + TRACKER_REQUIRED=0.8.0 + +--- a/libbrasero-burn/Makefile.am ++++ b/libbrasero-burn/Makefile.am +@@ -203,6 +203,11 @@ + INCLUDES += -DHAVE_APP_INDICATOR @APP_INDICATOR_CFLAGS@ + endif + ++if HAVE_UNITY ++libbrasero_burn3_la_LIBADD += @UNITY_LIBS@ ++INCLUDES += -DHAVE_UNITY @UNITY_CFLAGS@ ++endif ++ + EXTRA_DIST = \ + libbrasero-marshal.list + # libbrasero-burn.symbols +--- a/libbrasero-burn/brasero-burn-dialog.c ++++ b/libbrasero-burn/brasero-burn-dialog.c +@@ -49,6 +49,10 @@ + #include + #include + ++#ifdef HAVE_UNITY ++#include ++#endif ++ + #include "brasero-burn-dialog.h" + + #ifdef HAVE_APP_INDICATOR +@@ -123,6 +127,10 @@ + + guint is_writing:1; + guint is_creating_image:1; ++ ++#ifdef HAVE_UNITY ++ UnityLauncherEntry *launcher_entry; ++#endif + }; + + #define BRASERO_BURN_DIALOG_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), BRASERO_TYPE_BURN_DIALOG, BraseroBurnDialogPrivate)) +@@ -1303,6 +1311,11 @@ + media); + if ((priv->is_writing || priv->is_creating_image) && isosize > 0) + priv->total_size = isosize; ++ ++#ifdef HAVE_UNITY ++ unity_launcher_entry_set_progress(priv->launcher_entry, task_progress); ++ unity_launcher_entry_set_progress_visible(priv->launcher_entry, TRUE); ++#endif + } + + static void +@@ -1490,6 +1503,10 @@ + 0.0, + -1); + #endif ++ ++#ifdef HAVE_UNITY ++ unity_launcher_entry_set_progress_visible(priv->launcher_entry, TRUE); ++#endif + } + + static void +@@ -1528,6 +1545,10 @@ + brasero_app_indicator_hide (priv->indicator); + #endif + ++#ifdef HAVE_UNITY ++ unity_launcher_entry_set_progress_visible(priv->launcher_entry, FALSE); ++#endif ++ + /* Restore title */ + if (priv->initial_title) + gtk_window_set_title (GTK_WINDOW (dialog), priv->initial_title); +@@ -2627,6 +2648,10 @@ + obj); + #endif + ++#ifdef HAVE_UNITY ++ priv->launcher_entry = unity_launcher_entry_get_for_desktop_id("brasero.desktop"); ++#endif ++ + alignment = gtk_alignment_new (0.5, 0.5, 1.0, 1.0); + gtk_widget_show (alignment); + gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 6, 8, 6, 6); diff -Nru brasero-3.0.0/debian/patches/series brasero-3.0.0/debian/patches/series --- brasero-3.0.0/debian/patches/series 2011-05-24 10:34:05.000000000 +0000 +++ brasero-3.0.0/debian/patches/series 2011-08-12 13:55:23.000000000 +0000 @@ -1,2 +1,3 @@ 010_lpi.patch 012_appindicator.patch +013_unity_launcher_progress.patch diff -Nru brasero-3.0.0/debian/rules brasero-3.0.0/debian/rules --- brasero-3.0.0/debian/rules 2011-05-24 10:34:05.000000000 +0000 +++ brasero-3.0.0/debian/rules 2011-08-12 13:55:23.000000000 +0000 @@ -22,7 +22,8 @@ --disable-cdrtools \ --disable-scrollkeeper \ --disable-caches \ - --disable-introspection + --disable-introspection \ + --enable-unity=yes DEB_MAKE_EXTRA_ARGS += BRASERO_PLUGIN_DIRECTORY=/usr/lib/brasero$(SOVERSION)/plugins