[Pkg-utopia-commits] r3586 - in /packages/experimental/dbus/debian: changelog control rules

[smcv at users.alioth.debian.org]

Author: smcv
Date: Fri Jun 25 12:55:46 2010
New Revision: 3586

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=3586
Log:
Revert multiarch changes for the moment, to not stall dbus-1-dbg

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=3586&op=diff
==============================================================================
--- packages/experimental/dbus/debian/changelog (original)
+++ packages/experimental/dbus/debian/changelog Fri Jun 25 12:55:46 2010
@@ -1,9 +1,6 @@
 dbus (1.2.24-1+exp1) UNRELEASED; urgency=low
 
    * 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
 
  -- Simon McVittie <smcv at debian.org>  Fri, 25 Jun 2010 13:51:07 +0100
 

Modified: packages/experimental/dbus/debian/control
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/dbus/debian/control?rev=3586&op=diff
==============================================================================
--- packages/experimental/dbus/debian/control (original)
+++ packages/experimental/dbus/debian/control Fri Jun 25 12:55:46 2010
@@ -70,7 +70,6 @@
 
 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=3586&op=diff
==============================================================================
--- packages/experimental/dbus/debian/rules (original)
+++ packages/experimental/dbus/debian/rules Fri Jun 25 12:55:46 2010
@@ -34,14 +34,8 @@
 	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/$(DEB_HOST_GNU_TYPE)/$$(basename $$(readlink debian/tmp/usr/lib/libdbus-1.so)) \
-		usr/lib/libdbus-1.so
+	dh_link -p$(cdbs_curpkg) lib/$$(basename $$(readlink debian/tmp/usr/lib/libdbus-1.so)) usr/lib/libdbus-1.so
 
 clean::
 	rm -rf doc/api