Prepare 0.9.3-5

5 files changed, 21 insertions, 6 deletions

diff --git a/debian/changelog b/debian/changelog
index 21723d54..3dc3ab00 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+libunistring (0.9.3-5) unstable; urgency=low
+
+  * Standards-Version 3.9.2 (no changes).
+  * Convert package to multiarch:
+    - Bumped build-depends versions for cdbs and debhelper.
+    - Extend configure flags to install libraries into 
+      multi-arch library directory.
+    - Adapted debian/libunistring0.install.
+    - Mark libunistring0 as "Multi-Arch: same".
+  
+ -- Andreas Rottmann <rotty@debian.org>  Sun, 17 Jul 2011 13:15:21 +0200
+
 libunistring (0.9.3-4) unstable; urgency=low
 
   * Standards-Version 3.9.1:
diff --git a/debian/control b/debian/control
index f3476812..2444929a 100644
--- a/debian/control
+++ b/debian/control
@@ -1,8 +1,8 @@
 Source: libunistring
 Priority: optional
 Maintainer: Andreas Rottmann <rotty@debian.org>
-Build-Depends: cdbs, debhelper (>= 7), autotools-dev
-Standards-Version: 3.9.1
+Build-Depends: cdbs (>= 0.4.93), debhelper (>= 8.1.3), autotools-dev
+Standards-Version: 3.9.2
 Section: libs
 Homepage: http://www.gnu.org/software/libunistring/
 Vcs-Git: git://git.debian.org/git/collab-maint/libunistring.git
@@ -26,6 +26,8 @@ Description: Unicode string library for C - development files
 
 Package: libunistring0
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Unicode string library for C
  The 'libunistring' library implements Unicode strings (in the UTF-8,
diff --git a/debian/libunistring-dev.install b/debian/libunistring-dev.install
index be23c017..893c07e3 100644
--- a/debian/libunistring-dev.install
+++ b/debian/libunistring-dev.install
@@ -1,4 +1,4 @@
 usr/include/*
-usr/lib/lib*.a
-usr/lib/lib*.so
+usr/lib/*/lib*.a
+usr/lib/*/lib*.so
 usr/share/doc/libunistring/*.html usr/share/doc/libunistring-dev/html/
diff --git a/debian/libunistring0.install b/debian/libunistring0.install
index d0dbfd18..3ddde584 100644
--- a/debian/libunistring0.install
+++ b/debian/libunistring0.install
@@ -1 +1 @@
-usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*
diff --git a/debian/rules b/debian/rules
index 7d81463e..c09198ae 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,7 +10,8 @@ ifneq ($(findstring $(DEB_BUILD_ARCH), mips mipsel),)
 	CFLAGS += -mplt
 endif
 
-DEB_CONFIGURE_EXTRA_FLAGS := --disable-Werror
+DEB_CONFIGURE_EXTRA_FLAGS := --disable-Werror 
+DEB_CONFIGURE_EXTRA_FLAGS += --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
 DEB_DH_INSTALL_ARGS := --sourcedir=$(DEB_DESTDIR)
 
 DEB_MAKE_CHECK_TARGET = check