Package: libgnome-keyring
Version: 3.2.0-2
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu precise ubuntu-patch
Hi folks,
Please find attached a patch to libgnome-keyring to transition it to use the
multiarch library paths as described at
<http://wiki.debian.org/Multiarch/Implementation>. This patch is being
applied in Ubuntu precise.
Thanks for considering the patch!
--
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/
slanga...@ubuntu.com vor...@debian.org
=== modified file 'debian/compat'
--- debian/compat 2011-09-29 18:11:59 +0000
+++ debian/compat 2011-10-22 05:59:43 +0000
@@ -1 +1 @@
-8
+9
=== modified file 'debian/control'
--- debian/control 2011-09-29 18:11:59 +0000
+++ debian/control 2011-10-22 06:15:18 +0000
@@ -8,8 +8,8 @@
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintain...@lists.alioth.debian.org>
Uploaders: Jordi Mallach <jo...@debian.org>, Josselin Mouette <j...@debian.org>, Michael Biebl <bi...@debian.org>, Sebastian Dröge <sl...@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 +45,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 +66,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 file 'debian/control.in'
--- debian/control.in 2011-09-29 18:11:59 +0000
+++ debian/control.in 2011-10-22 06:15:18 +0000
@@ -3,8 +3,8 @@
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintain...@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 +40,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 +61,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 file 'debian/libgnome-keyring-dev.install'
--- debian/libgnome-keyring-dev.install 2011-09-29 18:11:59 +0000
+++ debian/libgnome-keyring-dev.install 2011-10-22 06:00:19 +0000
@@ -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 file 'debian/libgnome-keyring0.install'
--- debian/libgnome-keyring0.install 2011-09-29 18:11:59 +0000
+++ debian/libgnome-keyring0.install 2011-10-22 06:00:13 +0000
@@ -1,2 +1,2 @@
-usr/lib/libgnome-keyring.so.*
+usr/lib/*/libgnome-keyring.so.*
usr/share/locale
=== modified file 'debian/rules'
--- debian/rules 2011-09-29 18:11:59 +0000
+++ debian/rules 2011-10-22 05:58:45 +0000
@@ -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
