--- Begin Message ---
Source: librsvg
Version: 2.34.0-1
Tags: patch
User: [email protected]
Usertags: ubuntu-patch origin-ubuntu
Hi folks,
Please find attached a patch to librsvg to transition it to use of the
multiarch library paths as described at
<http://wiki.debian.org/Multiarch/Implementation>.
Thanks,
--
Steve Langasek Give me a lever long enough and a Free OS
Debian Developer to set it on, and I can move the world.
Ubuntu Developer http://www.debian.org/
[email protected] [email protected]
diff -Nru librsvg-2.34.0/debian/changelog librsvg-2.34.0/debian/changelog
--- librsvg-2.34.0/debian/changelog 2011-06-06 14:56:53.000000000 +0000
+++ librsvg-2.34.0/debian/changelog 2011-07-17 10:23:33.000000000 +0000
@@ -1,3 +1,16 @@
+librsvg (2.34.0-1.1) UNRELEASED; urgency=low
+
+ * Non-maintainer upload.
+ * Build for multiarch.
+ * Add a versioned build-depends on libgdk-pixbuf2.0-dev to pick up the
+ new preferred loader path, and declare a breaks: on older versions of
+ gdk-pixbuf which won't look in this directory.
+ * Declare a breaks on libgtk2.0-0 for the same reason, though this
+ version number is still speculative since gtk+2.0 has not yet been
+ transitioned for multiarch (bug #634118)
+
+ -- Steve Langasek <[email protected]> Sun, 17 Jul 2011 10:12:13 +0000
+
librsvg (2.34.0-1) unstable; urgency=low
* New upstream release.
diff -Nru librsvg-2.34.0/debian/control librsvg-2.34.0/debian/control
--- librsvg-2.34.0/debian/control 2011-06-06 15:05:35.000000000 +0000
+++ librsvg-2.34.0/debian/control 2011-07-17 10:23:58.000000000 +0000
@@ -8,15 +8,15 @@
Priority: optional
Maintainer: Josselin Mouette <[email protected]>
Uploaders: David Weinehall <[email protected]>, Debian GNOME Maintainers <[email protected]>, Emilio Pozuelo Monfort <[email protected]>, Michael Biebl <[email protected]>, Sebastian Dröge <[email protected]>
-Build-Depends: cdbs,
- debhelper (>= 8),
+Build-Depends: cdbs (>= 0.4.93),
+ debhelper (>= 8.1.3),
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),
+ libgdk-pixbuf2.0-dev (>= 2.23.5-2),
libgtk2.0-dev (>= 2.21.5),
libgsf-1-dev (>= 1.13.2-2),
gnome-pkg-tools (>= 0.10),
@@ -40,6 +40,7 @@
libgdk-pixbuf2.0-dev (>= 2.21.6),
libcairo2-dev (>= 1.2.0),
libgtk2.0-dev (>= 2.21.5)
+Multi-Arch: same
Description: SAX-based renderer library for SVG files (development)
The rsvg library is an efficient renderer for Scalable Vector Graphics
(SVG) pictures.
@@ -53,6 +54,8 @@
Depends: ${misc:Depends},
${shlibs:Depends}
Suggests: librsvg2-bin
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Description: SAX-based renderer library for SVG files (runtime)
The rsvg library is an efficient renderer for Scalable Vector Graphics
(SVG) pictures.
@@ -66,6 +69,8 @@
Depends: ${misc:Depends},
${shlibs:Depends},
librsvg2-2 (= ${binary:Version})
+Breaks: libgdk-pixbuf2.0-0 (<< 2.23.5-2), libgtk2.0-0 (<< 2.24.5-3)
+Multi-Arch: same
Description: SAX-based renderer library for SVG files (extra runtime)
The rsvg library is an efficient renderer for Scalable Vector Graphics
(SVG) pictures.
@@ -80,6 +85,7 @@
Depends: ${misc:Depends},
${shlibs:Depends},
librsvg2-2 (= ${binary:Version})
+Multi-Arch: same
Description: SAX-based renderer library for SVG files (debug)
The rsvg library is an efficient renderer for Scalable Vector Graphics
(SVG) pictures.
@@ -93,6 +99,7 @@
${shlibs:Depends},
${python:Depends},
librsvg2-2 (>= ${binary:Version})
+Multi-Arch: foreign
Description: command-line and graphical viewers for SVG files
The rsvg library is an efficient renderer for Scalable Vector Graphics
(SVG) pictures.
diff -Nru librsvg-2.34.0/debian/control.in librsvg-2.34.0/debian/control.in
--- librsvg-2.34.0/debian/control.in 2011-06-06 14:43:19.000000000 +0000
+++ librsvg-2.34.0/debian/control.in 2011-07-17 10:23:46.000000000 +0000
@@ -3,15 +3,15 @@
Priority: optional
Maintainer: Josselin Mouette <[email protected]>
Uploaders: @GNOME_TEAM@
-Build-Depends: cdbs,
- debhelper (>= 8),
+Build-Depends: cdbs (>= 0.4.93),
+ debhelper (>= 8.1.3),
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),
+ libgdk-pixbuf2.0-dev (>= 2.23.5-2),
libgtk2.0-dev (>= 2.21.5),
libgsf-1-dev (>= 1.13.2-2),
gnome-pkg-tools (>= 0.10),
@@ -35,6 +35,7 @@
libgdk-pixbuf2.0-dev (>= 2.21.6),
libcairo2-dev (>= 1.2.0),
libgtk2.0-dev (>= 2.21.5)
+Multi-Arch: same
Description: SAX-based renderer library for SVG files (development)
The rsvg library is an efficient renderer for Scalable Vector Graphics
(SVG) pictures.
@@ -48,6 +49,8 @@
Depends: ${misc:Depends},
${shlibs:Depends}
Suggests: librsvg2-bin
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Description: SAX-based renderer library for SVG files (runtime)
The rsvg library is an efficient renderer for Scalable Vector Graphics
(SVG) pictures.
@@ -61,6 +64,8 @@
Depends: ${misc:Depends},
${shlibs:Depends},
librsvg2-2 (= ${binary:Version})
+Breaks: libgdk-pixbuf2.0-0 (<< 2.23.5-2), libgtk2.0-0 (<< 2.24.5-3)
+Multi-Arch: same
Description: SAX-based renderer library for SVG files (extra runtime)
The rsvg library is an efficient renderer for Scalable Vector Graphics
(SVG) pictures.
@@ -75,6 +80,7 @@
Depends: ${misc:Depends},
${shlibs:Depends},
librsvg2-2 (= ${binary:Version})
+Multi-Arch: same
Description: SAX-based renderer library for SVG files (debug)
The rsvg library is an efficient renderer for Scalable Vector Graphics
(SVG) pictures.
@@ -88,6 +94,7 @@
${shlibs:Depends},
${python:Depends},
librsvg2-2 (>= ${binary:Version})
+Multi-Arch: foreign
Description: command-line and graphical viewers for SVG files
The rsvg library is an efficient renderer for Scalable Vector Graphics
(SVG) pictures.
diff -Nru librsvg-2.34.0/debian/librsvg2-2.install librsvg-2.34.0/debian/librsvg2-2.install
--- librsvg-2.34.0/debian/librsvg2-2.install 2011-06-06 14:35:27.000000000 +0000
+++ librsvg-2.34.0/debian/librsvg2-2.install 2011-07-17 10:01:57.000000000 +0000
@@ -1 +1 @@
-usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*
diff -Nru librsvg-2.34.0/debian/librsvg2-common.install librsvg-2.34.0/debian/librsvg2-common.install
--- librsvg-2.34.0/debian/librsvg2-common.install 2011-06-06 14:35:40.000000000 +0000
+++ librsvg-2.34.0/debian/librsvg2-common.install 2011-07-17 10:01:57.000000000 +0000
@@ -1,2 +1,2 @@
-usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.so
-usr/lib/gtk-2.0/*/engines/*.so
+usr/lib/*/gdk-pixbuf-2.0/2.10.0/loaders/*.so
+usr/lib/*/gtk-2.0/*/engines/*.so
diff -Nru librsvg-2.34.0/debian/librsvg2-dev.install librsvg-2.34.0/debian/librsvg2-dev.install
--- librsvg-2.34.0/debian/librsvg2-dev.install 2011-06-06 14:35:54.000000000 +0000
+++ librsvg-2.34.0/debian/librsvg2-dev.install 2011-07-17 10:01:57.000000000 +0000
@@ -1,5 +1,5 @@
usr/include
-usr/lib/lib*.a
-usr/lib/lib*.so
-usr/lib/pkgconfig
+usr/lib/*/lib*.a
+usr/lib/*/lib*.so
+usr/lib/*/pkgconfig
usr/share/gtk-doc/html/rsvg-2.0/* usr/share/doc/librsvg2-dev/html/
diff -Nru librsvg-2.34.0/debian/rules librsvg-2.34.0/debian/rules
--- librsvg-2.34.0/debian/rules 2011-06-06 14:17:38.000000000 +0000
+++ librsvg-2.34.0/debian/rules 2011-07-17 10:01:57.000000000 +0000
@@ -14,6 +14,7 @@
LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
DEB_CONFIGURE_EXTRA_FLAGS += \
+ --libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
--enable-pixbuf-loader \
--with-croco \
--with-svgz
@@ -22,7 +23,7 @@
DEB_DH_MAKESHLIBS_ARGS_librsvg2-common = --no-act
binary-install/librsvg2-common::
- LD_LIBRARY_PATH=debian/$(LIBRSVG2_PKG)/usr/lib:$(LD_LIBRARY_PATH) \
+ LD_LIBRARY_PATH=debian/$(LIBRSVG2_PKG)/usr/lib/$(DEB_HOST_MULTIARCH):$(LD_LIBRARY_PATH) \
dh_gtkmodules -plibrsvg2-common
binary-install/librsvg2-bin::
signature.asc
Description: Digital signature
--- End Message ---
