r44103 - in /desktop/experimental/librsvg/debian: changelog control patches/20_rsvg_compat.patch

[laney at users.alioth.debian.org]

Author: laney
Date: Wed Feb 18 14:35:07 2015
New Revision: 44103

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=44103
Log:
New upstream release 2.40.7

Modified:
    desktop/experimental/librsvg/debian/changelog
    desktop/experimental/librsvg/debian/control
    desktop/experimental/librsvg/debian/patches/20_rsvg_compat.patch

Modified: desktop/experimental/librsvg/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/librsvg/debian/changelog?rev=44103&op=diff
==============================================================================
--- desktop/experimental/librsvg/debian/changelog	[utf-8] (original)
+++ desktop/experimental/librsvg/debian/changelog	[utf-8] Wed Feb 18 14:35:07 2015
@@ -1,3 +1,10 @@
+librsvg (2.40.7-1) UNRELEASED; urgency=medium
+
+  * New upstream release 2.40.7, fixing bugs detected by fuzz testing.
+  * Refresh debian/patches/20_rsvg_compat.patch to apply cleanly
+
+ -- Iain Lane <laney at debian.org>  Wed, 18 Feb 2015 12:46:29 +0000
+
 librsvg (2.40.6-1) experimental; urgency=medium
 
   * New upstream release 2.40.6.

Modified: desktop/experimental/librsvg/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/librsvg/debian/control?rev=44103&op=diff
==============================================================================
--- desktop/experimental/librsvg/debian/control	[utf-8] (original)
+++ desktop/experimental/librsvg/debian/control	[utf-8] Wed Feb 18 14:35:07 2015
@@ -6,7 +6,7 @@
 Section: libs
 Priority: optional
 Maintainer: Josselin Mouette <joss at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Michael Biebl <biebl at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Iain Lane <laney at debian.org>, Michael Biebl <biebl at debian.org>
 Build-Depends: cdbs (>= 0.4.93),
                debhelper (>= 8.1.3),
                dh-autoreconf (>= 4),

Modified: desktop/experimental/librsvg/debian/patches/20_rsvg_compat.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/librsvg/debian/patches/20_rsvg_compat.patch?rev=44103&op=diff
==============================================================================
--- desktop/experimental/librsvg/debian/patches/20_rsvg_compat.patch	[utf-8] (original)
+++ desktop/experimental/librsvg/debian/patches/20_rsvg_compat.patch	[utf-8] Wed Feb 18 14:35:07 2015
@@ -1,17 +1,17 @@
-Index: librsvg-2.40.3/rsvg-convert.c
+Index: b/rsvg-convert.c
 ===================================================================
---- librsvg-2.40.3.orig/rsvg-convert.c	2014-08-19 01:55:20.857179988 +0200
-+++ librsvg-2.40.3/rsvg-convert.c	2014-08-19 01:55:20.853179920 +0200
-@@ -115,6 +115,8 @@
+--- a/rsvg-convert.c
++++ b/rsvg-convert.c
+@@ -125,6 +125,8 @@
      RsvgHandleFlags flags = RSVG_HANDLE_FLAGS_NONE;
      RsvgDimensionData dimensions;
      FILE *output_file = stdout;
 +    char *basename;
 +    gboolean rsvg_compat = FALSE;
  
-     GOptionEntry options_table[] = {
-         {"dpi-x", 'd', 0, G_OPTION_ARG_DOUBLE, &dpi_x,
-@@ -168,6 +170,27 @@
+ #ifdef G_OS_WIN32
+     HANDLE handle;
+@@ -182,6 +184,27 @@
          return 0;
      }
  
@@ -39,7 +39,7 @@
      if (output != NULL) {
          output_file = fopen (output, "wb");
          if (!output_file) {
-@@ -179,10 +202,6 @@
+@@ -193,10 +216,6 @@
          g_free (output);
      }