r11946 - in /packages/unstable/brasero/debian: changelog patches/000_cdrtools2cdrkit.patch patches/001_use-sys-inotify.h.patch patches/003_dont-run-update-desktop-database.patch patches/004_fix-windows-size.patch patches/series rules
otavio at users.alioth.debian.org
otavio at users.alioth.debian.org
Sat Jul 14 13:33:20 UTC 2007
Author: otavio
Date: Sat Jul 14 13:33:20 2007
New Revision: 11946
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=11946
Log:
* Converted to use quilt to manage its patches.
Added:
packages/unstable/brasero/debian/patches/series
Modified:
packages/unstable/brasero/debian/changelog
packages/unstable/brasero/debian/patches/000_cdrtools2cdrkit.patch
packages/unstable/brasero/debian/patches/001_use-sys-inotify.h.patch
packages/unstable/brasero/debian/patches/003_dont-run-update-desktop-database.patch
packages/unstable/brasero/debian/patches/004_fix-windows-size.patch
packages/unstable/brasero/debian/rules
Modified: packages/unstable/brasero/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/brasero/debian/changelog?rev=11946&op=diff
==============================================================================
--- packages/unstable/brasero/debian/changelog (original)
+++ packages/unstable/brasero/debian/changelog Sat Jul 14 13:33:20 2007
@@ -1,8 +1,9 @@
brasero (0.6.0-2) UNRELEASED; urgency=low
* Remove utils.mk from rules.
+ * Converted to use quilt to manage its patches.
- -- Otavio Salvador <otavio at ossystems.com.br> Sat, 14 Jul 2007 10:24:07 -0300
+ -- Otavio Salvador <otavio at ossystems.com.br> Sat, 14 Jul 2007 10:27:23 -0300
brasero (0.6.0-1) unstable; urgency=low
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=11946&op=diff
==============================================================================
--- packages/unstable/brasero/debian/patches/000_cdrtools2cdrkit.patch (original)
+++ packages/unstable/brasero/debian/patches/000_cdrtools2cdrkit.patch Sat Jul 14 13:33:20 2007
@@ -1,30 +1,28 @@
---- 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 @@
+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 @@
+ {
+ BraseroMkisofs *mkisofs;
BraseroBurnResult result;
+ gchar *prog_name;
- mkisofs = BRASERO_MKISOFS (process);
+ 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"));
---- 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;
+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
+@@ -597,6 +597,7 @@
+ BraseroReadcd *readcd;
+ gchar *outfile_arg;
+ gchar *dev_str;
+ gchar *prog_name;
readcd = BRASERO_READCD (process);
brasero_job_set_run_slave (BRASERO_JOB (readcd), FALSE);
-
+@@ -604,7 +605,12 @@
if (!readcd->priv->source)
BRASERO_JOB_NOT_READY (readcd);
@@ -36,5 +34,5 @@
+ 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=11946&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 Sat Jul 14 13:33:20 2007
@@ -1,7 +1,8 @@
-diff -urN brasero-0.4.4~/src/audio-disc.c brasero-0.4.4/src/audio-disc.c
---- brasero-0.4.4~/src/audio-disc.c 2006-09-07 17:47:40.000000000 +0200
-+++ brasero-0.4.4/src/audio-disc.c 2006-10-23 16:01:46.000000000 +0200
-@@ -76,7 +76,7 @@
+Index: brasero-0.6.0/src/audio-disc.c
+===================================================================
+--- brasero-0.6.0.orig/src/audio-disc.c 2007-07-14 10:32:01.000000000 -0300
++++ brasero-0.6.0/src/audio-disc.c 2007-07-14 10:32:17.000000000 -0300
+@@ -75,7 +75,7 @@
#ifdef BUILD_INOTIFY
#include "inotify.h"
@@ -9,12 +10,12 @@
+#include <sys/inotify.h>
#endif
- typedef void (*GetFileInfoAsyncResultFunc) (BraseroAudioDisc *disc,
-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,9 +65,9 @@
-
+ static void brasero_audio_disc_class_init (BraseroAudioDiscClass *klass);
+Index: brasero-0.6.0/src/data-disc.c
+===================================================================
+--- brasero-0.6.0.orig/src/data-disc.c 2007-07-14 10:32:01.000000000 -0300
++++ brasero-0.6.0/src/data-disc.c 2007-07-14 10:32:17.000000000 -0300
+@@ -81,7 +81,7 @@
#ifdef BUILD_INOTIFY
#include "inotify.h"
@@ -23,26 +24,27 @@
#endif
- #include "disc.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
-@@ -61,7 +61,6 @@
+Index: brasero-0.6.0/src/Makefile.am
+===================================================================
+--- brasero-0.6.0.orig/src/Makefile.am 2007-07-14 10:32:01.000000000 -0300
++++ brasero-0.6.0/src/Makefile.am 2007-07-14 10:32:17.000000000 -0300
+@@ -62,7 +62,6 @@
inotify.h \
metadata.c \
metadata.h \
- inotify-syscalls.h \
filtered-window.c \
filtered-window.h \
- project-size.c \
-diff -urN brasero-0.4.4~/src/Makefile.in brasero-0.4.4/src/Makefile.in
---- brasero-0.4.4~/src/Makefile.in 2006-09-07 17:48:00.000000000 +0200
-+++ brasero-0.4.4/src/Makefile.in 2006-10-23 16:01:33.000000000 +0200
-@@ -325,7 +325,6 @@
+ disc.c \
+Index: brasero-0.6.0/src/Makefile.in
+===================================================================
+--- brasero-0.6.0.orig/src/Makefile.in 2007-07-14 10:32:01.000000000 -0300
++++ brasero-0.6.0/src/Makefile.in 2007-07-14 10:32:17.000000000 -0300
+@@ -336,7 +336,6 @@
inotify.h \
metadata.c \
metadata.h \
- inotify-syscalls.h \
filtered-window.c \
filtered-window.h \
- project-size.c \
+ disc.c \
Modified: packages/unstable/brasero/debian/patches/003_dont-run-update-desktop-database.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/brasero/debian/patches/003_dont-run-update-desktop-database.patch?rev=11946&op=diff
==============================================================================
--- packages/unstable/brasero/debian/patches/003_dont-run-update-desktop-database.patch (original)
+++ packages/unstable/brasero/debian/patches/003_dont-run-update-desktop-database.patch Sat Jul 14 13:33:20 2007
@@ -1,7 +1,8 @@
-diff -urN brasero-0.4.4.orig/data/Makefile.am brasero-0.4.4/data/Makefile.am
---- brasero-0.4.4.orig/data/Makefile.am 2006-09-07 17:47:41.000000000 +0200
-+++ brasero-0.4.4/data/Makefile.am 2006-11-01 13:43:00.000000000 +0100
-@@ -65,8 +65,10 @@
+Index: brasero-0.6.0/data/Makefile.am
+===================================================================
+--- brasero-0.6.0.orig/data/Makefile.am 2007-07-14 10:32:01.000000000 -0300
++++ brasero-0.6.0/data/Makefile.am 2007-07-14 10:32:20.000000000 -0300
+@@ -40,8 +40,10 @@
fi
UPDATE_DESKTOP = \
@@ -13,11 +14,12 @@
+ fi \
fi
- UPDATE_ICONS = \
-diff -urN brasero-0.4.4.orig/data/Makefile.in brasero-0.4.4/data/Makefile.in
---- brasero-0.4.4.orig/data/Makefile.in 2006-09-07 17:48:00.000000000 +0200
-+++ brasero-0.4.4/data/Makefile.in 2006-11-01 13:42:53.000000000 +0100
-@@ -298,8 +298,10 @@
+ if GCONF_SCHEMAS_INSTALL
+Index: brasero-0.6.0/data/Makefile.in
+===================================================================
+--- brasero-0.6.0.orig/data/Makefile.in 2007-07-14 10:32:01.000000000 -0300
++++ brasero-0.6.0/data/Makefile.in 2007-07-14 10:32:20.000000000 -0300
+@@ -272,8 +272,10 @@
fi
UPDATE_DESKTOP = \
@@ -29,4 +31,4 @@
+ fi \
fi
- UPDATE_ICONS = \
+ all: all-recursive
Modified: packages/unstable/brasero/debian/patches/004_fix-windows-size.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/brasero/debian/patches/004_fix-windows-size.patch?rev=11946&op=diff
==============================================================================
--- packages/unstable/brasero/debian/patches/004_fix-windows-size.patch (original)
+++ packages/unstable/brasero/debian/patches/004_fix-windows-size.patch Sat Jul 14 13:33:20 2007
@@ -1,6 +1,8 @@
---- brasero-0.5.2/src/main.c 2007-02-25 06:28:12.000000000 -0300
-+++ /home/a/brasero-0.5.2/src/main.c 2007-08-01 17:55:56.000000000 -0300
-@@ -344,6 +344,7 @@
+Index: brasero-0.6.0/src/main.c
+===================================================================
+--- brasero-0.6.0.orig/src/main.c 2007-07-14 10:32:01.000000000 -0300
++++ brasero-0.6.0/src/main.c 2007-07-14 10:32:22.000000000 -0300
+@@ -350,6 +350,7 @@
GError *error = NULL;
GtkAccelGroup *accel_group;
GtkActionGroup *action_group;
@@ -8,7 +10,7 @@
/* New window */
app = g_new0 (BraseroApp, 1);
-@@ -400,6 +401,10 @@
+@@ -406,6 +407,10 @@
/* set up the window geometry */
gtk_window_set_position (GTK_WINDOW (app->mainwin), GTK_WIN_POS_CENTER);
Added: packages/unstable/brasero/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/brasero/debian/patches/series?rev=11946&op=file
==============================================================================
--- packages/unstable/brasero/debian/patches/series (added)
+++ packages/unstable/brasero/debian/patches/series Sat Jul 14 13:33:20 2007
@@ -1,0 +1,4 @@
+000_cdrtools2cdrkit.patch
+001_use-sys-inotify.h.patch
+003_dont-run-update-desktop-database.patch
+004_fix-windows-size.patch
Modified: packages/unstable/brasero/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/brasero/debian/rules?rev=11946&op=diff
==============================================================================
--- packages/unstable/brasero/debian/rules (original)
+++ packages/unstable/brasero/debian/rules Sat Jul 14 13:33:20 2007
@@ -3,7 +3,7 @@
# Copyright © 2004, 2005, 2006 Loic Minier <lool at dooz.org>
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/class/gnome.mk
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
More information about the pkg-gnome-commits
mailing list