r29004 - in /desktop/unstable/librsvg/debian: changelog control control.in librsvg2-2.install librsvg2-common.install librsvg2-dev.install rules
biebl at users.alioth.debian.org
biebl at users.alioth.debian.org
Thu Jul 21 13:31:59 UTC 2011
Author: biebl
Date: Thu Jul 21 13:31:59 2011
New Revision: 29004
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=29004
Log:
* Build for multiarch. (Closes: #634719, #634535)
* 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.
Modified:
desktop/unstable/librsvg/debian/changelog
desktop/unstable/librsvg/debian/control
desktop/unstable/librsvg/debian/control.in
desktop/unstable/librsvg/debian/librsvg2-2.install
desktop/unstable/librsvg/debian/librsvg2-common.install
desktop/unstable/librsvg/debian/librsvg2-dev.install
desktop/unstable/librsvg/debian/rules
Modified: desktop/unstable/librsvg/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/librsvg/debian/changelog?rev=29004&op=diff
==============================================================================
--- desktop/unstable/librsvg/debian/changelog [utf-8] (original)
+++ desktop/unstable/librsvg/debian/changelog [utf-8] Thu Jul 21 13:31:59 2011
@@ -1,3 +1,14 @@
+librsvg (2.34.0-2) UNRELEASED; urgency=low
+
+ [ Steve Langasek ]
+ * Build for multiarch. (Closes: #634719, #634535)
+ * 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.
+
+ -- Michael Biebl <biebl at debian.org> Thu, 21 Jul 2011 15:22:27 +0200
+
librsvg (2.34.0-1) unstable; urgency=low
* New upstream release.
Modified: desktop/unstable/librsvg/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/librsvg/debian/control?rev=29004&op=diff
==============================================================================
--- desktop/unstable/librsvg/debian/control [utf-8] (original)
+++ desktop/unstable/librsvg/debian/control [utf-8] Thu Jul 21 13:31:59 2011
@@ -8,15 +8,15 @@
Priority: optional
Maintainer: Josselin Mouette <joss at debian.org>
Uploaders: David Weinehall <tao at debian.org>, Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Michael Biebl <biebl at debian.org>, Sebastian Dröge <slomo at debian.org>
-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-4)
+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.
Modified: desktop/unstable/librsvg/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/librsvg/debian/control.in?rev=29004&op=diff
==============================================================================
--- desktop/unstable/librsvg/debian/control.in [utf-8] (original)
+++ desktop/unstable/librsvg/debian/control.in [utf-8] Thu Jul 21 13:31:59 2011
@@ -3,15 +3,15 @@
Priority: optional
Maintainer: Josselin Mouette <joss at debian.org>
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-4)
+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.
Modified: desktop/unstable/librsvg/debian/librsvg2-2.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/librsvg/debian/librsvg2-2.install?rev=29004&op=diff
==============================================================================
--- desktop/unstable/librsvg/debian/librsvg2-2.install [utf-8] (original)
+++ desktop/unstable/librsvg/debian/librsvg2-2.install [utf-8] Thu Jul 21 13:31:59 2011
@@ -1,1 +1,1 @@
-usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*
Modified: desktop/unstable/librsvg/debian/librsvg2-common.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/librsvg/debian/librsvg2-common.install?rev=29004&op=diff
==============================================================================
--- desktop/unstable/librsvg/debian/librsvg2-common.install [utf-8] (original)
+++ desktop/unstable/librsvg/debian/librsvg2-common.install [utf-8] Thu Jul 21 13:31:59 2011
@@ -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
Modified: desktop/unstable/librsvg/debian/librsvg2-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/librsvg/debian/librsvg2-dev.install?rev=29004&op=diff
==============================================================================
--- desktop/unstable/librsvg/debian/librsvg2-dev.install [utf-8] (original)
+++ desktop/unstable/librsvg/debian/librsvg2-dev.install [utf-8] Thu Jul 21 13:31:59 2011
@@ -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/
Modified: desktop/unstable/librsvg/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/librsvg/debian/rules?rev=29004&op=diff
==============================================================================
--- desktop/unstable/librsvg/debian/rules [utf-8] (original)
+++ desktop/unstable/librsvg/debian/rules [utf-8] Thu Jul 21 13:31:59 2011
@@ -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::
More information about the pkg-gnome-commits
mailing list