r30050 - in /desktop/experimental/brasero/debian: ./ patches/

jeansch-guest at users.alioth.debian.org jeansch-guest at users.alioth.debian.org
Thu Oct 6 15:42:39 UTC 2011


Author: jeansch-guest
Date: Thu Oct  6 15:42:38 2011
New Revision: 30050

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=30050
Log:
* New upstream version
* debian/patches:
  - Removed debian/patches/01_libtracker-sparql-0.10.patch (fixed upstream)
* debian/rules:
  - Fixed usage of --enable-search configure option (does not accept =tracker)
  - Enabled introspection
* debian/*.install
  - Removed omf/
  - Enabled introspection
* debian/control.in:
  - Updated dependencies

Added:
    desktop/experimental/brasero/debian/gir1.2-brasero-3.0.install
    desktop/experimental/brasero/debian/patches/01_gcc-format-security-commit
    desktop/experimental/brasero/debian/patches/02_gcc-format-security
Removed:
    desktop/experimental/brasero/debian/patches/01_libtracker-sparql-0.10.patch
Modified:
    desktop/experimental/brasero/debian/brasero-common.install
    desktop/experimental/brasero/debian/changelog
    desktop/experimental/brasero/debian/control
    desktop/experimental/brasero/debian/control.in
    desktop/experimental/brasero/debian/libbrasero-media3-dev.install
    desktop/experimental/brasero/debian/patches/series
    desktop/experimental/brasero/debian/rules

Modified: desktop/experimental/brasero/debian/brasero-common.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/brasero/debian/brasero-common.install?rev=30050&op=diff
==============================================================================
--- desktop/experimental/brasero/debian/brasero-common.install [utf-8] (original)
+++ desktop/experimental/brasero/debian/brasero-common.install [utf-8] Thu Oct  6 15:42:38 2011
@@ -3,6 +3,5 @@
 usr/share/locale
 usr/share/mime
 usr/share/brasero
-usr/share/omf
 usr/share/GConf
 usr/share/glib-2.0

Modified: desktop/experimental/brasero/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/brasero/debian/changelog?rev=30050&op=diff
==============================================================================
--- desktop/experimental/brasero/debian/changelog [utf-8] (original)
+++ desktop/experimental/brasero/debian/changelog [utf-8] Thu Oct  6 15:42:38 2011
@@ -1,3 +1,19 @@
+brasero (3.2.0-1) UNRELEASED; urgency=low
+
+  * New upstream version
+  * debian/patches:
+    - Removed debian/patches/01_libtracker-sparql-0.10.patch (fixed upstream)
+  * debian/rules:
+    - Fixed usage of --enable-search configure option (does not accept =tracker)
+    - Enabled introspection
+  * debian/*.install
+    - Removed omf/
+    - Enabled introspection
+  * debian/control.in:
+    - Updated dependencies
+
+ -- Jean Schurger <jean at schurger.org>  Thu, 06 Oct 2011 10:02:52 -0400
+
 brasero (3.0.0-4) UNRELEASED; urgency=low
 
   * debian/control.in: Update Vcs-* fields

Modified: desktop/experimental/brasero/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/brasero/debian/control?rev=30050&op=diff
==============================================================================
--- desktop/experimental/brasero/debian/control [utf-8] (original)
+++ desktop/experimental/brasero/debian/control [utf-8] Thu Oct  6 15:42:38 2011
@@ -17,7 +17,7 @@
                gtk-doc-tools (>= 1.12),
                pkg-config,
                libcam-dev [kfreebsd-any],
-               libglib2.0-dev (>= 2.28.0),
+               libglib2.0-dev (>= 2.29.14),
                libgconf2-dev (>= 2.32.0),
                libgstreamer0.10-dev (>= 0.10.15),
                libgstreamer-plugins-base0.10-dev (>= 0.10.0),
@@ -34,6 +34,9 @@
                libtracker-sparql-0.10-dev (>= 0.10.0),
                libtotem-plparser-dev (>= 2.32),
                libunique-dev (>= 1.0.0),
+               libnotify-dev (>= 0.6.1),
+               gobject-introspection (>= 0.6.3),
+               libgirepository1.0-dev (>= 0.6.3),
                intltool (>= 0.35.0)
 Standards-Version: 3.9.2
 Homepage: http://www.gnome.org/projects/brasero/
@@ -132,3 +135,15 @@
  media.
  .
  This package contains the development headers and API documentation.
+
+Package: gir1.2-brasero-3.0
+Architecture: any
+Depends: ${gir:Depends},
+         ${misc:Depends},
+         ${shlibs:Depends}
+Description: CD/DVD burning library for GNOME - GObject introspection data
+ This package contains introspection data for the GNOME CD/DVD burning library
+ .
+ It can be used by packages using the GIRepository format to generate
+ dynamic bindings.
+

Modified: desktop/experimental/brasero/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/brasero/debian/control.in?rev=30050&op=diff
==============================================================================
--- desktop/experimental/brasero/debian/control.in [utf-8] (original)
+++ desktop/experimental/brasero/debian/control.in [utf-8] Thu Oct  6 15:42:38 2011
@@ -12,7 +12,7 @@
                gtk-doc-tools (>= 1.12),
                pkg-config,
                libcam-dev [kfreebsd-any],
-               libglib2.0-dev (>= 2.28.0),
+               libglib2.0-dev (>= 2.29.14),
                libgconf2-dev (>= 2.32.0),
                libgstreamer0.10-dev (>= 0.10.15),
                libgstreamer-plugins-base0.10-dev (>= 0.10.0),
@@ -29,6 +29,9 @@
                libtracker-sparql-0.10-dev (>= 0.10.0),
                libtotem-plparser-dev (>= 2.32),
                libunique-dev (>= 1.0.0),
+               libnotify-dev (>= 0.6.1),
+               gobject-introspection (>= 0.6.3),
+               libgirepository1.0-dev (>= 0.6.3),
                intltool (>= 0.35.0)
 Standards-Version: 3.9.2
 Homepage: http://www.gnome.org/projects/brasero/
@@ -127,3 +130,15 @@
  media.
  .
  This package contains the development headers and API documentation.
+
+Package: gir1.2-brasero-3.0
+Architecture: any
+Depends: ${gir:Depends},
+         ${misc:Depends},
+         ${shlibs:Depends}
+Description: CD/DVD burning library for GNOME - GObject introspection data
+ This package contains introspection data for the GNOME CD/DVD burning library
+ .
+ It can be used by packages using the GIRepository format to generate
+ dynamic bindings.
+

Added: desktop/experimental/brasero/debian/gir1.2-brasero-3.0.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/brasero/debian/gir1.2-brasero-3.0.install?rev=30050&op=file
==============================================================================
--- desktop/experimental/brasero/debian/gir1.2-brasero-3.0.install (added)
+++ desktop/experimental/brasero/debian/gir1.2-brasero-3.0.install [utf-8] Thu Oct  6 15:42:38 2011
@@ -1,0 +1,1 @@
+usr/lib/girepository-1.0

Modified: desktop/experimental/brasero/debian/libbrasero-media3-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/brasero/debian/libbrasero-media3-dev.install?rev=30050&op=diff
==============================================================================
--- desktop/experimental/brasero/debian/libbrasero-media3-dev.install [utf-8] (original)
+++ desktop/experimental/brasero/debian/libbrasero-media3-dev.install [utf-8] Thu Oct  6 15:42:38 2011
@@ -2,3 +2,4 @@
 usr/lib/*.so
 usr/include
 usr/share/gtk-doc
+usr/share/gir-1.0

Added: desktop/experimental/brasero/debian/patches/01_gcc-format-security-commit
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/brasero/debian/patches/01_gcc-format-security-commit?rev=30050&op=file
==============================================================================
--- desktop/experimental/brasero/debian/patches/01_gcc-format-security-commit (added)
+++ desktop/experimental/brasero/debian/patches/01_gcc-format-security-commit [utf-8] Thu Oct  6 15:42:38 2011
@@ -1,0 +1,27 @@
+Description: fix build break with -Werror=format-security
+Bug: b-g-o #661091
+Commit: http://git.gnome.org/browse/brasero/commit/?id=aed9f316002b230e7bf22f2e6102367f72b5dab6
+diff --git a/plugins/libburnia/burn-libburn-common.c b/plugins/libburnia/burn-libburn-common.c
+index 7bc37d2..1274930 100644
+--- a/plugins/libburnia/burn-libburn-common.c
++++ b/plugins/libburnia/burn-libburn-common.c
+@@ -222,6 +222,7 @@ brasero_libburn_common_process_message (BraseroJob *self)
+ 	BRASERO_JOB_LOG (self, "Libburn reported an error %s", err_txt);
+ 	error = g_error_new (BRASERO_BURN_ERROR,
+ 			     BRASERO_BURN_ERROR_GENERAL,
++			     "%s",
+ 			     err_txt);
+ 	brasero_job_error (BRASERO_JOB (self), error);
+ 	return FALSE;
+diff --git a/plugins/libburnia/burn-libburn.c b/plugins/libburnia/burn-libburn.c
+index 6cf25fa..41bb9a3 100644
+--- a/plugins/libburnia/burn-libburn.c
++++ b/plugins/libburnia/burn-libburn.c
+@@ -564,6 +564,7 @@ brasero_libburn_start_record (BraseroLibburn *self,
+ 		g_set_error (error,
+ 			     BRASERO_BURN_ERROR,
+ 			     BRASERO_BURN_ERROR_GENERAL,
++			     "%s",
+ 			     reason);
+ 		return BRASERO_BURN_ERR;
+ 	}

Added: desktop/experimental/brasero/debian/patches/02_gcc-format-security
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/brasero/debian/patches/02_gcc-format-security?rev=30050&op=file
==============================================================================
--- desktop/experimental/brasero/debian/patches/02_gcc-format-security (added)
+++ desktop/experimental/brasero/debian/patches/02_gcc-format-security [utf-8] Thu Oct  6 15:42:38 2011
@@ -1,0 +1,37 @@
+Description: fix build break with -Werror=format-security
+Bug: b-g-o #661091
+Index: brasero-3.2.0/plugins/libburnia/burn-libisofs.c
+===================================================================
+--- brasero-3.2.0.orig/plugins/libburnia/burn-libisofs.c	2011-09-27 05:19:01.000000000 -0400
++++ brasero-3.2.0/plugins/libburnia/burn-libisofs.c	2011-10-06 10:29:43.694973360 -0400
+@@ -219,7 +219,7 @@
+ 	if (read_bytes == -1 && !priv->error)
+ 		priv->error = g_error_new (BRASERO_BURN_ERROR,
+ 					   BRASERO_BURN_ERROR_GENERAL,
+-					   _("Volume could not be created"));
++					   "%s", _("Volume could not be created"));
+ }
+ 
+ static void
+@@ -567,7 +567,7 @@
+ 	brasero_job_get_data_label (BRASERO_JOB (self), &label);
+ 	if (!iso_image_new (label, &image)) {
+ 		priv->error = g_error_new (BRASERO_BURN_ERROR,
+-					   BRASERO_BURN_ERROR_GENERAL,
++					   BRASERO_BURN_ERROR_GENERAL, "%s",
+ 					   _("Volume could not be created"));
+ 		g_free (label);
+ 		goto end;
+Index: brasero-3.2.0/plugins/transcode/burn-transcode.c
+===================================================================
+--- brasero-3.2.0.orig/plugins/transcode/burn-transcode.c	2011-09-27 05:19:01.000000000 -0400
++++ brasero-3.2.0/plugins/transcode/burn-transcode.c	2011-10-06 10:31:02.189967994 -0400
+@@ -1346,7 +1346,7 @@
+ 	if (duration == -1 || duration == 0)	
+ 	    brasero_job_error (BRASERO_JOB (transcode),
+ 			       g_error_new (BRASERO_BURN_ERROR,
+-					    BRASERO_BURN_ERROR_GENERAL,
++					    BRASERO_BURN_ERROR_GENERAL, "%s",
+ 					    _("Error while getting duration")));
+ 	return duration;
+ }

Modified: desktop/experimental/brasero/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/brasero/debian/patches/series?rev=30050&op=diff
==============================================================================
--- desktop/experimental/brasero/debian/patches/series [utf-8] (original)
+++ desktop/experimental/brasero/debian/patches/series [utf-8] Thu Oct  6 15:42:38 2011
@@ -1,1 +1,2 @@
-01_libtracker-sparql-0.10.patch
+01_gcc-format-security-commit
+02_gcc-format-security

Modified: desktop/experimental/brasero/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/brasero/debian/rules?rev=30050&op=diff
==============================================================================
--- desktop/experimental/brasero/debian/rules [utf-8] (original)
+++ desktop/experimental/brasero/debian/rules [utf-8] Thu Oct  6 15:42:38 2011
@@ -20,8 +20,8 @@
 	--disable-cdrtools \
 	--disable-scrollkeeper \
 	--disable-caches \
-	--enable-search=tracker \
-	--disable-introspection
+	--enable-search \
+        --enable-introspection
 
 DEB_MAKE_EXTRA_ARGS += BRASERO_PLUGIN_DIRECTORY=/usr/lib/brasero$(SOVERSION)/plugins
 




More information about the pkg-gnome-commits mailing list