diff options
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/compat | 2 | ||||
| -rw-r--r-- | debian/control | 3 | ||||
| -rw-r--r-- | debian/libunistring-dev.dirs | 3 | ||||
| -rw-r--r-- | debian/libunistring0.dirs | 1 | ||||
| -rwxr-xr-x | debian/rules | 4 |
6 files changed, 10 insertions, 9 deletions
diff --git a/debian/changelog b/debian/changelog index 3dc3ab00..e4c856c0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,8 +7,12 @@ libunistring (0.9.3-5) unstable; urgency=low multi-arch library directory. - Adapted debian/libunistring0.install. - Mark libunistring0 as "Multi-Arch: same". + * Applied outstanding changes from multiarch patch provided by Steve + Langasek on bug #646068: + - Removed useless .dirs files. + - debian/compat bumped to 9. - -- Andreas Rottmann <rotty@debian.org> Sun, 17 Jul 2011 13:15:21 +0200 + -- Andreas Rottmann <rotty@debian.org> Sat, 22 Oct 2011 02:42:09 +0200 libunistring (0.9.3-4) unstable; urgency=low diff --git a/debian/compat b/debian/compat index 7f8f011e..ec635144 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -7 +9 diff --git a/debian/control b/debian/control index 2444929a..0dbff994 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,7 @@ Source: libunistring Priority: optional Maintainer: Andreas Rottmann <rotty@debian.org> -Build-Depends: cdbs (>= 0.4.93), debhelper (>= 8.1.3), autotools-dev +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/ @@ -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, diff --git a/debian/libunistring-dev.dirs b/debian/libunistring-dev.dirs deleted file mode 100644 index f3635cd6..00000000 --- a/debian/libunistring-dev.dirs +++ /dev/null @@ -1,3 +0,0 @@ -usr/lib -usr/include -usr/share/doc/libunistring-dev diff --git a/debian/libunistring0.dirs b/debian/libunistring0.dirs deleted file mode 100644 index 68457717..00000000 --- a/debian/libunistring0.dirs +++ /dev/null @@ -1 +0,0 @@ -usr/lib diff --git a/debian/rules b/debian/rules index c09198ae..79f61e70 100755 --- a/debian/rules +++ b/debian/rules @@ -10,8 +10,8 @@ ifneq ($(findstring $(DEB_BUILD_ARCH), mips mipsel),) CFLAGS += -mplt endif -DEB_CONFIGURE_EXTRA_FLAGS := --disable-Werror -DEB_CONFIGURE_EXTRA_FLAGS += --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) +DEB_CONFIGURE_EXTRA_FLAGS := --disable-Werror \ + --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) DEB_DH_INSTALL_ARGS := --sourcedir=$(DEB_DESTDIR) DEB_MAKE_CHECK_TARGET = check |