From 7a0dd1f819d84749fe484663fd70ce4be3eb51ac Mon Sep 17 00:00:00 2001 From: Andreas Rottmann Date: Sat, 22 Oct 2011 02:36:38 +0200 Subject: Applied patch from Bug#646068 --- debian/compat | 2 +- debian/control | 5 ++++- debian/libunistring-dev.dirs | 3 --- debian/libunistring-dev.install | 4 ++-- debian/libunistring0.dirs | 1 - debian/libunistring0.install | 2 +- debian/rules | 3 ++- 7 files changed, 10 insertions(+), 10 deletions(-) delete mode 100644 debian/libunistring-dev.dirs delete mode 100644 debian/libunistring0.dirs diff --git a/debian/compat b/debian/compat index 7f8f011..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -7 +9 diff --git a/debian/control b/debian/control index f347681..27b1040 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,7 @@ Source: libunistring Priority: optional Maintainer: Andreas Rottmann -Build-Depends: cdbs, debhelper (>= 7), autotools-dev +Build-Depends: cdbs (>= 0.4.93~), debhelper (>= 8.1.3~), autotools-dev Standards-Version: 3.9.1 Section: libs Homepage: http://www.gnu.org/software/libunistring/ @@ -11,6 +11,7 @@ Vcs-Browser: http://git.debian.org/?p=collab-maint/libunistring.git Package: libunistring-dev Section: libdevel Architecture: any +Multi-Arch: same Depends: libunistring0 (= ${binary:Version}), ${misc:Depends} Description: Unicode string library for C - development files The 'libunistring' library implements Unicode strings (in the UTF-8, @@ -26,6 +27,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.dirs b/debian/libunistring-dev.dirs deleted file mode 100644 index f3635cd..0000000 --- a/debian/libunistring-dev.dirs +++ /dev/null @@ -1,3 +0,0 @@ -usr/lib -usr/include -usr/share/doc/libunistring-dev diff --git a/debian/libunistring-dev.install b/debian/libunistring-dev.install index be23c01..893c07e 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.dirs b/debian/libunistring0.dirs deleted file mode 100644 index 6845771..0000000 --- a/debian/libunistring0.dirs +++ /dev/null @@ -1 +0,0 @@ -usr/lib diff --git a/debian/libunistring0.install b/debian/libunistring0.install index d0dbfd1..3ddde58 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 7d81463..79f61e7 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 \ + --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) DEB_DH_INSTALL_ARGS := --sourcedir=$(DEB_DESTDIR) DEB_MAKE_CHECK_TARGET = check -- cgit v1.2.3