diff -Nru elfutils-0.152/debian/changelog elfutils-0.152/debian/changelog --- elfutils-0.152/debian/changelog 2011-11-02 13:07:02.000000000 +0000 +++ elfutils-0.152/debian/changelog 2012-03-07 07:34:49.000000000 +0000 @@ -1,3 +1,11 @@ +elfutils (0.152-1ubuntu3) precise; urgency=low + + [ Marcin Juszkiewicz ] + * Convert to multiarch. (LP: #934433) + * Switched to use 'dh_prep' instead of 'dh_clean -k' + + -- Evan Broder Tue, 06 Mar 2012 23:34:49 -0800 + elfutils (0.152-1ubuntu2) precise; urgency=low * Rebuild for liblzma5. diff -Nru elfutils-0.152/debian/compat elfutils-0.152/debian/compat --- elfutils-0.152/debian/compat 2009-03-10 19:07:51.000000000 +0000 +++ elfutils-0.152/debian/compat 2012-03-07 07:28:31.000000000 +0000 @@ -1 +1 @@ -5 +9 diff -Nru elfutils-0.152/debian/control elfutils-0.152/debian/control --- elfutils-0.152/debian/control 2010-04-24 11:23:00.000000000 +0000 +++ elfutils-0.152/debian/control 2012-03-07 07:34:55.000000000 +0000 @@ -1,8 +1,9 @@ Source: elfutils Priority: optional -Maintainer: Kurt Roeckx +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Kurt Roeckx Uploaders: Christian Aichinger -Build-Depends: debhelper (>= 5.0.0), autotools-dev, bzip2, zlib1g-dev, libbz2-dev, liblzma-dev, m4, gettext +Build-Depends: debhelper (>= 8.1.3), autotools-dev, bzip2, zlib1g-dev, libbz2-dev, liblzma-dev, m4, gettext Build-Conflicts: autoconf2.13, automake1.4 Standards-Version: 3.8.4 Section: libs @@ -11,6 +12,7 @@ Package: elfutils Section: utils Architecture: any +Multi-Arch: foreign Depends: ${shlibs:Depends}, libdw1 (= ${binary:Version}), ${misc:Depends} Description: collection of utilities to handle ELF objects Elfutils is a collection of utilities, including eu-ld (a linker), @@ -21,7 +23,9 @@ Package: libelf1 Architecture: any +Multi-Arch: same Depends: ${shlibs:Depends}, ${misc:Depends} +Pre-Depends: ${misc:Pre-Depends} Description: library to read and write ELF files The libelf1 package provides a shared library which allows reading and writing ELF files on a high level. Third party programs depend on @@ -33,6 +37,7 @@ Package: libelf-dev Section: libdevel Architecture: any +Multi-Arch: same Depends: libelf1 (= ${binary:Version}), ${misc:Depends} Conflicts: libelfg0-dev Description: libelf1 development libraries and header files @@ -44,6 +49,7 @@ Package: libdw-dev Section: libdevel Architecture: any +Multi-Arch: same Depends: libelf-dev, libdw1 (= ${binary:Version}), ${misc:Depends} Description: libdw1 development libraries and header files libdw1 provides a library that provides access to DWARF debug information @@ -56,7 +62,9 @@ Package: libdw1 Architecture: any +Multi-Arch: same Depends: ${shlibs:Depends}, ${misc:Depends} +Pre-Depends: ${misc:Pre-Depends} Description: library that provides access to the DWARF debug information libdw1 provides a library that provides access to DWARF debug information stored inside ELF files. @@ -65,7 +73,9 @@ Package: libasm1 Architecture: any +Multi-Arch: same Depends: ${shlibs:Depends}, ${misc:Depends} +Pre-Depends: ${misc:Pre-Depends} Description: library with a programmable assembler interface The libasm1 package provides a library with a programmable assembler interface. It allows you to create ELF files on a low level. @@ -75,6 +85,7 @@ Package: libasm-dev Section: libdevel Architecture: any +Multi-Arch: same Depends: libasm1 (= ${binary:Version}), libelf-dev, ${misc:Depends} Conflicts: libelfsh0-dev, libasm0-dev Description: libasm development libraries and header files diff -Nru elfutils-0.152/debian/libasm1.install elfutils-0.152/debian/libasm1.install --- elfutils-0.152/debian/libasm1.install 2009-03-10 19:07:51.000000000 +0000 +++ elfutils-0.152/debian/libasm1.install 2012-03-07 07:31:04.000000000 +0000 @@ -1,2 +1,2 @@ -usr/lib/libasm.so.1 -usr/lib/libasm-*.so +usr/lib/*/libasm.so.1 +usr/lib/*/libasm-*.so diff -Nru elfutils-0.152/debian/libasm-dev.install elfutils-0.152/debian/libasm-dev.install --- elfutils-0.152/debian/libasm-dev.install 2009-03-10 19:07:51.000000000 +0000 +++ elfutils-0.152/debian/libasm-dev.install 2012-03-07 07:30:57.000000000 +0000 @@ -1,3 +1,3 @@ usr/include/elfutils/libasm.h -usr/lib/libasm.a -usr/lib/libasm.so +usr/lib/*/libasm.a +usr/lib/*/libasm.so diff -Nru elfutils-0.152/debian/libdw1.install elfutils-0.152/debian/libdw1.install --- elfutils-0.152/debian/libdw1.install 2009-08-14 12:28:21.000000000 +0000 +++ elfutils-0.152/debian/libdw1.install 2012-03-07 07:30:48.000000000 +0000 @@ -1,3 +1,3 @@ -usr/lib/libdw.so.1 -usr/lib/libdw-0.*.so -usr/lib/elfutils/ +usr/lib/*/libdw.so.1 +usr/lib/*/libdw-0.*.so +usr/lib/*/elfutils/ diff -Nru elfutils-0.152/debian/libdw-dev.install elfutils-0.152/debian/libdw-dev.install --- elfutils-0.152/debian/libdw-dev.install 2009-08-14 12:28:38.000000000 +0000 +++ elfutils-0.152/debian/libdw-dev.install 2012-03-07 07:30:36.000000000 +0000 @@ -1,5 +1,5 @@ usr/include/dwarf.h usr/include/elfutils/libdw.h usr/include/elfutils/libdwfl.h -usr/lib/libdw.so -usr/lib/libdw.a +usr/lib/*/libdw.so +usr/lib/*/libdw.a diff -Nru elfutils-0.152/debian/libelf1.install elfutils-0.152/debian/libelf1.install --- elfutils-0.152/debian/libelf1.install 2010-04-24 10:40:31.000000000 +0000 +++ elfutils-0.152/debian/libelf1.install 2012-03-07 07:30:25.000000000 +0000 @@ -1,3 +1,3 @@ -usr/lib/libelf.so.1 -usr/lib/libelf-*.so +usr/lib/*/libelf.so.1 +usr/lib/*/libelf-*.so usr/share/locale/ diff -Nru elfutils-0.152/debian/libelf-dev.install elfutils-0.152/debian/libelf-dev.install --- elfutils-0.152/debian/libelf-dev.install 2009-05-02 13:58:14.000000000 +0000 +++ elfutils-0.152/debian/libelf-dev.install 2012-03-07 07:30:19.000000000 +0000 @@ -3,5 +3,5 @@ usr/include/nlist.h usr/include/elfutils/elf-knowledge.h usr/include/elfutils/version.h -usr/lib/libelf.a -usr/lib/libelf.so +usr/lib/*/libelf.a +usr/lib/*/libelf.so diff -Nru elfutils-0.152/debian/rules elfutils-0.152/debian/rules --- elfutils-0.152/debian/rules 2010-04-26 19:04:57.000000000 +0000 +++ elfutils-0.152/debian/rules 2012-03-07 07:44:01.000000000 +0000 @@ -17,6 +17,7 @@ # from having to guess our platform (since we know it already) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) confflags += --build=$(DEB_HOST_GNU_TYPE) @@ -44,6 +45,7 @@ ln -s /usr/share/misc/config.guess config/config.guess ln -s /usr/share/misc/config.sub config/config.sub CFLAGS="$(CFLAGS)" ./configure $(confflags) --prefix=/usr \ + --libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \ --program-prefix=eu- --enable-thread-safety build: build-stamp @@ -77,13 +79,13 @@ install: build dh_testdir dh_testroot - dh_clean -k + dh_prep dh_installdirs # Add here commands to install the package into debian/tmp $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp # We do not provide a libebl anymore, use libdw instead. - rm debian/tmp/usr/lib/libebl.a + rm debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libebl.a rm debian/tmp/usr/include/elfutils/libebl.h # Build architecture-independent files here.