Merge lp:~kelemeng/brasero/bug883495 into lp:ubuntu/precise/brasero

[Gabor Kelemen]

[Daniel Holbach (dholbach)]

Thanks for your work on this. I took the liberty to add a changelog entry for you an uploaded it.

review: Approve

=== modified file 'debian/patches/012_appindicator.patch'
--- debian/patches/012_appindicator.patch	2011-11-18 10:02:45 +0000
+++ debian/patches/012_appindicator.patch	2011-12-15 01:27:42 +0000
@@ -5,8 +5,8 @@
 
 Index: brasero-3.2.0/configure.in
 ===================================================================
---- brasero-3.2.0.orig/configure.in	2011-11-17 13:20:40.825083274 +1100
-+++ brasero-3.2.0/configure.in	2011-11-17 13:20:43.341083339 +1100
+--- brasero-3.2.0.orig/configure.in	2011-12-15 02:01:30.233194745 +0100
++++ brasero-3.2.0/configure.in	2011-12-15 02:01:30.337195260 +0100
 @@ -366,6 +366,23 @@
  fi
  AM_CONDITIONAL(BUILD_GROWISOFS, test x"$build_growisofs" = "xyes")
@@ -41,8 +41,8 @@
  echo
 Index: brasero-3.2.0/libbrasero-burn/Makefile.am
 ===================================================================
---- brasero-3.2.0.orig/libbrasero-burn/Makefile.am	2011-09-27 19:19:01.000000000 +1000
-+++ brasero-3.2.0/libbrasero-burn/Makefile.am	2011-11-17 13:20:43.353083339 +1100
+--- brasero-3.2.0.orig/libbrasero-burn/Makefile.am	2011-12-15 02:01:28.753187408 +0100
++++ brasero-3.2.0/libbrasero-burn/Makefile.am	2011-12-15 02:01:30.337195260 +0100
 @@ -197,6 +197,12 @@
  libbrasero_burn3_la_SOURCES += brasero-file-monitor.c brasero-file-monitor.h
  endif
@@ -59,7 +59,7 @@
 Index: brasero-3.2.0/libbrasero-burn/brasero-app-indicator.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ brasero-3.2.0/libbrasero-burn/brasero-app-indicator.c	2011-11-17 13:24:23.521088977 +1100
++++ brasero-3.2.0/libbrasero-burn/brasero-app-indicator.c	2011-12-15 02:01:30.341195280 +0100
 @@ -0,0 +1,367 @@
 +/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 +/*
@@ -431,7 +431,7 @@
 Index: brasero-3.2.0/libbrasero-burn/brasero-app-indicator.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ brasero-3.2.0/libbrasero-burn/brasero-app-indicator.h	2011-11-17 13:20:40.845083274 +1100
++++ brasero-3.2.0/libbrasero-burn/brasero-app-indicator.h	2011-12-15 02:01:30.341195280 +0100
 @@ -0,0 +1,88 @@
 +/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 +/*
@@ -523,8 +523,8 @@
 +#endif /* APP_INDICATOR_H */
 Index: brasero-3.2.0/libbrasero-burn/brasero-burn-dialog.c
 ===================================================================
---- brasero-3.2.0.orig/libbrasero-burn/brasero-burn-dialog.c	2011-09-27 19:19:01.000000000 +1000
-+++ brasero-3.2.0/libbrasero-burn/brasero-burn-dialog.c	2011-11-17 13:20:43.357083339 +1100
+--- brasero-3.2.0.orig/libbrasero-burn/brasero-burn-dialog.c	2011-12-15 02:01:28.505186175 +0100
++++ brasero-3.2.0/libbrasero-burn/brasero-burn-dialog.c	2011-12-15 02:01:30.341195280 +0100
 @@ -2,6 +2,7 @@
  /*
   * Libbrasero-burn
@@ -722,3 +722,15 @@
  	if (priv->session) {
  		g_object_unref (priv->session);
  		priv->session = NULL;
+Index: brasero-3.2.0/po/POTFILES.in
+===================================================================
+--- brasero-3.2.0.orig/po/POTFILES.in	2011-09-27 11:19:01.000000000 +0200
++++ brasero-3.2.0/po/POTFILES.in	2011-12-15 02:01:43.737262717 +0100
+@@ -3,6 +3,7 @@
+ data/brasero.desktop.in.in
+ data/mime/brasero.xml.in
+ data/org.gnome.brasero.gschema.xml.in
++libbrasero-burn/brasero-app-indicator.c
+ libbrasero-burn/brasero-blank-dialog.c
+ libbrasero-burn/brasero-burn.c
+ libbrasero-burn/brasero-burn-dialog.c