r11841 - in /packages/unstable/brasero/debian: changelog control patches/000_cdrtools2cdrkit.patch patches/001_use-sys-inotify.h.patch
otavio at users.alioth.debian.org
otavio at users.alioth.debian.org
Fri Jul 6 00:21:27 UTC 2007
Author: otavio
Date: Fri Jul 6 00:21:27 2007
New Revision: 11841
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=11841
Log:
* Updated patches:
- 000_cdrtools2cdrkit.patch: redone;
- 001_use-sys-inotify.h.patch: cleaned and rediff;
Modified:
packages/unstable/brasero/debian/changelog
packages/unstable/brasero/debian/control
packages/unstable/brasero/debian/patches/000_cdrtools2cdrkit.patch
packages/unstable/brasero/debian/patches/001_use-sys-inotify.h.patch
Modified: packages/unstable/brasero/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/brasero/debian/changelog?rev=11841&op=diff
==============================================================================
--- packages/unstable/brasero/debian/changelog (original)
+++ packages/unstable/brasero/debian/changelog Fri Jul 6 00:21:27 2007
@@ -11,8 +11,11 @@
* Add dependency on hal (Closes: #431854, #427644).
* Add a menu file based on the patch provided by Nelson A. de Oliveira
but already using the new menu layout (Closes: #405146).
+ * Updated patches:
+ - 000_cdrtools2cdrkit.patch: redone;
+ - 001_use-sys-inotify.h.patch: cleaned and rediff;
- -- Otavio Salvador <otavio at ossystems.com.br> Thu, 05 Jul 2007 20:36:52 -0300
+ -- Otavio Salvador <otavio at debian.org> Thu, 05 Jul 2007 20:58:33 -0300
brasero (0.5.2-1) unstable; urgency=low
Modified: packages/unstable/brasero/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/brasero/debian/control?rev=11841&op=diff
==============================================================================
--- packages/unstable/brasero/debian/control (original)
+++ packages/unstable/brasero/debian/control Fri Jul 6 00:21:27 2007
@@ -22,7 +22,7 @@
libxml-parser-perl,
libnotify-dev,
libglib2.0-dev (>= 2.6.0)
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Loic Minier <lool at dooz.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
Standards-Version: 3.7.2.1
Package: brasero
@@ -30,7 +30,8 @@
Depends: ${shlibs:Depends},
${misc:Depends},
wodim,
- genisoimage
+ genisoimage,
+ hal
Recommends: gstreamer0.10-fluendo-mp3
Suggests: gnome-icon-theme
Replaces: bonfire (<= 0.4.4-1)
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=11841&op=diff
==============================================================================
--- packages/unstable/brasero/debian/patches/000_cdrtools2cdrkit.patch (original)
+++ packages/unstable/brasero/debian/patches/000_cdrtools2cdrkit.patch Fri Jul 6 00:21:27 2007
@@ -1,36 +1,40 @@
-diff -Nur brasero-0.5.2-ORIG/src/burn-cdrecord.c brasero-0.5.2/src/burn-cdrecord.c
---- brasero-0.5.2-ORIG/src/burn-cdrecord.c 2007-06-01 17:07:38.000000000 -0300
-+++ brasero-0.5.2/src/burn-cdrecord.c 2007-06-01 17:24:03.000000000 -0300
-@@ -1102,7 +1102,7 @@
- if (!cdrecord->priv->drive)
- BRASERO_JOB_NOT_READY (cdrecord);
+--- a/src/burn-mkisofs.c 2007-04-15 09:39:59.000000000 -0300
++++ b/src/burn-mkisofs.c 2007-07-05 20:54:36.000000000 -0300
+@@ -751,2 +751,3 @@
+ BraseroBurnResult result;
++ gchar *prog_name;
-- g_ptr_array_add (argv, g_strdup ("cdrecord"));
-+ g_ptr_array_add (argv, g_strdup ("wodim"));
- g_ptr_array_add (argv, g_strdup ("-v"));
+ mkisofs = BRASERO_MKISOFS (process);
- dev_str = g_strdup_printf ("dev=%s",
-diff -Nur brasero-0.5.2-ORIG/src/burn-mkisofs.c brasero-0.5.2/src/burn-mkisofs.c
---- brasero-0.5.2-ORIG/src/burn-mkisofs.c 2007-06-01 17:07:38.000000000 -0300
-+++ brasero-0.5.2/src/burn-mkisofs.c 2007-06-01 17:08:56.000000000 -0300
-@@ -705,7 +705,7 @@
- gboolean res;
- gint tmp;
+- 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"));
-- command = g_strdup_printf ("cdrecord -msinfo dev=%s",
-+ command = g_strdup_printf ("wodim -msinfo dev=%s",
- NCB_DRIVE_GET_DEVICE (mkisofs->priv->drive));
-
- res = g_spawn_command_line_sync (command,
-diff -Nur brasero-0.5.2-ORIG/src/burn-readcd.c brasero-0.5.2/src/burn-readcd.c
---- brasero-0.5.2-ORIG/src/burn-readcd.c 2007-06-01 17:07:38.000000000 -0300
-+++ brasero-0.5.2/src/burn-readcd.c 2007-06-01 17:23:13.000000000 -0300
-@@ -613,7 +613,7 @@
+ if (mkisofs->priv->use_utf8) {
+ g_ptr_array_add (argv, g_strdup ("-input-charset"));
+--- a/src/burn-readcd.c 2007-04-15 09:39:59.000000000 -0300
++++ b/src/burn-readcd.c 2007-07-05 20:54:37.000000000 -0300
+@@ -604,10 +604,16 @@
+ gchar *dev_str;
++ gchar *prog_name;
+
+ readcd = BRASERO_READCD (process);
+ brasero_job_set_run_slave (BRASERO_JOB (readcd), FALSE);
+
if (!readcd->priv->source)
BRASERO_JOB_NOT_READY (readcd);
- g_ptr_array_add (argv, g_strdup ("readcd"));
-+ g_ptr_array_add (argv, g_strdup ("readom"));
++ /* This is to support cdrkit. We give it the priority. */
++ prog_name = g_find_program_in_path ("readom");
++ 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 ("readcd"));
- drive = readcd->priv->source->contents.drive.disc;
- if (NCB_DRIVE_GET_DEVICE (drive))
+ drive = readcd->priv->source->contents.drive.disc;
+ if (NCB_DRIVE_GET_DEVICE (drive))
Modified: packages/unstable/brasero/debian/patches/001_use-sys-inotify.h.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/brasero/debian/patches/001_use-sys-inotify.h.patch?rev=11841&op=diff
==============================================================================
--- packages/unstable/brasero/debian/patches/001_use-sys-inotify.h.patch (original)
+++ packages/unstable/brasero/debian/patches/001_use-sys-inotify.h.patch Fri Jul 6 00:21:27 2007
@@ -13,80 +13,17 @@
diff -urN brasero-0.4.4~/src/data-disc.c brasero-0.4.4/src/data-disc.c
--- brasero-0.4.4~/src/data-disc.c 2006-09-07 17:47:40.000000000 +0200
+++ brasero-0.4.4/src/data-disc.c 2006-10-23 16:03:17.000000000 +0200
-@@ -65,7 +65,7 @@
+@@ -65,9 +65,9 @@
#ifdef BUILD_INOTIFY
+
#include "inotify.h"
-#include "inotify-syscalls.h"
+#include <sys/inotify.h>
+
#endif
#include "disc.h"
-diff -urN brasero-0.4.4~/src/inotify-syscalls.h brasero-0.4.4/src/inotify-syscalls.h
---- brasero-0.4.4~/src/inotify-syscalls.h 2006-09-07 17:47:40.000000000 +0200
-+++ brasero-0.4.4/src/inotify-syscalls.h 1970-01-01 01:00:00.000000000 +0100
-@@ -1,61 +0,0 @@
--#ifndef _LINUX_INOTIFY_SYSCALLS_H
--#define _LINUX_INOTIFY_SYSCALLS_H
--
--#include <sys/syscall.h>
--
--#if defined(__i386__)
--# define __NR_inotify_init 291
--# define __NR_inotify_add_watch 292
--# define __NR_inotify_rm_watch 293
--#elif defined(__x86_64__)
--# define __NR_inotify_init 253
--# define __NR_inotify_add_watch 254
--# define __NR_inotify_rm_watch 255
--#elif defined(__powerpc__) || defined(__powerpc64__)
--# define __NR_inotify_init 275
--# define __NR_inotify_add_watch 276
--# define __NR_inotify_rm_watch 277
--#elif defined (__ia64__)
--# define __NR_inotify_init 1277
--# define __NR_inotify_add_watch 1278
--# define __NR_inotify_rm_watch 1279
--#elif defined (__s390__)
--# define __NR_inotify_init 284
--# define __NR_inotify_add_watch 285
--# define __NR_inotify_rm_watch 286
--#elif defined (__alpha__)
--# define __NR_inotify_init 444
--# define __NR_inotify_add_watch 445
--# define __NR_inotify_rm_watch 446
--#elif defined (__sparc__) || defined (__sparc64__)
--# define __NR_inotify_init 151
--# define __NR_inotify_add_watch 152
--# define __NR_inotify_rm_watch 156
--#elif defined (__arm__)
--# define __NR_inotify_init 316
--# define __NR_inotify_add_watch 317
--# define __NR_inotify_rm_watch 318
--#elif defined (__sh__)
--# define __NR_inotify_init 290
--# define __NR_inotify_add_watch 291
--# define __NR_inotify_rm_watch 292
--#else
--# error "Unsupported architecture!"
--#endif
--
--static inline int inotify_init (void)
--{
-- return syscall (__NR_inotify_init);
--}
--
--static inline int inotify_add_watch (int fd, const char *name, __u32 mask)
--{
-- return syscall (__NR_inotify_add_watch, fd, name, mask);
--}
--
--static inline int inotify_rm_watch (int fd, __u32 wd)
--{
-- return syscall (__NR_inotify_rm_watch, fd, wd);
--}
--
--#endif /* _LINUX_INOTIFY_SYSCALLS_H */
diff -urN brasero-0.4.4~/src/Makefile.am brasero-0.4.4/src/Makefile.am
--- brasero-0.4.4~/src/Makefile.am 2006-09-07 17:47:40.000000000 +0200
+++ brasero-0.4.4/src/Makefile.am 2006-10-23 16:01:29.000000000 +0200
More information about the pkg-gnome-commits
mailing list