r15247 - in /desktop/experimental/nautilus-cd-burner/debian: changelog control control.in libnautilus-burn4.shlibs nautilus-cd-burner.install patches/03_wodim.patch patches/04_readom.patch patches/05_genisoimage.patch
slomo at users.alioth.debian.org
slomo at users.alioth.debian.org
Mon Mar 17 12:01:59 UTC 2008
Author: slomo
Date: Mon Mar 17 12:01:59 2008
New Revision: 15247
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=15247
Log:
* New upstream stable release:
+ debian/control.in:
- Update build dependencies and dependencies.
+ debian/patches/03_wodim.patch,
debian/patches/04_readom.patch,
debian/patches/05_genisoimage.patch:
- Updated to apply cleanly again.
+ debian/nautilus-cd-burner.install:
- Update paths.
+ debian/libnautilus-burn4.shlibs:
- Bump shlibs to >= 2.22.0 because of API additions.
Added:
desktop/experimental/nautilus-cd-burner/debian/libnautilus-burn4.shlibs
Modified:
desktop/experimental/nautilus-cd-burner/debian/changelog
desktop/experimental/nautilus-cd-burner/debian/control
desktop/experimental/nautilus-cd-burner/debian/control.in
desktop/experimental/nautilus-cd-burner/debian/nautilus-cd-burner.install
desktop/experimental/nautilus-cd-burner/debian/patches/03_wodim.patch
desktop/experimental/nautilus-cd-burner/debian/patches/04_readom.patch
desktop/experimental/nautilus-cd-burner/debian/patches/05_genisoimage.patch
Modified: desktop/experimental/nautilus-cd-burner/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/nautilus-cd-burner/debian/changelog?rev=15247&op=diff
==============================================================================
--- desktop/experimental/nautilus-cd-burner/debian/changelog (original)
+++ desktop/experimental/nautilus-cd-burner/debian/changelog Mon Mar 17 12:01:59 2008
@@ -1,3 +1,19 @@
+nautilus-cd-burner (2.22.0-1) experimental; urgency=low
+
+ * New upstream stable release:
+ + debian/control.in:
+ - Update build dependencies and dependencies.
+ + debian/patches/03_wodim.patch,
+ debian/patches/04_readom.patch,
+ debian/patches/05_genisoimage.patch:
+ - Updated to apply cleanly again.
+ + debian/nautilus-cd-burner.install:
+ - Update paths.
+ + debian/libnautilus-burn4.shlibs:
+ - Bump shlibs to >= 2.22.0 because of API additions.
+
+ -- Sebastian Dröge <slomo at debian.org> Mon, 17 Mar 2008 12:42:17 +0100
+
nautilus-cd-burner (2.20.0-2) unstable; urgency=low
* debian/patches/02_pmount.patch:
Modified: desktop/experimental/nautilus-cd-burner/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/nautilus-cd-burner/debian/control?rev=15247&op=diff
==============================================================================
--- desktop/experimental/nautilus-cd-burner/debian/control (original)
+++ desktop/experimental/nautilus-cd-burner/debian/control Mon Mar 17 12:01:59 2008
@@ -8,19 +8,18 @@
intltool (>= 0.35.0),
autotools-dev,
libbonobo2-dev (>= 2.16),
- libnautilus-extension-dev (>= 2.15.3),
+ libnautilus-extension-dev (>= 2.21.5),
libgnomeui-dev (>= 2.16.0-2),
libhal-dev (>= 0.5.7) [!kfreebsd-i386 !kfreebsd-amd64],
libcam-dev [kfreebsd-i386 kfreebsd-amd64],
libgtk2.0-dev (>= 2.6.0),
libdbus-glib-1-dev (>= 0.60),
libeel2-dev (>= 2.13.3),
- libgnomevfs2-dev,
- libglib2.0-dev (>= 2.6.0),
+ libglib2.0-dev (>= 2.15.4),
libglade2-dev,
dpkg-dev (>= 1.13.19)
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>, Sebastian Dröge <slomo at debian.org>
-Standards-Version: 3.7.2
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>, Sebastian Dröge <slomo at debian.org>, Sebastien Bacher <seb128 at debian.org>
+Standards-Version: 3.7.3
Package: nautilus-cd-burner
Architecture: any
@@ -30,6 +29,7 @@
${misc:Depends},
cdrdao,
nautilus,
+ nautilus-extensions-2.0,
dvd+rw-tools
Description: CD Burning front-end for Nautilus
Lets you burn CDs and DVDs easily with GNOME, by drag-and-dropping files in the
Modified: desktop/experimental/nautilus-cd-burner/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/nautilus-cd-burner/debian/control.in?rev=15247&op=diff
==============================================================================
--- desktop/experimental/nautilus-cd-burner/debian/control.in (original)
+++ desktop/experimental/nautilus-cd-burner/debian/control.in Mon Mar 17 12:01:59 2008
@@ -8,19 +8,18 @@
intltool (>= 0.35.0),
autotools-dev,
libbonobo2-dev (>= 2.16),
- libnautilus-extension-dev (>= 2.15.3),
+ libnautilus-extension-dev (>= 2.21.5),
libgnomeui-dev (>= 2.16.0-2),
libhal-dev (>= 0.5.7) [!kfreebsd-i386 !kfreebsd-amd64],
libcam-dev [kfreebsd-i386 kfreebsd-amd64],
libgtk2.0-dev (>= 2.6.0),
libdbus-glib-1-dev (>= 0.60),
libeel2-dev (>= 2.13.3),
- libgnomevfs2-dev,
- libglib2.0-dev (>= 2.6.0),
+ libglib2.0-dev (>= 2.15.4),
libglade2-dev,
dpkg-dev (>= 1.13.19)
Uploaders: @GNOME_TEAM@
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
Package: nautilus-cd-burner
Architecture: any
@@ -30,6 +29,7 @@
${misc:Depends},
cdrdao,
nautilus,
+ nautilus-extensions-2.0,
dvd+rw-tools
Description: CD Burning front-end for Nautilus
Lets you burn CDs and DVDs easily with GNOME, by drag-and-dropping files in the
Added: desktop/experimental/nautilus-cd-burner/debian/libnautilus-burn4.shlibs
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/nautilus-cd-burner/debian/libnautilus-burn4.shlibs?rev=15247&op=file
==============================================================================
--- desktop/experimental/nautilus-cd-burner/debian/libnautilus-burn4.shlibs (added)
+++ desktop/experimental/nautilus-cd-burner/debian/libnautilus-burn4.shlibs Mon Mar 17 12:01:59 2008
@@ -1,0 +1,1 @@
+libnautilus-burn 4 libnautilus-burn4 (>= 2.22.0)
Modified: desktop/experimental/nautilus-cd-burner/debian/nautilus-cd-burner.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/nautilus-cd-burner/debian/nautilus-cd-burner.install?rev=15247&op=diff
==============================================================================
--- desktop/experimental/nautilus-cd-burner/debian/nautilus-cd-burner.install (original)
+++ desktop/experimental/nautilus-cd-burner/debian/nautilus-cd-burner.install Mon Mar 17 12:01:59 2008
@@ -1,7 +1,7 @@
debian/tmp/etc
debian/tmp/usr/bin
debian/tmp/usr/share
-debian/tmp/usr/lib/nautilus/extensions-1.0
+debian/tmp/usr/lib/nautilus/extensions-2.0
debian/tmp/usr/lib/nautilus-cd-burner
debian/tmp/usr/lib/gnome-vfs-2.0
src/.libs/list_cddrives usr/lib/nautilus-cd-burner
Modified: desktop/experimental/nautilus-cd-burner/debian/patches/03_wodim.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/nautilus-cd-burner/debian/patches/03_wodim.patch?rev=15247&op=diff
==============================================================================
--- desktop/experimental/nautilus-cd-burner/debian/patches/03_wodim.patch (original)
+++ desktop/experimental/nautilus-cd-burner/debian/patches/03_wodim.patch Mon Mar 17 12:01:59 2008
@@ -1,47 +1,47 @@
---- src/nautilus-burn-recorder.c.orig 2006-09-13 20:16:37.000000000 +0200
-+++ src/nautilus-burn-recorder.c 2006-09-13 20:21:37.000000000 +0200
-@@ -377,7 +377,7 @@
- int tmp;
+--- src/nautilus-burn-recorder.c.old 2008-03-17 12:52:06.000000000 +0100
++++ src/nautilus-burn-recorder.c 2008-03-17 12:52:46.000000000 +0100
+@@ -374,7 +374,7 @@
+ int tmp;
- if (line && process->debug) {
-- g_print ("cdrecord stdout: %s", line);
-+ g_print ("wodim stdout: %s", line);
- }
+ if (line && process->debug) {
+- g_print ("cdrecord stdout: %s", line);
++ g_print ("wodim stdout: %s", line);
+ }
- if (sscanf (line, "Track %2u: %d of %d MB written (fifo %d%%) [buf %d%%] %fx.",
-@@ -485,7 +485,7 @@
- NautilusBurnRecorder *recorder = data;
+ if (sscanf (line, "Track %2u: %d of %d MB written (fifo %d%%) [buf %d%%] %fx.",
+@@ -482,7 +482,7 @@
+ NautilusBurnRecorder *recorder = data;
- if (line && process->debug) {
-- g_print ("cdrecord blank stdout: %s", line);
-+ g_print ("wodim blank stdout: %s", line);
- }
+ if (line && process->debug) {
+- g_print ("cdrecord blank stdout: %s", line);
++ g_print ("wodim blank stdout: %s", line);
+ }
- if (g_str_has_prefix (line, "Re-load disk and hit <CR>") ||
-@@ -675,7 +675,7 @@
- NautilusBurnRecorder *recorder = data;
+ if (g_str_has_prefix (line, "Re-load disk and hit <CR>") ||
+@@ -674,7 +674,7 @@
+ NautilusBurnRecorder *recorder = data;
- if (line && process->debug) {
-- g_print ("cdrecord stderr: %s", line);
-+ g_print ("wodim stderr: %s", line);
- }
+ if (line && process->debug) {
+- g_print ("cdrecord stderr: %s", line);
++ g_print ("wodim stderr: %s", line);
+ }
- if (strstr (line, "No disk / Wrong disk!") != NULL) {
-@@ -1369,7 +1369,7 @@
- err_line_func = cdrdao_stderr_line;
- } else {
- argv = g_ptr_array_new ();
-- g_ptr_array_add (argv, "cdrecord");
-+ g_ptr_array_add (argv, "wodim");
+ if (strstr (line, "No disk / Wrong disk!") != NULL) {
+@@ -1372,7 +1372,7 @@
+ err_line_func = cdrdao_stderr_line;
+ } else {
+ argv = g_ptr_array_new ();
+- g_ptr_array_add (argv, "cdrecord");
++ g_ptr_array_add (argv, "wodim");
- g_ptr_array_add (argv, "fs=16m");
+ g_ptr_array_add (argv, "fs=16m");
-@@ -1486,7 +1486,7 @@
- }
+@@ -1489,7 +1489,7 @@
+ }
- argv = g_ptr_array_new ();
-- g_ptr_array_add (argv, "cdrecord");
-+ g_ptr_array_add (argv, "wodim");
+ argv = g_ptr_array_new ();
+- g_ptr_array_add (argv, "cdrecord");
++ g_ptr_array_add (argv, "wodim");
- dev_str = g_strdup_printf ("dev=%s", nautilus_burn_drive_get_device (drive));
- g_ptr_array_add (argv, dev_str);
+ dev_str = g_strdup_printf ("dev=%s", nautilus_burn_drive_get_device (drive));
+ g_ptr_array_add (argv, dev_str);
Modified: desktop/experimental/nautilus-cd-burner/debian/patches/04_readom.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/nautilus-cd-burner/debian/patches/04_readom.patch?rev=15247&op=diff
==============================================================================
--- desktop/experimental/nautilus-cd-burner/debian/patches/04_readom.patch (original)
+++ desktop/experimental/nautilus-cd-burner/debian/patches/04_readom.patch Mon Mar 17 12:01:59 2008
@@ -1,29 +1,29 @@
---- src/make-iso.c~ 2006-06-08 17:36:19.000000000 +0200
-+++ src/make-iso.c 2006-12-28 23:04:34.000000000 +0100
-@@ -740,7 +740,7 @@
- char *pos;
+--- src/make-iso.c.old 2008-03-17 12:53:29.000000000 +0100
++++ src/make-iso.c 2008-03-17 12:53:46.000000000 +0100
+@@ -719,7 +719,7 @@
+ char *pos;
- if (line && iso->priv->debug) {
-- g_print ("readcd stderr: %s", line);
-+ g_print ("readom stderr: %s", line);
- }
+ if (line && iso->priv->debug) {
+- g_print ("readcd stderr: %s", line);
++ g_print ("readom stderr: %s", line);
+ }
- pos = strstr (line, "addr:");
-@@ -1383,7 +1383,7 @@
- device_arg = g_strdup_printf ("-dev=%s", nautilus_burn_drive_get_device (drive));
+ pos = strstr (line, "addr:");
+@@ -1379,7 +1379,7 @@
+ device_arg = g_strdup_printf ("-dev=%s", nautilus_burn_drive_get_device (drive));
- argv = g_ptr_array_new ();
-- g_ptr_array_add (argv, "readcd");
-+ g_ptr_array_add (argv, "readom");
- g_ptr_array_add (argv, "-sectors=0-0");
- g_ptr_array_add (argv, device_arg);
- g_ptr_array_add (argv, "-f=/dev/null");
-@@ -1565,7 +1565,7 @@
- dev_arg = g_strdup_printf ("dev=%s", nautilus_burn_drive_get_device (drive));
+ argv = g_ptr_array_new ();
+- g_ptr_array_add (argv, "readcd");
++ g_ptr_array_add (argv, "readom");
+ g_ptr_array_add (argv, "-sectors=0-0");
+ g_ptr_array_add (argv, device_arg);
+ g_ptr_array_add (argv, "-f=/dev/null");
+@@ -1561,7 +1561,7 @@
+ dev_arg = g_strdup_printf ("dev=%s", nautilus_burn_drive_get_device (drive));
- argv = g_ptr_array_new ();
-- g_ptr_array_add (argv, "readcd");
-+ g_ptr_array_add (argv, "readom");
- g_ptr_array_add (argv, (char *)dev_arg);
- g_ptr_array_add (argv, (char *)filename_arg);
- g_ptr_array_add (argv, NULL);
+ argv = g_ptr_array_new ();
+- g_ptr_array_add (argv, "readcd");
++ g_ptr_array_add (argv, "readom");
+ g_ptr_array_add (argv, (char *)dev_arg);
+ g_ptr_array_add (argv, (char *)filename_arg);
+ g_ptr_array_add (argv, NULL);
Modified: desktop/experimental/nautilus-cd-burner/debian/patches/05_genisoimage.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/nautilus-cd-burner/debian/patches/05_genisoimage.patch?rev=15247&op=diff
==============================================================================
--- desktop/experimental/nautilus-cd-burner/debian/patches/05_genisoimage.patch (original)
+++ desktop/experimental/nautilus-cd-burner/debian/patches/05_genisoimage.patch Mon Mar 17 12:01:59 2008
@@ -1,81 +1,81 @@
---- src/nautilus-burn-recorder.c~ 2006-09-13 20:21:37.000000000 +0200
-+++ src/nautilus-burn-recorder.c 2007-01-07 14:25:44.000000000 +0100
+--- src/nautilus-burn-recorder.c.old 2008-03-17 12:54:43.000000000 +0100
++++ src/nautilus-burn-recorder.c 2008-03-17 12:55:17.000000000 +0100
@@ -1060,22 +1060,8 @@
static gboolean
ncb_mkisofs_supports_utf8 (void)
{
-- static gboolean first = TRUE;
-- static gboolean supported;
+- static gboolean first = TRUE;
+- static gboolean supported;
-
-- if (first) {
-- char *standard_error;
-- gboolean res;
-- res = g_spawn_command_line_sync ("mkisofs -input-charset utf8", NULL, &standard_error, NULL, NULL);
-- if (res && !g_strrstr (standard_error, "Unknown charset")) {
-- supported = TRUE;
-- } else {
-- supported = FALSE;
-- }
-- g_free (standard_error);
-- }
+- if (first) {
+- char *standard_error;
+- gboolean res;
+- res = g_spawn_command_line_sync ("mkisofs -input-charset utf8", NULL, &standard_error, NULL, NULL);
+- if (res && !g_strrstr (standard_error, "Unknown charset")) {
+- supported = TRUE;
+- } else {
+- supported = FALSE;
+- }
+- g_free (standard_error);
+- }
-
-- return supported;
+- return supported;
+ /* genisoimage always supports utf8 */
-+ return TRUE;
++ return TRUE;
}
static int
---- src/make-iso.c~ 2006-12-28 23:04:34.000000000 +0100
-+++ src/make-iso.c 2007-01-07 14:29:24.000000000 +0100
-@@ -858,22 +858,8 @@
+--- src/make-iso.c.old 2008-03-17 12:55:30.000000000 +0100
++++ src/make-iso.c 2008-03-17 12:56:24.000000000 +0100
+@@ -837,22 +837,8 @@
static gboolean
ncb_mkisofs_supports_utf8 (void)
{
-- static gboolean first = TRUE;
-- static gboolean supported;
+- static gboolean first = TRUE;
+- static gboolean supported;
-
-- if (first) {
-- char *standard_error;
-- gboolean res;
-- res = g_spawn_command_line_sync ("mkisofs -input-charset utf8", NULL, &standard_error, NULL, NULL);
-- if (res && !g_strrstr (standard_error, "Unknown charset")) {
-- supported = TRUE;
-- } else {
-- supported = FALSE;
-- }
-- g_free (standard_error);
-- }
+- if (first) {
+- char *standard_error;
+- gboolean res;
+- res = g_spawn_command_line_sync ("mkisofs -input-charset utf8", NULL, &standard_error, NULL, NULL);
+- if (res && !g_strrstr (standard_error, "Unknown charset")) {
+- supported = TRUE;
+- } else {
+- supported = FALSE;
+- }
+- g_free (standard_error);
+- }
-
-- return supported;
+- return supported;
+ /* genisoimage always supports utf8 */
-+ return TRUE;
++ return TRUE;
}
static char *
-@@ -992,7 +978,7 @@
- }
- argv = g_ptr_array_new ();
+@@ -972,7 +958,7 @@
+ }
+ argv = g_ptr_array_new ();
-- g_ptr_array_add (argv, "mkisofs");
-+ g_ptr_array_add (argv, "genisoimage");
- g_ptr_array_add (argv, "-r");
- if (_use_joliet) {
- g_ptr_array_add (argv, "-J");
-@@ -1146,7 +1132,7 @@
- utf8_filename = ncb_make_valid_utf8 (filename->str);
- msg = g_strdup_printf (_("Some files have invalid filenames: \n%s"), utf8_filename);
- if (iso->priv->debug) {
-- g_print ("mkisofs error: %s\n", msg);
-+ g_print ("genisoimage error: %s\n", msg);
- }
+- g_ptr_array_add (argv, "mkisofs");
++ g_ptr_array_add (argv, "genisoimage");
+ g_ptr_array_add (argv, "-r");
+ if (use_joliet) {
+ g_ptr_array_add (argv, "-J");
+@@ -1139,7 +1125,7 @@
+ utf8_filename = ncb_make_valid_utf8 (filename->str);
+ msg = g_strdup_printf (_("Some files have invalid filenames: \n%s"), utf8_filename);
+ if (iso->priv->debug) {
+- g_print ("mkisofs error: %s\n", msg);
++ g_print ("genisoimage error: %s\n", msg);
+ }
- process_error (iso, msg);
-@@ -1260,7 +1246,7 @@
- g_free (dirname);
+ process_error (iso, msg);
+@@ -1253,7 +1239,7 @@
+ }
- argv = g_ptr_array_new ();
-- g_ptr_array_add (argv, "mkisofs");
-+ g_ptr_array_add (argv, "genisoimage");
- g_ptr_array_add (argv, "-r");
- if (use_joliet) {
- g_ptr_array_add (argv, "-J");
+ argv = g_ptr_array_new ();
+- g_ptr_array_add (argv, "mkisofs");
++ g_ptr_array_add (argv, "genisoimage");
+ g_ptr_array_add (argv, "-r");
+ if (use_joliet) {
+ g_ptr_array_add (argv, "-J");
More information about the pkg-gnome-commits
mailing list