app-cdr/brasero: Make libnotify a harddep and update linking issue patch

4 files changed, 106 insertions, 71 deletions

diff --git a/app-cdr/brasero/Manifest b/app-cdr/brasero/Manifest
index 22a2ae72..776bc123 100644
--- a/app-cdr/brasero/Manifest
+++ b/app-cdr/brasero/Manifest
@@ -1,4 +1,4 @@
-AUX brasero-2.91.6-build-plugins-against-local-library.patch 14543 RMD160 ed754cf9bd5806aabb23109a2bac2a1cdd24d9aa SHA1 4ce359cfef41ab997cf86590c65452e1929bdc71 SHA256 0820a97d338bbff952e511b4c3f765c988a4700f49a9ca7e3118f52891d6ca24
+AUX brasero-2.91.6-build-plugins-against-local-library.patch 14905 RMD160 a84a15050c4b21999c4efdff520606d8d1d563f2 SHA1 bff5cd114b5f98a8b0a39132619a6d39a000d29e SHA256 5978545e14615c43d306e7eb134f1efd6dab9be2e1f80756bd9948e6d6a9db69
 DIST brasero-2.91.6.tar.bz2 4677499 RMD160 eeb0ff00eb775b506a4be2277e8b8a04344f60f9 SHA1 b77d769b76a325012f73192c23355c3cabf8bdea SHA256 1e62e6dd5e4621edb98b67a37282207d548186bf69792b9fe3ef05590997dde7
-EBUILD brasero-2.91.6.ebuild 2810 RMD160 653317b347f5c1c75af9f5ae821a9211506a0194 SHA1 bb4be0f808f7a881d33141d0908ba7417c563a19 SHA256 32ae339556b961ee0e1a4bd10a57746cbda96bc05056e7506d75f65246c14043
-EBUILD brasero-9999.ebuild 2810 RMD160 653317b347f5c1c75af9f5ae821a9211506a0194 SHA1 bb4be0f808f7a881d33141d0908ba7417c563a19 SHA256 32ae339556b961ee0e1a4bd10a57746cbda96bc05056e7506d75f65246c14043
+EBUILD brasero-2.91.6.ebuild 2776 RMD160 072f376fe7c502add5895ce8df12b52fec14aa9b SHA1 a09b836c591443e6054654a9548a1d3506a60bc2 SHA256 44474365aea52697b7d23d71854e6e44460e8b84651e5cade57108f294c045ad
+EBUILD brasero-9999.ebuild 2776 RMD160 072f376fe7c502add5895ce8df12b52fec14aa9b SHA1 a09b836c591443e6054654a9548a1d3506a60bc2 SHA256 44474365aea52697b7d23d71854e6e44460e8b84651e5cade57108f294c045ad
diff --git a/app-cdr/brasero/brasero-2.91.6.ebuild b/app-cdr/brasero/brasero-2.91.6.ebuild
index f1ffe31d..91e2dbf2 100644
--- a/app-cdr/brasero/brasero-2.91.6.ebuild
+++ b/app-cdr/brasero/brasero-2.91.6.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://projects.gnome.org/brasero/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="beagle +cdr +css doc +introspection +libburn +libnotify nautilus playlist test"
+IUSE="beagle +cdr +css doc +introspection +libburn nautilus playlist test"
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 	KEYWORDS=""
@@ -27,6 +27,7 @@ COMMON_DEPEND="
 	>=media-libs/gstreamer-0.10.15
 	>=media-libs/gst-plugins-base-0.10
 	>=dev-libs/libxml2-2.6
+	>=x11-libs/libnotify-0.6.1
 
 	media-libs/libcanberra[gtk3]
 	x11-libs/libICE
@@ -37,7 +38,6 @@ COMMON_DEPEND="
 	libburn? (
 		>=dev-libs/libburn-0.4
 		>=dev-libs/libisofs-0.6.4 )
-	libnotify? ( >=x11-libs/libnotify-0.6.1 )
 	nautilus? ( >=gnome-base/nautilus-2.31.3 )
 	playlist? ( >=dev-libs/totem-pl-parser-2.29.1 )"
 RDEPEND="${COMMON_DEPEND}
