r16748 - in /packages/unstable/brasero/debian: changelog patches/001-fix-valist.patch patches/006-fix-libdvdcss.patch patches/007-fix-gnome-doc-utils-path.patch patches/series

Sun Aug 10 12:30:34 UTC 2008

Author: alanbach-guest
Date: Sun Aug 10 12:30:34 2008
New Revision: 16748

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=16748
Log:
* New upstream bugfix release, merged changelog entries.
* Dropped 001-fix-valist.patch, merged upstream.
* Refreshed 006-fix-libdvdcss and 007-fix-gnome-doc-utils-path patches
  to be applied cleanly.

Removed:
    packages/unstable/brasero/debian/patches/001-fix-valist.patch
Modified:
    packages/unstable/brasero/debian/changelog
    packages/unstable/brasero/debian/patches/006-fix-libdvdcss.patch
    packages/unstable/brasero/debian/patches/007-fix-gnome-doc-utils-path.patch
    packages/unstable/brasero/debian/patches/series

Modified: packages/unstable/brasero/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/brasero/debian/changelog?rev=16748&op=diff
==============================================================================

--- packages/unstable/brasero/debian/changelog (original)
+++ packages/unstable/brasero/debian/changelog Sun Aug 10 12:30:34 2008
@@ -1,10 +1,17 @@
-brasero (0.8.0-3) UNRELEASED; urgency=low
-
+brasero (0.8.1-1) unstable; urgency=low
+
+  [ Loic Minier ]
   * Build-dep on libcam-dev for kfreebsd-i386 and kfreebsd-amd64 and also pass
     --disable-inotify to configure when DEB_BUILD_ARCH_OS isn't linux; fixes
-    building on GNU/kFreeBSD; thanks Petr Salinger; closes: #493359.
-
- -- Loic Minier <lool at dooz.org>  Sun, 03 Aug 2008 13:08:27 +0200
+    building on GNU/kFreeBSD; thanks Petr Salinger; Closes: #493359.
+  
+  [ Alan Baghumian ]
+  * New upstream bugfix release, merged changelog entries.
+  * Dropped 001-fix-valist.patch, merged upstream.
+  * Refreshed 006-fix-libdvdcss and 007-fix-gnome-doc-utils-path patches
+    to be applied cleanly. 
+
+ -- Alan Baghumian <alan at technotux.org>  Sun, 10 Aug 2008 14:26:27 +0200
 
 brasero (0.8.0-2) unstable; urgency=low
 

Modified: packages/unstable/brasero/debian/patches/006-fix-libdvdcss.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/brasero/debian/patches/006-fix-libdvdcss.patch?rev=16748&op=diff
==============================================================================
--- packages/unstable/brasero/debian/patches/006-fix-libdvdcss.patch (original)
+++ packages/unstable/brasero/debian/patches/006-fix-libdvdcss.patch Sun Aug 10 12:30:34 2008
@@ -1,12 +1,10 @@
-Launchpad #134828; New patch, 006-fix-libdvdcss, load libdvdcss lib with SONAME
-version as to not require the -dev package.
-
---- brasero-0.6.90.orig/src/plugins/dvdcss/burn-dvdcss.c	2007-11-25 14:48:23.000000000 +0000
-+++ brasero-0.6.90/src/plugins/dvdcss/burn-dvdcss.c	2007-12-17 20:14:02.639203793 +0000
-@@ -76,7 +76,7 @@ brasero_dvdcss_library_init (GError **er
+diff -urN brasero-0.8.1/src/plugins/dvdcss/burn-dvdcss.c brasero-0.8.1.new/src/plugins/dvdcss/burn-dvdcss.c
+--- brasero-0.8.1/src/plugins/dvdcss/burn-dvdcss.c	2008-08-09 15:41:21.000000000 +0200
++++ brasero-0.8.1.new/src/plugins/dvdcss/burn-dvdcss.c	2008-08-10 14:07:51.000000000 +0200
+@@ -77,7 +77,7 @@
  		return TRUE;
  
- 	/* load libdvdcss library and see the version (min is 1.2.0) */
+ 	/* load libdvdcss library and see the version (mine is 1.2.0) */
 -	module = g_module_open ("libdvdcss.so", G_MODULE_BIND_LOCAL);
 +	module = g_module_open ("libdvdcss.so.2", G_MODULE_BIND_LOCAL);
  	if (!module)

Modified: packages/unstable/brasero/debian/patches/007-fix-gnome-doc-utils-path.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/brasero/debian/patches/007-fix-gnome-doc-utils-path.patch?rev=16748&op=diff
==============================================================================
--- packages/unstable/brasero/debian/patches/007-fix-gnome-doc-utils-path.patch (original)
+++ packages/unstable/brasero/debian/patches/007-fix-gnome-doc-utils-path.patch Sun Aug 10 12:30:34 2008
@@ -1,15 +1,15 @@
-diff -urN brasero-0.8.0/help/Makefile.am brasero-0.8.0.new/help/Makefile.am
---- brasero-0.8.0/help/Makefile.am	2008-07-13 17:55:15.000000000 +0200
-+++ brasero-0.8.0.new/help/Makefile.am	2008-07-13 20:04:05.000000000 +0200
+diff -urN brasero-0.8.1/help/Makefile.am brasero-0.8.1.new/help/Makefile.am
+--- brasero-0.8.1/help/Makefile.am	2008-08-09 15:41:23.000000000 +0200
++++ brasero-0.8.1.new/help/Makefile.am	2008-08-10 14:09:01.000000000 +0200
 @@ -1,4 +1,4 @@
 -include $(top_srcdir)/gnome-doc-utils.make
 +include $(prefix)/share/gnome-doc-utils/gnome-doc-utils.make
  dist-hook: doc-dist-hook
  
  # Module name
-diff -urN brasero-0.8.0/help/Makefile.in brasero-0.8.0.new/help/Makefile.in
---- brasero-0.8.0/help/Makefile.in	2008-07-13 17:55:32.000000000 +0200
-+++ brasero-0.8.0.new/help/Makefile.in	2008-07-13 20:05:02.000000000 +0200
+diff -urN brasero-0.8.1/help/Makefile.in brasero-0.8.1.new/help/Makefile.in
+--- brasero-0.8.1/help/Makefile.in	2008-08-09 15:41:42.000000000 +0200
++++ brasero-0.8.1.new/help/Makefile.in	2008-08-10 14:09:01.000000000 +0200
 @@ -56,7 +56,7 @@
  build_triplet = @build@
  host_triplet = @host@
@@ -19,7 +19,7 @@
  subdir = help
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
-@@ -373,7 +373,7 @@
+@@ -377,7 +377,7 @@
  all: all-am
  
  .SUFFIXES:

Modified: packages/unstable/brasero/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/brasero/debian/patches/series?rev=16748&op=diff
==============================================================================
--- packages/unstable/brasero/debian/patches/series (original)
+++ packages/unstable/brasero/debian/patches/series Sun Aug 10 12:30:34 2008
@@ -1,3 +1,2 @@
-001-fix-valist.patch
 006-fix-libdvdcss.patch
 007-fix-gnome-doc-utils-path.patch


