diff -Nru libtextwrap-0.1/debian/changelog libtextwrap-0.1/debian/changelog --- libtextwrap-0.1/debian/changelog 2013-02-12 01:49:35.000000000 +0000 +++ libtextwrap-0.1/debian/changelog 2013-06-06 09:07:11.000000000 +0000 @@ -1,3 +1,15 @@ +libtextwrap (0.1-14) unstable; urgency=low + + * Merge 0.1-13ubuntu1 + Update config.guess and config.sub in the correct directory. + Closes: #700359 + * Standards Version is 3.9.4 + * Fix "ancient-libtool config/ltmain.sh 1.5.0" + * Support multiarch + * Use hardening options + + -- Anibal Monsalve Salazar Thu, 06 Jun 2013 14:00:10 +1000 + libtextwrap (0.1-13ubuntu1) raring; urgency=low * Update config.guess and config.sub in the correct directory. diff -Nru libtextwrap-0.1/debian/control libtextwrap-0.1/debian/control --- libtextwrap-0.1/debian/control 2013-02-12 01:49:33.000000000 +0000 +++ libtextwrap-0.1/debian/control 2013-06-06 07:33:50.000000000 +0000 @@ -1,10 +1,9 @@ Source: libtextwrap Section: libs Priority: important -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Anibal Monsalve Salazar -Build-Depends: debhelper (>= 7), autotools-dev -Standards-Version: 3.9.2 +Maintainer: Anibal Monsalve Salazar +Build-Depends: debhelper (>= 7), dpkg-dev (>= 1.16.1~), autoconf, libtool, automake +Standards-Version: 3.9.4 Homepage: http://libtextwrap.sourceforge.net/ Package: libtextwrap-dev @@ -30,6 +29,8 @@ Section: libs Priority: optional Architecture: any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} Description: text-wrapping library with i18n - runtime Text-wrapping (or line-folding) library for displaying a string on diff -Nru libtextwrap-0.1/debian/libtextwrap-dev.install libtextwrap-0.1/debian/libtextwrap-dev.install --- libtextwrap-0.1/debian/libtextwrap-dev.install 2010-04-11 01:00:09.000000000 +0000 +++ libtextwrap-0.1/debian/libtextwrap-dev.install 2013-06-06 07:27:50.000000000 +0000 @@ -1,7 +1,7 @@ usr/include/textwrap.h -usr/lib/libtextwrap.a -usr/lib/libtextwrap.so -usr/lib/libtextwrap.la +usr/lib/*/libtextwrap.a +usr/lib/*/libtextwrap.so +usr/lib/*/libtextwrap.la usr/share/man/man3/textwrap.3 usr/bin/dotextwrap usr/share/man/man1/dotextwrap.1 diff -Nru libtextwrap-0.1/debian/libtextwrap1-udeb.install libtextwrap-0.1/debian/libtextwrap1-udeb.install --- libtextwrap-0.1/debian/libtextwrap1-udeb.install 2010-04-11 01:00:09.000000000 +0000 +++ libtextwrap-0.1/debian/libtextwrap1-udeb.install 2013-06-06 08:25:15.000000000 +0000 @@ -1,2 +1,2 @@ -usr/lib/libtextwrap.so.1 -usr/lib/libtextwrap.so.1.0.0 +usr/lib/*/libtextwrap.so.1 usr/lib +usr/lib/*/libtextwrap.so.1.0.0 usr/lib diff -Nru libtextwrap-0.1/debian/libtextwrap1.install libtextwrap-0.1/debian/libtextwrap1.install --- libtextwrap-0.1/debian/libtextwrap1.install 2010-04-11 01:00:09.000000000 +0000 +++ libtextwrap-0.1/debian/libtextwrap1.install 2013-06-06 07:26:50.000000000 +0000 @@ -1,2 +1,2 @@ -usr/lib/libtextwrap.so.1 -usr/lib/libtextwrap.so.1.0.0 +usr/lib/*/libtextwrap.so.1 +usr/lib/*/libtextwrap.so.1.0.0 diff -Nru libtextwrap-0.1/debian/rules libtextwrap-0.1/debian/rules --- libtextwrap-0.1/debian/rules 2013-02-12 01:49:10.000000000 +0000 +++ libtextwrap-0.1/debian/rules 2013-06-06 04:39:29.000000000 +0000 @@ -5,6 +5,10 @@ # Uncomment this to turn on verbose mode. export DH_VERBOSE=1 +DPKG_EXPORT_BUILDFLAGS = 1 + +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) + DEB_HOST_GNU_TYPE=$(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE=$(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE)) @@ -24,6 +28,8 @@ INSTALL_PROGRAM += -s endif +include /usr/share/dpkg/buildflags.mk + # shared library versions, option 1 version=2.0.5 major=2 @@ -37,8 +43,9 @@ configure-stamp: dh_testdir touch NEWS AUTHORS ChangeLog - cp -f /usr/share/misc/config.sub /usr/share/misc/config.guess config/ - ./configure $(CROSS) --prefix=/usr --mandir=/usr/share/man + #cp -f /usr/share/misc/config.sub /usr/share/misc/config.guess config/ + autoreconf -i --force + ./configure $(CROSS) --prefix=/usr --mandir=/usr/share/man --libdir=/usr/lib/$(DEB_HOST_MULTIARCH) touch configure-stamp build: build-arch build-indep @@ -53,7 +60,7 @@ dh_testdir dh_testroot rm -f build-stamp configure-stamp - rm -f config/config.sub config/config.guess + #rm -f config/config.sub config/config.guess [ ! -f Makefile ] || $(MAKE) distclean dh_clean rm -f COPYING INSTALL config.cache config.status