r11948 - in /packages/unstable/brasero/debian: changelog patches/000_cdrtools2cdrkit.patch

[otavio at users.alioth.debian.org]

Author: otavio
Date: Sat Jul 14 13:47:33 2007
New Revision: 11948

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=11948
Log:
* Fix code to not use mkisofs and use genisoimage instead (Closes: #433053).

Modified:
    packages/unstable/brasero/debian/changelog
    packages/unstable/brasero/debian/patches/000_cdrtools2cdrkit.patch

Modified: packages/unstable/brasero/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/brasero/debian/changelog?rev=11948&op=diff
==============================================================================
--- packages/unstable/brasero/debian/changelog (original)
+++ packages/unstable/brasero/debian/changelog Sat Jul 14 13:47:33 2007
@@ -1,6 +1,7 @@
 brasero (0.6.0-2) UNRELEASED; urgency=low
 
   * Converted to use quilt to manage its patches.
+  * Fix code to not use mkisofs and use genisoimage instead (Closes: #433053).
 
  -- Otavio Salvador <otavio at ossystems.com.br>  Sat, 14 Jul 2007 10:27:23 -0300
 

Modified: packages/unstable/brasero/debian/patches/000_cdrtools2cdrkit.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/brasero/debian/patches/000_cdrtools2cdrkit.patch?rev=11948&op=diff
==============================================================================
--- packages/unstable/brasero/debian/patches/000_cdrtools2cdrkit.patch (original)
+++ packages/unstable/brasero/debian/patches/000_cdrtools2cdrkit.patch Sat Jul 14 13:47:33 2007
@@ -1,8 +1,17 @@
 Index: brasero-0.6.0/src/burn-mkisofs.c
 ===================================================================
---- brasero-0.6.0.orig/src/burn-mkisofs.c	2007-07-14 10:32:01.000000000 -0300
-+++ brasero-0.6.0/src/burn-mkisofs.c	2007-07-14 10:32:05.000000000 -0300
-@@ -748,6 +748,7 @@
+--- brasero-0.6.0.orig/src/burn-mkisofs.c	2007-07-11 09:48:14.000000000 -0300
++++ brasero-0.6.0/src/burn-mkisofs.c	2007-07-14 10:44:31.000000000 -0300
+@@ -200,7 +200,7 @@
+ 	obj->priv->caps = brasero_burn_caps_get_default ();
+ 
+ 	/* this code used to be ncb_mkisofs_supports_utf8 */
+-	res = g_spawn_command_line_sync ("mkisofs -input-charset utf8",
++	res = g_spawn_command_line_sync ("genisoimage -input-charset utf8",
+ 					 NULL,
+ 					 &standard_error,
+ 					 NULL,
+@@ -748,10 +748,16 @@
  {
  	BraseroMkisofs *mkisofs;
  	BraseroBurnResult result;
@@ -10,10 +19,20 @@
  
  	mkisofs = BRASERO_MKISOFS (process);
  
+-	g_ptr_array_add (argv, g_strdup ("mkisofs"));
++	/* This is to support cdrkit. We give it the priority. */
++	prog_name = g_find_program_in_path ("genisoimage");
++	if (prog_name && g_file_test (prog_name, G_FILE_TEST_IS_EXECUTABLE))
++		g_ptr_array_add (argv, prog_name);
++	else
++		g_ptr_array_add (argv, g_strdup ("mkisofs"));
+ 
+ 	if (mkisofs->priv->use_utf8) {
+ 		g_ptr_array_add (argv, g_strdup ("-input-charset"));
 Index: brasero-0.6.0/src/burn-readcd.c
 ===================================================================
---- brasero-0.6.0.orig/src/burn-readcd.c	2007-07-14 10:32:01.000000000 -0300
-+++ brasero-0.6.0/src/burn-readcd.c	2007-07-14 10:32:05.000000000 -0300
+--- brasero-0.6.0.orig/src/burn-readcd.c	2007-07-11 09:48:14.000000000 -0300
++++ brasero-0.6.0/src/burn-readcd.c	2007-07-14 10:37:34.000000000 -0300
 @@ -597,6 +597,7 @@
  	BraseroReadcd *readcd;
  	gchar *outfile_arg;
@@ -36,3 +55,16 @@
  
  	drive = readcd->priv->source->contents.drive.disc;
  	if (NCB_DRIVE_GET_DEVICE (drive))
+Index: brasero-0.6.0/src/burn-growisofs.c
+===================================================================
+--- brasero-0.6.0.orig/src/burn-growisofs.c	2007-07-14 10:45:50.000000000 -0300
++++ brasero-0.6.0/src/burn-growisofs.c	2007-07-14 10:46:01.000000000 -0300
+@@ -225,7 +225,7 @@
+ 	obj->priv->caps = brasero_burn_caps_get_default ();
+ 
+ 	/* this code comes from ncb_mkisofs_supports_utf8 */
+-	res = g_spawn_command_line_sync ("mkisofs -input-charset utf8", 
++	res = g_spawn_command_line_sync ("genisoimage -input-charset utf8", 
+ 					 NULL,
+ 					 &standard_error,
+ 					 NULL,