Install libdbus to /lib. Upstart requires libdbus before /usr is

mounted. Keep the development files libdbus-1*.{a,so} in /usr/lib.

git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/dbus@3161 ceb527fc-18e6-0310-9fe2-813c157c29e7

4 files changed, 6 insertions, 2 deletions

diff --git a/debian/changelog b/debian/changelog
index 7451c756..0d098196 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ dbus (1.2.16-1) UNRELEASED; urgency=low
     - Update for API additions.
   * debian/rules
     - Bump shlibs to 1.2.16.
+  * Install libdbus to /lib. Upstart requires libdbus before /usr is
+    mounted. Keep the development files libdbus-1*.{a,so} in /usr/lib.
 
  -- Michael Biebl <biebl@debian.org>  Tue, 14 Jul 2009 23:39:04 +0200
 
diff --git a/debian/libdbus-1-3.install b/debian/libdbus-1-3.install
index c56d02e0..8a2fd07b 100644
--- a/debian/libdbus-1-3.install
+++ b/debian/libdbus-1-3.install
@@ -1 +1 @@
-debian/tmp/usr/lib/libdbus-1*.so.*
+debian/tmp/usr/lib/libdbus-1*.so.* lib/
diff --git a/debian/libdbus-1-dev.install b/debian/libdbus-1-dev.install
index 34038461..536b4939 100644
--- a/debian/libdbus-1-dev.install
+++ b/debian/libdbus-1-dev.install
@@ -2,4 +2,3 @@ debian/tmp/usr/include/dbus*/dbus/dbus*.h
 debian/tmp/usr/lib/dbus*/include/dbus/dbus*.h
 debian/tmp/usr/lib/pkgconfig/dbus-1.pc
 debian/tmp/usr/lib/libdbus-1*.a
-debian/tmp/usr/lib/libdbus-1*.so
diff --git a/debian/rules b/debian/rules
index 6474e5f9..06d630df 100755
--- a/debian/rules
+++ b/debian/rules
@@ -40,6 +40,9 @@ build/dbus-1-doc::
 	doxygen Doxyfile
 	xsltproc -o dbus.devhelp debian/doxygen_to_devhelp.xsl doc/api/xml/index.xml
 
+install/libdbus-1-dev::
+	dh_link -p$(cdbs_curpkg) lib/`basename debian/tmp/usr/lib/libdbus-1.so.*.*.*` usr/lib/libdbus-1.so
+
 clean::
 	rm -rf doc/api
 	rm -f test/data/valid-config-files/session.conf