=== modified file 'debian/changelog' --- debian/changelog 2011-08-03 13:39:09 +0000 +++ debian/changelog 2012-01-18 04:29:30 +0000 @@ -1,3 +1,15 @@ +librsvg (2.35.0-1) precise; urgency=low + + * New upstream release. + * Updated debian/patches/10_rsvg-gz.patch to apply. + * Removed debian/patches/g_const_return.patch, merged upstream. + * Removed debian/patches/no_null_crash.patch, merged upstream. + * debian/watch: Switch to .xz tarballs. + * debian/librsvg2-2.symbols: added new symbol. + * debian/control.in: removed unnecessary dependencies. + + -- Robert Roth Wed, 18 Jan 2012 05:10:45 +0200 + librsvg (2.34.0-1ubuntu2) oneiric; urgency=low * debian/patches/g_const_return.patch: === modified file 'debian/control.in' --- debian/control.in 2011-06-11 06:47:02 +0000 +++ debian/control.in 2012-01-18 03:47:56 +0000 @@ -6,12 +6,9 @@ Uploaders: @GNOME_TEAM@ Build-Depends: cdbs, debhelper (>= 8), - libfreetype6-dev, - libfontconfig1-dev (>= 1.0.1), libxml2-dev (>= 2.6.22), libglib2.0-dev (>= 2.24.0), libcairo2-dev (>= 1.2.0), - libpango1.0-dev (>= 1.10.0), libgdk-pixbuf2.0-dev (>= 2.21.6), libgtk2.0-dev (>= 2.21.5), libgtk-3-dev, === modified file 'debian/librsvg2-2.symbols' --- debian/librsvg2-2.symbols 2011-05-05 15:50:14 +0000 +++ debian/librsvg2-2.symbols 2012-01-18 03:19:53 +0000 @@ -3,6 +3,7 @@ _rsvg_acquire_xlink_href_resource@Base 2.14.4 _rsvg_register_types@Base 2.18.2 _rsvg_size_callback@Base 2.14.4 + rsvg_cleanup@Base 2.35.0 rsvg_cairo_to_pixbuf@Base 2.32.0 rsvg_css_parse_color@Base 2.26.0 rsvg_defs_lookup@Base 2.32.0 === modified file 'debian/librsvg2-bin.install' --- debian/librsvg2-bin.install 2011-06-11 06:47:02 +0000 +++ debian/librsvg2-bin.install 2012-01-18 03:16:44 +0000 @@ -1,3 +1,2 @@ usr/share/man usr/bin -usr/share/pixmaps === modified file 'debian/patches/10_rsvg-gz.patch' --- debian/patches/10_rsvg-gz.patch 2011-05-05 15:50:14 +0000 +++ debian/patches/10_rsvg-gz.patch 2012-01-18 03:12:04 +0000 @@ -1,8 +1,8 @@ --- a/rsvg-gobject.c +++ b/rsvg-gobject.c -@@ -369,3 +369,9 @@ - { - return RSVG_HANDLE (g_object_new (RSVG_TYPE_HANDLE, NULL)); +@@ -390,3 +390,9 @@ + "flags", flags, + NULL); } + +RsvgHandle * @@ -12,7 +12,7 @@ +} --- a/librsvg.def +++ b/librsvg.def -@@ -7,6 +7,7 @@ +@@ -8,6 +8,7 @@ rsvg_handle_set_dpi rsvg_handle_set_dpi_x_y rsvg_handle_new === removed file 'debian/patches/g_const_return.patch' --- debian/patches/g_const_return.patch 2011-08-03 13:39:09 +0000 +++ debian/patches/g_const_return.patch 1970-01-01 00:00:00 +0000 @@ -1,102 +0,0 @@ -From 01c1c36070184d67f4e0b925acf82a0c0a509558 Mon Sep 17 00:00:00 2001 -From: Javier Jardón -Date: Thu, 09 Jun 2011 16:21:03 +0000 -Subject: Use "const" instead G_CONST_RETURN - -https://bugzilla.gnome.org/show_bug.cgi?id=652213 ---- -diff --git a/rsvg-base.c b/rsvg-base.c -index 6d7a5c3..9fd065a 100644 ---- a/rsvg-base.c -+++ b/rsvg-base.c -@@ -1102,7 +1102,7 @@ rsvg_handle_set_base_gfile (RsvgHandle *handle, - * Returns: the base uri, possibly null - * Since: 2.8 - */ --G_CONST_RETURN char * -+const char * - rsvg_handle_get_base_uri (RsvgHandle * handle) - { - g_return_val_if_fail (handle, NULL); -@@ -1246,7 +1246,7 @@ rsvg_drawing_ctx_free (RsvgDrawingCtx * handle) - * - * Since: 2.9 - */ --G_CONST_RETURN char * -+const char * - rsvg_handle_get_metadata (RsvgHandle * handle) - { - g_return_val_if_fail (handle, NULL); -@@ -1268,7 +1268,7 @@ rsvg_handle_get_metadata (RsvgHandle * handle) - * - * Since: 2.4 - */ --G_CONST_RETURN char * -+const char * - rsvg_handle_get_title (RsvgHandle * handle) - { - g_return_val_if_fail (handle, NULL); -@@ -1290,7 +1290,7 @@ rsvg_handle_get_title (RsvgHandle * handle) - * - * Since: 2.4 - */ --G_CONST_RETURN char * -+const char * - rsvg_handle_get_desc (RsvgHandle * handle) - { - g_return_val_if_fail (handle, NULL); -diff --git a/rsvg-private.h b/rsvg-private.h -index 85bd7ac..288c2de 100644 ---- a/rsvg-private.h -+++ b/rsvg-private.h -@@ -275,7 +275,7 @@ typedef void (*RsvgPropertyBagEnumFunc) (const char *key, const char *value, gpo - RsvgPropertyBag *rsvg_property_bag_new (const char **atts); - RsvgPropertyBag *rsvg_property_bag_ref (RsvgPropertyBag * bag); - void rsvg_property_bag_free (RsvgPropertyBag * bag); --G_CONST_RETURN char *rsvg_property_bag_lookup (RsvgPropertyBag * bag, const char *key); -+const char *rsvg_property_bag_lookup (RsvgPropertyBag * bag, const char *key); - guint rsvg_property_bag_size (RsvgPropertyBag * bag); - void rsvg_property_bag_enumerate (RsvgPropertyBag * bag, RsvgPropertyBagEnumFunc func, - gpointer user_data); -diff --git a/rsvg-styles.c b/rsvg-styles.c -index 7498ec9..13b952e 100644 ---- a/rsvg-styles.c -+++ b/rsvg-styles.c -@@ -1557,7 +1557,7 @@ rsvg_property_bag_free (RsvgPropertyBag * bag) - g_hash_table_unref (bag); - } - --G_CONST_RETURN char * -+const char * - rsvg_property_bag_lookup (RsvgPropertyBag * bag, const char *key) - { - return (const char *) g_hash_table_lookup (bag, (gconstpointer) key); -diff --git a/rsvg.h b/rsvg.h -index 41c4127..13e0838 100644 ---- a/rsvg.h -+++ b/rsvg.h -@@ -126,8 +126,8 @@ gboolean rsvg_handle_close (RsvgHandle * handle, GError ** error); - GdkPixbuf *rsvg_handle_get_pixbuf (RsvgHandle * handle); - GdkPixbuf *rsvg_handle_get_pixbuf_sub (RsvgHandle * handle, const char *id); - --G_CONST_RETURN char *rsvg_handle_get_base_uri (RsvgHandle * handle); --void rsvg_handle_set_base_uri (RsvgHandle * handle, const char *base_uri); -+const char *rsvg_handle_get_base_uri (RsvgHandle * handle); -+void rsvg_handle_set_base_uri (RsvgHandle * handle, const char *base_uri); - - void rsvg_handle_get_dimensions (RsvgHandle * handle, RsvgDimensionData * dimension_data); - -@@ -163,9 +163,9 @@ RsvgHandle *rsvg_handle_new_from_stream_sync (GInputStream *input_stream, - - /* Accessibility API */ - --G_CONST_RETURN char *rsvg_handle_get_title (RsvgHandle * handle); --G_CONST_RETURN char *rsvg_handle_get_desc (RsvgHandle * handle); --G_CONST_RETURN char *rsvg_handle_get_metadata (RsvgHandle * handle); -+const char *rsvg_handle_get_title (RsvgHandle * handle); -+const char *rsvg_handle_get_desc (RsvgHandle * handle); -+const char *rsvg_handle_get_metadata (RsvgHandle * handle); - - RsvgHandle *rsvg_handle_new_from_data (const guint8 * data, gsize data_len, GError ** error); - RsvgHandle *rsvg_handle_new_from_file (const gchar * file_name, GError ** error); - === removed file 'debian/patches/no_null_crash.patch' --- debian/patches/no_null_crash.patch 2011-05-24 13:27:01 +0000 +++ debian/patches/no_null_crash.patch 1970-01-01 00:00:00 +0000 @@ -1,17 +0,0 @@ -# Description: don't crash on corrupted svg -# Ubuntu: https://bugs.launchpad.net/librsvg/+bug/608026 -# Upstream: https://bugzilla.gnome.org/show_bug.cgi?id=626559 -=== modified file 'rsvg-paint-server.c' -Index: librsvg-2.32.1/rsvg-paint-server.c -=================================================================== ---- librsvg-2.32.1.orig/rsvg-paint-server.c 2010-05-31 07:21:34.000000000 +1000 -+++ librsvg-2.32.1/rsvg-paint-server.c 2010-11-16 09:30:22.813990003 +1100 -@@ -118,7 +118,7 @@ - guint32 rgb; - if (inherit != NULL) - *inherit = 1; -- if (!strcmp (str, "none")) -+ if (str == NULL || !strcmp (str, "none")) - return NULL; - - name = rsvg_get_url_string (str); === modified file 'debian/patches/series' --- debian/patches/series 2011-08-03 13:39:09 +0000 +++ debian/patches/series 2012-01-18 03:13:11 +0000 @@ -1,4 +1,2 @@ 10_rsvg-gz.patch 99_ltmain_as-needed.patch -no_null_crash.patch -g_const_return.patch === modified file 'debian/watch' --- debian/watch 2011-06-11 06:47:02 +0000 +++ debian/watch 2012-01-18 03:11:30 +0000 @@ -1,2 +1,2 @@ version=3 -http://ftp.gnome.org/pub/gnome/sources/librsvg/([\d\.]+)[02468]/librsvg-([\d\.]+)\.tar\.bz2 +http://ftp.gnome.org/pub/gnome/sources/librsvg/([\d\.]+)/librsvg-([\d\.]+)\.tar\.xz