@@ -71,7 +71,6 @@ pkg_setup() {
 		$(use_enable cdr cdrkit)
 		$(use_enable introspection)
 		$(use_enable libburn libburnia)
-		$(use_enable libnotify)
 		$(use_enable nautilus)
 		$(use_enable playlist)"
 
@@ -83,7 +82,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	# Fix link against installed libraries, bug #340767
+	# Fix linking against installed libraries, bug #340767, gnome #641233
 	epatch "${FILESDIR}/${PN}-2.91.6-build-plugins-against-local-library.patch"
 
 	if [[ ${PV} != 9999 ]]; then
diff --git a/app-cdr/brasero/brasero-9999.ebuild b/app-cdr/brasero/brasero-9999.ebuild
index f1ffe31d..91e2dbf2 100644
--- a/app-cdr/brasero/brasero-9999.ebuild
+++ b/app-cdr/brasero/brasero-9999.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://projects.gnome.org/brasero/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="beagle +cdr +css doc +introspection +libburn +libnotify nautilus playlist test"
+IUSE="beagle +cdr +css doc +introspection +libburn nautilus playlist test"
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 	KEYWORDS=""
@@ -27,6 +27,7 @@ COMMON_DEPEND="
 	>=media-libs/gstreamer-0.10.15
 	>=media-libs/gst-plugins-base-0.10
 	>=dev-libs/libxml2-2.6
+	>=x11-libs/libnotify-0.6.1
 
 	media-libs/libcanberra[gtk3]
 	x11-libs/libICE
@@ -37,7 +38,6 @@ COMMON_DEPEND="
 	libburn? (
 		>=dev-libs/libburn-0.4
 		>=dev-libs/libisofs-0.6.4 )
-	libnotify? ( >=x11-libs/libnotify-0.6.1 )
 	nautilus? ( >=gnome-base/nautilus-2.31.3 )
 	playlist? ( >=dev-libs/totem-pl-parser-2.29.1 )"
 RDEPEND="${COMMON_DEPEND}
@@ -71,7 +71,6 @@ pkg_setup() {
 		$(use_enable cdr cdrkit)
 		$(use_enable introspection)
 		$(use_enable libburn libburnia)
-		$(use_enable libnotify)
 		$(use_enable nautilus)
 		$(use_enable playlist)"
 
@@ -83,7 +82,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	# Fix link against installed libraries, bug #340767
+	# Fix linking against installed libraries, bug #340767, gnome #641233
 	epatch "${FILESDIR}/${PN}-2.91.6-build-plugins-against-local-library.patch"
 
 	if [[ ${PV} != 9999 ]]; then
diff --git a/app-cdr/brasero/files/brasero-2.91.6-build-plugins-against-local-library.patch b/app-cdr/brasero/files/brasero-2.91.6-build-plugins-against-local-library.patch
index c812f5ad..31beb4c1 100644
--- a/app-cdr/brasero/files/brasero-2.91.6-build-plugins-against-local-library.patch
+++ b/app-cdr/brasero/files/brasero-2.91.6-build-plugins-against-local-library.patch
@@ -1,7 +1,29 @@
-diff -Naur brasero-2.91.6/nautilus/Makefile.am brasero-2.91.6.new/nautilus/Makefile.am
---- brasero-2.91.6/nautilus/Makefile.am	2011-01-31 21:31:58.000000000 +0530
-+++ brasero-2.91.6.new/nautilus/Makefile.am	2011-02-02 15:03:48.225000228 +0530
-@@ -9,7 +9,6 @@
+From 80dc44efc63e5e16d13852a6c2163d2ad07249b7 Mon Sep 17 00:00:00 2001
+From: Mike Auty <ikelos@gentoo.org>
+Date: Wed, 2 Feb 2011 13:14:32 +0200
+Subject: [PATCH] Fix linking against system brasero instead of current source
+
+---
+ nautilus/Makefile.am            |    2 +-
+ plugins/audio2cue/Makefile.am   |    2 +-
+ plugins/cdrdao/Makefile.am      |    2 +-
+ plugins/cdrkit/Makefile.am      |    6 +++---
+ plugins/cdrtools/Makefile.am    |    8 ++++----
+ plugins/checksum/Makefile.am    |    4 ++--
+ plugins/dvdauthor/Makefile.am   |    2 +-
+ plugins/dvdcss/Makefile.am      |    2 +-
+ plugins/growisofs/Makefile.am   |    4 ++--
+ plugins/libburnia/Makefile.am   |    4 ++--
+ plugins/local-track/Makefile.am |    4 ++--
+ plugins/transcode/Makefile.am   |    6 +++---
+ plugins/vcdimager/Makefile.am   |    2 +-
+ 13 files changed, 24 insertions(+), 24 deletions(-)
+
+diff --git a/nautilus/Makefile.am b/nautilus/Makefile.am
+index dc74eed..aee736a 100644
+--- a/nautilus/Makefile.am
++++ b/nautilus/Makefile.am
+@@ -9,7 +9,6 @@ INCLUDES =					\
  	-I$(top_builddir)/libbrasero-burn/	\
  	-I$(top_srcdir)/src/			\
  	-I$(top_builddir)/src/			\
@@ -9,7 +31,7 @@ diff -Naur brasero-2.91.6/nautilus/Makefile.am brasero-2.91.6.new/nautilus/Makef
  	$(WARN_CFLAGS)							\
  	$(WERROR)				\
  	-D_FILE_OFFSET_BITS=64			\
-@@ -22,6 +21,7 @@
+@@ -22,6 +21,7 @@ INCLUDES =					\
  	-DLIBEXECDIR=\""$(libexecdir)"\"	\
  	-DSHAREDIR=\""$(datadir)"\"		\
  	-DDATADIR=\""$(datadir)/brasero"\"	\
@@ -17,10 +39,11 @@ diff -Naur brasero-2.91.6/nautilus/Makefile.am brasero-2.91.6.new/nautilus/Makef
  	$(DISABLE_DEPRECATED)
  
  @INTLTOOL_DESKTOP_RULE@
-diff -Naur brasero-2.91.6/plugins/audio2cue/Makefile.am brasero-2.91.6.new/plugins/audio2cue/Makefile.am
---- brasero-2.91.6/plugins/audio2cue/Makefile.am	2011-01-31 21:31:58.000000000 +0530
-+++ brasero-2.91.6.new/plugins/audio2cue/Makefile.am	2011-02-02 15:04:18.699000229 +0530
-@@ -18,7 +18,7 @@
+diff --git a/plugins/audio2cue/Makefile.am b/plugins/audio2cue/Makefile.am
+index 60fcae7..ebe6caf 100644
+--- a/plugins/audio2cue/Makefile.am
++++ b/plugins/audio2cue/Makefile.am
+@@ -18,7 +18,7 @@ INCLUDES = \
  audio2cuedir = $(BRASERO_PLUGIN_DIRECTORY)
  audio2cue_LTLIBRARIES = libbrasero-audio2cue.la
  libbrasero_audio2cue_la_SOURCES = burn-audio2cue.c
@@ -29,10 +52,11 @@ diff -Naur brasero-2.91.6/plugins/audio2cue/Makefile.am brasero-2.91.6.new/plugi
  libbrasero_audio2cue_la_LDFLAGS = -module -avoid-version
  
  -include $(top_srcdir)/git.mk
-diff -Naur brasero-2.91.6/plugins/cdrdao/Makefile.am brasero-2.91.6.new/plugins/cdrdao/Makefile.am
---- brasero-2.91.6/plugins/cdrdao/Makefile.am	2011-01-31 21:31:58.000000000 +0530
-+++ brasero-2.91.6.new/plugins/cdrdao/Makefile.am	2011-02-02 15:04:35.805000231 +0530
-@@ -18,7 +18,7 @@
+diff --git a/plugins/cdrdao/Makefile.am b/plugins/cdrdao/Makefile.am
+index b46c9a8..86024fa 100644
+--- a/plugins/cdrdao/Makefile.am
++++ b/plugins/cdrdao/Makefile.am
+@@ -18,7 +18,7 @@ INCLUDES = \
  cdrdaodir = $(BRASERO_PLUGIN_DIRECTORY)
  cdrdao_LTLIBRARIES = libbrasero-cdrdao.la
  libbrasero_cdrdao_la_SOURCES = burn-cdrdao.c 
@@ -41,10 +65,11 @@ diff -Naur brasero-2.91.6/plugins/cdrdao/Makefile.am brasero-2.91.6.new/plugins/
  libbrasero_cdrdao_la_LDFLAGS = -module -avoid-version
  
  -include $(top_srcdir)/git.mk
-diff -Naur brasero-2.91.6/plugins/cdrkit/Makefile.am brasero-2.91.6.new/plugins/cdrkit/Makefile.am
---- brasero-2.91.6/plugins/cdrkit/Makefile.am	2011-01-31 21:31:58.000000000 +0530
-+++ brasero-2.91.6.new/plugins/cdrkit/Makefile.am	2011-02-02 15:05:10.718000255 +0530
-@@ -19,7 +19,7 @@
+diff --git a/plugins/cdrkit/Makefile.am b/plugins/cdrkit/Makefile.am
+index 20e7f8a..4359720 100644
+--- a/plugins/cdrkit/Makefile.am
++++ b/plugins/cdrkit/Makefile.am
+@@ -19,7 +19,7 @@ wodimdir = $(BRASERO_PLUGIN_DIRECTORY)
  wodim_LTLIBRARIES = libbrasero-wodim.la
  libbrasero_wodim_la_SOURCES = burn-wodim.c \
  	burn-cdrkit.h 
@@ -53,7 +78,7 @@ diff -Naur brasero-2.91.6/plugins/cdrkit/Makefile.am brasero-2.91.6.new/plugins/
  libbrasero_wodim_la_LDFLAGS = -module -avoid-version
  
  #genisoimage
-@@ -27,7 +27,7 @@
+@@ -27,7 +27,7 @@ genisoimagedir = $(BRASERO_PLUGIN_DIRECTORY)
  genisoimage_LTLIBRARIES = libbrasero-genisoimage.la
  libbrasero_genisoimage_la_SOURCES = burn-genisoimage.c \
  	burn-cdrkit.h 
@@ -62,7 +87,7 @@ diff -Naur brasero-2.91.6/plugins/cdrkit/Makefile.am brasero-2.91.6.new/plugins/
  libbrasero_genisoimage_la_LDFLAGS = -module -avoid-version
  
  #readom
-@@ -35,7 +35,7 @@
+@@ -35,7 +35,7 @@ readomdir = $(BRASERO_PLUGIN_DIRECTORY)
  readom_LTLIBRARIES = libbrasero-readom.la
  libbrasero_readom_la_SOURCES = burn-readom.c \
  	burn-cdrkit.h 
@@ -71,10 +96,11 @@ diff -Naur brasero-2.91.6/plugins/cdrkit/Makefile.am brasero-2.91.6.new/plugins/
  libbrasero_readom_la_LDFLAGS = -module -avoid-version
  
  -include $(top_srcdir)/git.mk
-diff -Naur brasero-2.91.6/plugins/cdrtools/Makefile.am brasero-2.91.6.new/plugins/cdrtools/Makefile.am
---- brasero-2.91.6/plugins/cdrtools/Makefile.am	2011-01-31 21:31:58.000000000 +0530
-+++ brasero-2.91.6.new/plugins/cdrtools/Makefile.am	2011-02-02 15:05:56.066000219 +0530
-@@ -19,7 +19,7 @@
+diff --git a/plugins/cdrtools/Makefile.am b/plugins/cdrtools/Makefile.am
+index b82b753..d8b4650 100644
+--- a/plugins/cdrtools/Makefile.am
++++ b/plugins/cdrtools/Makefile.am
+@@ -19,7 +19,7 @@ cdrecorddir = $(BRASERO_PLUGIN_DIRECTORY)
  cdrecord_LTLIBRARIES = libbrasero-cdrecord.la
  libbrasero_cdrecord_la_SOURCES = burn-cdrecord.c \
  	burn-cdrtools.h 
@@ -83,7 +109,7 @@ diff -Naur brasero-2.91.6/plugins/cdrtools/Makefile.am brasero-2.91.6.new/plugin
  libbrasero_cdrecord_la_LDFLAGS = -module -avoid-version
  
  #mkisofs
-@@ -27,7 +27,7 @@
+@@ -27,7 +27,7 @@ mkisofsdir = $(BRASERO_PLUGIN_DIRECTORY)
  mkisofs_LTLIBRARIES = libbrasero-mkisofs.la
  libbrasero_mkisofs_la_SOURCES = burn-mkisofs.c \
  	burn-cdrtools.h 
@@ -92,7 +118,7 @@ diff -Naur brasero-2.91.6/plugins/cdrtools/Makefile.am brasero-2.91.6.new/plugin
  libbrasero_mkisofs_la_LDFLAGS = -module -avoid-version
  
  #readcd
-@@ -35,14 +35,14 @@
+@@ -35,14 +35,14 @@ readcddir = $(BRASERO_PLUGIN_DIRECTORY)
  readcd_LTLIBRARIES = libbrasero-readcd.la
  libbrasero_readcd_la_SOURCES = burn-readcd.c \
  	burn-cdrtools.h 
@@ -109,10 +135,11 @@ diff -Naur brasero-2.91.6/plugins/cdrtools/Makefile.am brasero-2.91.6.new/plugin
  libbrasero_cdda2wav_la_LDFLAGS = -module -avoid-version
  
  -include $(top_srcdir)/git.mk
-diff -Naur brasero-2.91.6/plugins/checksum/Makefile.am brasero-2.91.6.new/plugins/checksum/Makefile.am
---- brasero-2.91.6/plugins/checksum/Makefile.am	2011-01-31 21:31:58.000000000 +0530
-+++ brasero-2.91.6.new/plugins/checksum/Makefile.am	2011-02-02 15:07:03.706000199 +0530
-@@ -20,7 +20,7 @@
+diff --git a/plugins/checksum/Makefile.am b/plugins/checksum/Makefile.am
+index 57855e4..4acef8c 100644
+--- a/plugins/checksum/Makefile.am
++++ b/plugins/checksum/Makefile.am
+@@ -20,7 +20,7 @@ checksum_LTLIBRARIES = libbrasero-checksum.la
  libbrasero_checksum_la_SOURCES = burn-checksum-image.c	
  
  libbrasero_checksum_la_LDFLAGS = -module -avoid-version
@@ -121,7 +148,7 @@ diff -Naur brasero-2.91.6/plugins/checksum/Makefile.am brasero-2.91.6.new/plugin
  
  checksumfiledir = $(BRASERO_PLUGIN_DIRECTORY)
  checksumfile_LTLIBRARIES = libbrasero-checksum-file.la
-@@ -29,6 +29,6 @@
+@@ -29,6 +29,6 @@ libbrasero_checksum_file_la_SOURCES = burn-checksum-files.c	\
  				      burn-volume-read.h
  
  libbrasero_checksum_file_la_LDFLAGS = -module -avoid-version
@@ -129,10 +156,11 @@ diff -Naur brasero-2.91.6/plugins/checksum/Makefile.am brasero-2.91.6.new/plugin
 +libbrasero_checksum_file_la_LIBADD = ../../libbrasero-media/libbrasero-media3.la ../../libbrasero-burn/libbrasero-burn3.la $(BRASERO_GLIB_LIBS) $(BRASERO_GTK_LIBS)
  
  -include $(top_srcdir)/git.mk
-diff -Naur brasero-2.91.6/plugins/dvdauthor/Makefile.am brasero-2.91.6.new/plugins/dvdauthor/Makefile.am
---- brasero-2.91.6/plugins/dvdauthor/Makefile.am	2011-01-31 21:31:58.000000000 +0530
-+++ brasero-2.91.6.new/plugins/dvdauthor/Makefile.am	2011-02-02 15:07:21.702000242 +0530
-@@ -19,7 +19,7 @@
+diff --git a/plugins/dvdauthor/Makefile.am b/plugins/dvdauthor/Makefile.am
+index 3ecbff4..0fcd411 100644
+--- a/plugins/dvdauthor/Makefile.am
++++ b/plugins/dvdauthor/Makefile.am
+@@ -19,7 +19,7 @@ dvdauthordir = $(BRASERO_PLUGIN_DIRECTORY)
  dvdauthor_LTLIBRARIES = libbrasero-dvdauthor.la
  
  libbrasero_dvdauthor_la_SOURCES = burn-dvdauthor.c 
@@ -141,10 +169,11 @@ diff -Naur brasero-2.91.6/plugins/dvdauthor/Makefile.am brasero-2.91.6.new/plugi
  libbrasero_dvdauthor_la_LDFLAGS = -module -avoid-version
  
  
-diff -Naur brasero-2.91.6/plugins/dvdcss/Makefile.am brasero-2.91.6.new/plugins/dvdcss/Makefile.am
---- brasero-2.91.6/plugins/dvdcss/Makefile.am	2011-01-31 21:31:58.000000000 +0530
-+++ brasero-2.91.6.new/plugins/dvdcss/Makefile.am	2011-02-02 15:07:34.776000232 +0530
-@@ -17,7 +17,7 @@
+diff --git a/plugins/dvdcss/Makefile.am b/plugins/dvdcss/Makefile.am
+index 8f6718c..467a5e1 100644
+--- a/plugins/dvdcss/Makefile.am
++++ b/plugins/dvdcss/Makefile.am
+@@ -17,7 +17,7 @@ plugindir = $(BRASERO_PLUGIN_DIRECTORY)
  plugin_LTLIBRARIES = libbrasero-dvdcss.la
  libbrasero_dvdcss_la_SOURCES = burn-dvdcss.c \
  	burn-dvdcss-private.h 
@@ -153,10 +182,11 @@ diff -Naur brasero-2.91.6/plugins/dvdcss/Makefile.am brasero-2.91.6.new/plugins/
  libbrasero_dvdcss_la_LDFLAGS = -module -avoid-version
  
  -include $(top_srcdir)/git.mk
-diff -Naur brasero-2.91.6/plugins/growisofs/Makefile.am brasero-2.91.6.new/plugins/growisofs/Makefile.am
---- brasero-2.91.6/plugins/growisofs/Makefile.am	2011-01-31 21:31:58.000000000 +0530
-+++ brasero-2.91.6.new/plugins/growisofs/Makefile.am	2011-02-02 15:07:55.359000227 +0530
-@@ -19,14 +19,14 @@
+diff --git a/plugins/growisofs/Makefile.am b/plugins/growisofs/Makefile.am
+index 8dd3328..99d3efd 100644
+--- a/plugins/growisofs/Makefile.am
++++ b/plugins/growisofs/Makefile.am
+@@ -19,14 +19,14 @@ growisofsdir = $(BRASERO_PLUGIN_DIRECTORY)
  growisofs_LTLIBRARIES = libbrasero-growisofs.la
  libbrasero_growisofs_la_SOURCES = burn-growisofs.c \
  	burn-growisofs-common.h 
@@ -173,10 +203,11 @@ diff -Naur brasero-2.91.6/plugins/growisofs/Makefile.am brasero-2.91.6.new/plugi
  libbrasero_dvdrwformat_la_LDFLAGS = -module -avoid-version
  
  -include $(top_srcdir)/git.mk
-diff -Naur brasero-2.91.6/plugins/libburnia/Makefile.am brasero-2.91.6.new/plugins/libburnia/Makefile.am
---- brasero-2.91.6/plugins/libburnia/Makefile.am	2011-01-31 21:31:58.000000000 +0530
-+++ brasero-2.91.6.new/plugins/libburnia/Makefile.am	2011-02-02 15:08:17.969000228 +0530
-@@ -23,7 +23,7 @@
+diff --git a/plugins/libburnia/Makefile.am b/plugins/libburnia/Makefile.am
+index 1351967..b4062a2 100644
+--- a/plugins/libburnia/Makefile.am
++++ b/plugins/libburnia/Makefile.am
+@@ -23,7 +23,7 @@ libbrasero_libburn_la_SOURCES = burn-libburn.c 		\
  				burn-libburn-common.c	\
  				burn-libburn-common.h  \
  				burn-libburnia.h 
@@ -185,7 +216,7 @@ diff -Naur brasero-2.91.6/plugins/libburnia/Makefile.am brasero-2.91.6.new/plugi
  libbrasero_libburn_la_LDFLAGS = -module -avoid-version
  
  #libisofs (apparently libisofs needs one libburn function)
-@@ -32,7 +32,7 @@
+@@ -32,7 +32,7 @@ libisofs_LTLIBRARIES = libbrasero-libisofs.la
  libbrasero_libisofs_la_SOURCES = burn-libisofs.c                       \
  	burn-libburn-common.c burn-libburn-common.h			\
  	burn-libburnia.h 
@@ -194,10 +225,11 @@ diff -Naur brasero-2.91.6/plugins/libburnia/Makefile.am brasero-2.91.6.new/plugi
  libbrasero_libisofs_la_LDFLAGS = -module -avoid-version
  
  -include $(top_srcdir)/git.mk
-diff -Naur brasero-2.91.6/plugins/local-track/Makefile.am brasero-2.91.6.new/plugins/local-track/Makefile.am
---- brasero-2.91.6/plugins/local-track/Makefile.am	2011-01-31 21:31:58.000000000 +0530
-+++ brasero-2.91.6.new/plugins/local-track/Makefile.am	2011-02-02 15:08:40.289000226 +0530
-@@ -20,7 +20,7 @@
+diff --git a/plugins/local-track/Makefile.am b/plugins/local-track/Makefile.am
+index 5f75139..b553220 100644
+--- a/plugins/local-track/Makefile.am
++++ b/plugins/local-track/Makefile.am
+@@ -20,7 +20,7 @@ local_trackdir = $(BRASERO_PLUGIN_DIRECTORY)
  local_track_LTLIBRARIES = libbrasero-local-track.la
  
  libbrasero_local_track_la_SOURCES = burn-local-image.c 
@@ -206,7 +238,7 @@ diff -Naur brasero-2.91.6/plugins/local-track/Makefile.am brasero-2.91.6.new/plu
  libbrasero_local_track_la_LDFLAGS = -module -avoid-version
  
  #burn-uri
-@@ -28,7 +28,7 @@
+@@ -28,7 +28,7 @@ burn_uridir = $(BRASERO_PLUGIN_DIRECTORY)
  burn_uri_LTLIBRARIES = libbrasero-burn-uri.la
  
  libbrasero_burn_uri_la_SOURCES = burn-uri.c 
@@ -215,10 +247,11 @@ diff -Naur brasero-2.91.6/plugins/local-track/Makefile.am brasero-2.91.6.new/plu
  libbrasero_burn_uri_la_LDFLAGS = -module -avoid-version
  
  -include $(top_srcdir)/git.mk
-diff -Naur brasero-2.91.6/plugins/transcode/Makefile.am brasero-2.91.6.new/plugins/transcode/Makefile.am
---- brasero-2.91.6/plugins/transcode/Makefile.am	2011-01-31 21:31:58.000000000 +0530
-+++ brasero-2.91.6.new/plugins/transcode/Makefile.am	2011-02-02 15:09:17.202000235 +0530
-@@ -19,21 +19,21 @@
+diff --git a/plugins/transcode/Makefile.am b/plugins/transcode/Makefile.am
+index 3ce1d28..4cdf5ec 100644
+--- a/plugins/transcode/Makefile.am
++++ b/plugins/transcode/Makefile.am
+@@ -19,21 +19,21 @@ transcodedir = $(BRASERO_PLUGIN_DIRECTORY)
  transcode_LTLIBRARIES = libbrasero-transcode.la
  
  libbrasero_transcode_la_SOURCES = burn-transcode.c burn-normalize.h 
@@ -243,10 +276,11 @@ diff -Naur brasero-2.91.6/plugins/transcode/Makefile.am brasero-2.91.6.new/plugi
  libbrasero_vob_la_LDFLAGS = -module -avoid-version
  
  -include $(top_srcdir)/git.mk
-diff -Naur brasero-2.91.6/plugins/vcdimager/Makefile.am brasero-2.91.6.new/plugins/vcdimager/Makefile.am
---- brasero-2.91.6/plugins/vcdimager/Makefile.am	2011-01-31 21:31:58.000000000 +0530
-+++ brasero-2.91.6.new/plugins/vcdimager/Makefile.am	2011-02-02 15:09:30.816000220 +0530
-@@ -19,7 +19,7 @@
+diff --git a/plugins/vcdimager/Makefile.am b/plugins/vcdimager/Makefile.am
+index 2a55f8c..b265585 100644
+--- a/plugins/vcdimager/Makefile.am
++++ b/plugins/vcdimager/Makefile.am
+@@ -19,7 +19,7 @@ vcdimagerdir = $(BRASERO_PLUGIN_DIRECTORY)
  vcdimager_LTLIBRARIES = libbrasero-vcdimager.la
  
  libbrasero_vcdimager_la_SOURCES = burn-vcdimager.c 
@@ -255,3 +289,6 @@ diff -Naur brasero-2.91.6/plugins/vcdimager/Makefile.am brasero-2.91.6.new/plugi
  libbrasero_vcdimager_la_LDFLAGS = -module -avoid-version
  
  
+-- 
+1.7.4.rc2
+