[Pkg-utopia-commits] r3468 - in /packages/experimental/dbus/debian: changelog control libdbus-1-3.install rules

[smcv at users.alioth.debian.org]

Author: smcv
Date: Wed Jan 27 23:24:06 2010
New Revision: 3468

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=3468
Log:
* Install libdbus shared library to a multiarch directory
  (/lib/i486-linux-gnu or whatever) as now allowed by Policy, and set
  Multi-Arch: same as befits a shared library
* Standards-Version: 3.8.4 (no changes needed)

Removed:
    packages/experimental/dbus/debian/libdbus-1-3.install
Modified:
    packages/experimental/dbus/debian/changelog
    packages/experimental/dbus/debian/control
    packages/experimental/dbus/debian/rules

Modified: packages/experimental/dbus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/dbus/debian/changelog?rev=3468&op=diff
==============================================================================
--- packages/experimental/dbus/debian/changelog (original)
+++ packages/experimental/dbus/debian/changelog Wed Jan 27 23:24:06 2010
@@ -1,11 +1,6 @@
 dbus (1.2.16-3~exp1) UNRELEASED-experimental; urgency=low
 
-  * Add separate debugging symbols (Closes: 550517)
-
- -- Simon McVittie <smcv at debian.org>  Wed, 27 Jan 2010 21:58:06 +0000
-
-dbus (1.2.16-3) UNRELEASED; urgency=low
-
+  [ Michael Biebl ]
   * debian/control
     - Drop Build-Depends on docbook-utils, apparently no longer necessary.
   * debian/rules
@@ -16,7 +11,14 @@
     - Improve the way we create the symlink from /usr/lib/ → /lib by using
       readlink.
 
- -- Michael Biebl <biebl at debian.org>  Thu, 12 Nov 2009 09:04:48 +0100
+  [ Simon McVittie ]
+  * Add separate debugging symbols (Closes: 550517)
+  * Install libdbus shared library to a multiarch directory
+    (/lib/i486-linux-gnu or whatever) as now allowed by Policy, and set
+    Multi-Arch: same as befits a shared library
+  * Standards-Version: 3.8.4 (no changes needed)
+
+ -- Simon McVittie <smcv at debian.org>  Wed, 27 Jan 2010 21:58:06 +0000
 
 dbus (1.2.16-2) unstable; urgency=low
 

Modified: packages/experimental/dbus/debian/control
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/dbus/debian/control?rev=3468&op=diff
==============================================================================
--- packages/experimental/dbus/debian/control (original)
+++ packages/experimental/dbus/debian/control Wed Jan 27 23:24:06 2010
@@ -17,7 +17,7 @@
                libx11-dev,
                libselinux1-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
                quilt
-Standards-Version: 3.8.2
+Standards-Version: 3.8.4
 Vcs-Svn: svn://svn.debian.org/svn/pkg-utopia/packages/unstable/dbus
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus
 Homepage: http://dbus.freedesktop.org/
@@ -70,6 +70,7 @@
 
 Package: libdbus-1-3
 Architecture: any
+Multi-Arch: same
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Recommends: dbus

Modified: packages/experimental/dbus/debian/rules
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/dbus/debian/rules?rev=3468&op=diff
==============================================================================
--- packages/experimental/dbus/debian/rules (original)
+++ packages/experimental/dbus/debian/rules Wed Jan 27 23:24:06 2010
@@ -34,8 +34,14 @@
 	doxygen Doxyfile
 	xsltproc -o dbus.devhelp debian/doxygen_to_devhelp.xsl doc/api/xml/index.xml
 
+install/$(libdbusN)::
+	dh_install -p$(cdbs_curpkg) debian/tmp/usr/lib/libdbus-1*.so.* \
+		lib/$(DEB_HOST_GNU_TYPE)
+
 install/libdbus-1-dev::
-	dh_link -p$(cdbs_curpkg) lib/$$(basename $$(readlink debian/tmp/usr/lib/libdbus-1.so)) usr/lib/libdbus-1.so
+	dh_link -p$(cdbs_curpkg) \
+		lib/$(DEB_HOST_GNU_TYPE)/$$(basename $$(readlink debian/tmp/usr/lib/libdbus-1.so)) \
+		usr/lib/libdbus-1.so
 
 clean::
 	rm -rf doc/api