diff -Nru librsvg-2.40.18/debian/changelog librsvg-2.40.18/debian/changelog --- librsvg-2.40.18/debian/changelog 2017-07-21 08:18:29.000000000 +0000 +++ librsvg-2.40.18/debian/changelog 2017-10-21 02:52:52.000000000 +0000 @@ -1,3 +1,17 @@ +librsvg (2.40.18-2) unstable; urgency=medium + + * Drop Build-Depends on libgsf-1-dev. It's no longer needed with GIO 2.24. + * Mark the libgtk-3-dev Build-Depends as to make the source + package easier to bootstrap. This will skip the build of the rsvg-view-3 + binary which is not crucial for the functionality of the library package. + (Closes: #871535) + * Cherry-pick upstream fix to no longer pass deprecated --nogtkinit to + gtkdoc-scangobj. (Closes: #876615) + * Bump Standards-Version to 4.1.1. + * Bump debhelper compat level to 10 for automatic dh-autoreconf. + + -- Michael Biebl Sat, 21 Oct 2017 04:52:52 +0200 + librsvg (2.40.18-1) unstable; urgency=medium * New upstream release. diff -Nru librsvg-2.40.18/debian/compat librsvg-2.40.18/debian/compat --- librsvg-2.40.18/debian/compat 2015-05-19 22:29:12.000000000 +0000 +++ librsvg-2.40.18/debian/compat 2017-10-21 02:50:25.000000000 +0000 @@ -1 +1 @@ -9 +10 diff -Nru librsvg-2.40.18/debian/control librsvg-2.40.18/debian/control --- librsvg-2.40.18/debian/control 2017-07-21 08:18:29.000000000 +0000 +++ librsvg-2.40.18/debian/control 2017-10-21 02:52:52.000000000 +0000 @@ -6,16 +6,14 @@ Section: libs Priority: optional Maintainer: Debian GNOME Maintainers -Uploaders: Andreas Henriksson , Emilio Pozuelo Monfort , Iain Lane , Michael Biebl -Build-Depends: debhelper (>= 9), - dh-autoreconf (>= 4), +Uploaders: Emilio Pozuelo Monfort , Iain Lane , Michael Biebl +Build-Depends: debhelper (>= 10), libxml2-dev (>= 2.7.0), libglib2.0-dev (>= 2.24.0), libcairo2-dev (>= 1.2.0), libpango1.0-dev (>= 1.36.0), libgdk-pixbuf2.0-dev (>= 2.23.5-2), - libgtk-3-dev (>= 3.2.0), - libgsf-1-dev (>= 1.13.2-2), + libgtk-3-dev (>= 3.2.0) , gnome-pkg-tools (>= 0.10), libcroco3-dev (>= 0.6.1), gtk-doc-tools (>= 1.13), @@ -24,7 +22,7 @@ libglib2.0-doc, libcairo2-doc, valac (>= 0.17.5) -Standards-Version: 3.9.8 +Standards-Version: 4.1.1 Homepage: https://wiki.gnome.org/Projects/LibRsvg Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/librsvg Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/librsvg diff -Nru librsvg-2.40.18/debian/control.in librsvg-2.40.18/debian/control.in --- librsvg-2.40.18/debian/control.in 2016-06-13 19:04:43.000000000 +0000 +++ librsvg-2.40.18/debian/control.in 2017-10-21 02:50:31.000000000 +0000 @@ -3,15 +3,13 @@ Priority: optional Maintainer: Debian GNOME Maintainers Uploaders: @GNOME_TEAM@ -Build-Depends: debhelper (>= 9), - dh-autoreconf (>= 4), +Build-Depends: debhelper (>= 10), libxml2-dev (>= 2.7.0), libglib2.0-dev (>= 2.24.0), libcairo2-dev (>= 1.2.0), libpango1.0-dev (>= 1.36.0), libgdk-pixbuf2.0-dev (>= 2.23.5-2), - libgtk-3-dev (>= 3.2.0), - libgsf-1-dev (>= 1.13.2-2), + libgtk-3-dev (>= 3.2.0) , gnome-pkg-tools (>= 0.10), libcroco3-dev (>= 0.6.1), gtk-doc-tools (>= 1.13), @@ -20,7 +18,7 @@ libglib2.0-doc, libcairo2-doc, valac (>= 0.17.5) -Standards-Version: 3.9.8 +Standards-Version: 4.1.1 Homepage: https://wiki.gnome.org/Projects/LibRsvg Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/librsvg Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/librsvg diff -Nru librsvg-2.40.18/debian/patches/20_bgo-782098-Don-t-pass-deprecated-nogtkinit-to-gtkdoc.patch librsvg-2.40.18/debian/patches/20_bgo-782098-Don-t-pass-deprecated-nogtkinit-to-gtkdoc.patch --- librsvg-2.40.18/debian/patches/20_bgo-782098-Don-t-pass-deprecated-nogtkinit-to-gtkdoc.patch 1970-01-01 00:00:00.000000000 +0000 +++ librsvg-2.40.18/debian/patches/20_bgo-782098-Don-t-pass-deprecated-nogtkinit-to-gtkdoc.patch 2017-10-21 02:36:43.000000000 +0000 @@ -0,0 +1,35 @@ +From dfe34c8757debd07d4ef2f6f0381b2bcac1addc0 Mon Sep 17 00:00:00 2001 +From: Ting-Wei Lan +Date: Mon, 7 Aug 2017 21:43:10 -0500 +Subject: [PATCH] bgo#782098 - Don't pass deprecated --nogtkinit to + gtkdoc-scangobj + +--- + doc/Makefile.am | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/doc/Makefile.am b/doc/Makefile.am +index 5db7716..5decdda 100644 +--- a/doc/Makefile.am ++++ b/doc/Makefile.am +@@ -23,7 +23,7 @@ DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.xml + DOC_SOURCE_DIR = .. + + # Extra options to pass to gtkdoc-scangobj. Not normally needed. +-SCANGOBJ_OPTIONS = --nogtkinit --type-init-func="g_type_init ()" ++SCANGOBJ_OPTIONS = --type-init-func="g_type_init ()" + + # Extra options to supply to gtkdoc-scan. + # e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED" +@@ -96,7 +96,7 @@ HTML_IMAGES = + # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE). + # e.g. content_files=running.sgml building.sgml changes-2.0.sgml + content_files = \ +- version.xml ++ version.xml + + # SGML files where gtk-doc abbrevations (#GtkWidget) are expanded + # These files must be listed here *and* in content_files +-- +2.15.0.rc1 + diff -Nru librsvg-2.40.18/debian/patches/series librsvg-2.40.18/debian/patches/series --- librsvg-2.40.18/debian/patches/series 2016-06-13 19:07:23.000000000 +0000 +++ librsvg-2.40.18/debian/patches/series 2017-10-21 02:41:35.000000000 +0000 @@ -1 +1,2 @@ 10_rsvg-gz.patch +20_bgo-782098-Don-t-pass-deprecated-nogtkinit-to-gtkdoc.patch diff -Nru librsvg-2.40.18/debian/rules librsvg-2.40.18/debian/rules --- librsvg-2.40.18/debian/rules 2016-06-13 19:03:22.000000000 +0000 +++ librsvg-2.40.18/debian/rules 2017-10-21 02:51:17.000000000 +0000 @@ -5,7 +5,7 @@ export DEB_LDFLAGS_MAINT_APPEND = -Wl,-z,defs -Wl,-O1 -Wl,--as-needed %: - dh $@ --with autoreconf,gnome,gir + dh $@ --with gnome,gir override_dh_autoreconf: dh_autoreconf --as-needed