r31027 - in /desktop/unstable/libgnome-keyring/debian: changelog compat control control.in libgnome-keyring-dev.install libgnome-keyring0.install rules

mpitt at users.alioth.debian.org mpitt at users.alioth.debian.org
Mon Oct 24 08:22:32 UTC 2011 

Author: mpitt
Date: Mon Oct 24 08:22:31 2011
New Revision: 31027

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=31027
Log:
Build multiarch libraries, thanks Steve Langasek for the patch!
(Closes: #646202)

Modified:
    desktop/unstable/libgnome-keyring/debian/changelog
    desktop/unstable/libgnome-keyring/debian/compat
    desktop/unstable/libgnome-keyring/debian/control
    desktop/unstable/libgnome-keyring/debian/control.in
    desktop/unstable/libgnome-keyring/debian/libgnome-keyring-dev.install
    desktop/unstable/libgnome-keyring/debian/libgnome-keyring0.install
    desktop/unstable/libgnome-keyring/debian/rules

Modified: desktop/unstable/libgnome-keyring/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgnome-keyring/debian/changelog?rev=31027&op=diff
==============================================================================
--- desktop/unstable/libgnome-keyring/debian/changelog [utf-8] (original)
+++ desktop/unstable/libgnome-keyring/debian/changelog [utf-8] Mon Oct 24 08:22:31 2011
@@ -1,3 +1,10 @@
+libgnome-keyring (3.2.0-3) UNRELEASED; urgency=low
+
+  * Build multiarch libraries, thanks Steve Langasek for the patch!
+    (Closes: #646202)
+
+ -- Martin Pitt <mpitt at debian.org>  Mon, 24 Oct 2011 10:21:00 +0200
+
 libgnome-keyring (3.2.0-2) unstable; urgency=low
 
   * Don't make test-suite failure fatal as long as kfreebsd hasn't been fixed.

Modified: desktop/unstable/libgnome-keyring/debian/compat
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgnome-keyring/debian/compat?rev=31027&op=diff
==============================================================================
--- desktop/unstable/libgnome-keyring/debian/compat [utf-8] (original)
+++ desktop/unstable/libgnome-keyring/debian/compat [utf-8] Mon Oct 24 08:22:31 2011
@@ -1,1 +1,1 @@
-8
+9

Modified: desktop/unstable/libgnome-keyring/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgnome-keyring/debian/control?rev=31027&op=diff
==============================================================================
--- desktop/unstable/libgnome-keyring/debian/control [utf-8] (original)
+++ desktop/unstable/libgnome-keyring/debian/control [utf-8] Mon Oct 24 08:22:31 2011
@@ -8,8 +8,8 @@
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: Jordi Mallach <jordi at debian.org>, Josselin Mouette <joss at debian.org>, Michael Biebl <biebl at debian.org>, Sebastian Dröge <slomo at debian.org>
-Build-Depends: debhelper (>= 8),
-               cdbs,
+Build-Depends: debhelper (>= 8.1.3~),
+               cdbs (>= 0.4.93~),
                gnome-pkg-tools (>= 0.10),
                intltool (>= 0.35.0),
                libglib2.0-dev (>= 2.16.0),
@@ -44,6 +44,8 @@
 Package: libgnome-keyring0
 Section: libs
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
          ${shlibs:Depends}
 Breaks: gnome-keyring (<< 3.0)
@@ -63,6 +65,7 @@
 Section: debug
 Priority: extra
 Architecture: any
+Multi-Arch: same
 Depends: ${misc:Depends},
          libgnome-keyring0 (= ${binary:Version})
 Description: GNOME keyring services library (debugging symbols)

Modified: desktop/unstable/libgnome-keyring/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgnome-keyring/debian/control.in?rev=31027&op=diff
==============================================================================
--- desktop/unstable/libgnome-keyring/debian/control.in [utf-8] (original)
+++ desktop/unstable/libgnome-keyring/debian/control.in [utf-8] Mon Oct 24 08:22:31 2011
@@ -3,8 +3,8 @@
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: @GNOME_TEAM@
-Build-Depends: debhelper (>= 8),
-               cdbs,
+Build-Depends: debhelper (>= 8.1.3~),
+               cdbs (>= 0.4.93~),
                gnome-pkg-tools (>= 0.10),
                intltool (>= 0.35.0),
                libglib2.0-dev (>= 2.16.0),
@@ -39,6 +39,8 @@
 Package: libgnome-keyring0
 Section: libs
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
          ${shlibs:Depends}
 Breaks: gnome-keyring (<< 3.0)
@@ -58,6 +60,7 @@
 Section: debug
 Priority: extra
 Architecture: any
+Multi-Arch: same
 Depends: ${misc:Depends},
          libgnome-keyring0 (= ${binary:Version})
 Description: GNOME keyring services library (debugging symbols)

Modified: desktop/unstable/libgnome-keyring/debian/libgnome-keyring-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgnome-keyring/debian/libgnome-keyring-dev.install?rev=31027&op=diff
==============================================================================
--- desktop/unstable/libgnome-keyring/debian/libgnome-keyring-dev.install [utf-8] (original)
+++ desktop/unstable/libgnome-keyring/debian/libgnome-keyring-dev.install [utf-8] Mon Oct 24 08:22:31 2011
@@ -1,5 +1,5 @@
 usr/include/gnome-keyring*
-usr/lib/libgnome-keyring.a
-usr/lib/libgnome-keyring.so
-usr/lib/pkgconfig/gnome-keyring*.pc
+usr/lib/*/libgnome-keyring.a
+usr/lib/*/libgnome-keyring.so
+usr/lib/*/pkgconfig/gnome-keyring*.pc
 usr/share/gtk-doc/html/gnome-keyring*

Modified: desktop/unstable/libgnome-keyring/debian/libgnome-keyring0.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgnome-keyring/debian/libgnome-keyring0.install?rev=31027&op=diff
==============================================================================
--- desktop/unstable/libgnome-keyring/debian/libgnome-keyring0.install [utf-8] (original)
+++ desktop/unstable/libgnome-keyring/debian/libgnome-keyring0.install [utf-8] Mon Oct 24 08:22:31 2011
@@ -1,2 +1,2 @@
-usr/lib/libgnome-keyring.so.*
+usr/lib/*/libgnome-keyring.so.*
 usr/share/locale

Modified: desktop/unstable/libgnome-keyring/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgnome-keyring/debian/rules?rev=31027&op=diff
==============================================================================
--- desktop/unstable/libgnome-keyring/debian/rules [utf-8] (original)
+++ desktop/unstable/libgnome-keyring/debian/rules [utf-8] Mon Oct 24 08:22:31 2011
@@ -8,6 +8,7 @@
 LDFLAGS := -Wl,-O1 -Wl,-z,defs -Wl,--as-needed
 
 DEB_CONFIGURE_EXTRA_FLAGS += --enable-static \
-                             --enable-gtk-doc
+                             --enable-gtk-doc \
+                             --libdir=/usr/lib/$(DEB_HOST_MULTIARCH)
 
 DEB_MAKE_CHECK_TARGET := check || true

More information about the pkg-gnome-commits mailing list