diff -u binutils-2.23.1/debian/changelog binutils-2.23.1/debian/changelog --- binutils-2.23.1/debian/changelog +++ binutils-2.23.1/debian/changelog @@ -1,3 +1,9 @@ +binutils (2.23.1-0ubuntu6ma1) raring; urgency=low + + * Split libiberty-dev into MA:same package + + -- Wookey Thu, 07 Feb 2013 15:38:34 +0000 + binutils (2.23.1-0ubuntu6) raring; urgency=low * Fix PR ld/14918: linking with -flto always links in libgcc_s.so. diff -u binutils-2.23.1/debian/rules binutils-2.23.1/debian/rules --- binutils-2.23.1/debian/rules +++ binutils-2.23.1/debian/rules @@ -15,6 +15,7 @@ p_bin = binutils p_dev = $(p_bin)-dev +p_iberty = libiberty-dev p_mul = $(p_bin)-multiarch p_gold = $(p_bin)-gold p_doc = $(p_bin)-doc @@ -36,6 +37,7 @@ d = debian/tmp d_bin = $(d) d_dev = debian/$(p_dev) +d_iberty = debian/$(p_iberty) d_mul = debian/$(p_mul) d_gold = debian/$(p_gold) d_doc = debian/$(p_doc) @@ -620,8 +622,8 @@ install-stamp: checkroot build-stamp $(checkdir) - rm -fr $(d_bin) $(d_dev) $(d_mul) $(d_doc) $(d_src) - $(install_dir) $(d_bin) $(d_dev) $(d_mul) $(d_doc) $(d_src) + rm -fr $(d_bin) $(d_dev) $(d_iberty) $(d_mul) $(d_doc) $(d_src) + $(install_dir) $(d_bin) $(d_dev) $(d_iberty) $(d_mul) $(d_doc) $(d_src) : # install binutils and -dev stuff env MAKE="$(MAKE) VERSION=$(SINGLE_VERSION)" \ @@ -657,9 +659,6 @@ -e 's/^#define BFD_HOST_U_64_BIT unsigned \(long \)\?long *$$/#define BFD_HOST_U_64_BIT unsigned BFD_HOST_64_BIT/' \ $(d_bin)/$(PF)/include/bfd.h - : # copy libiberty.h ... not too keen on this, but it was requested - cp -f include/libiberty.h $(d_bin)/$(PF)/include - : # copy demangle.h ... not too keen on this, but it was requested cp -f include/demangle.h $(d_bin)/$(PF)/include @@ -721,7 +720,7 @@ $(call strip_package, $(p_mul), $(d_mul)) endif - : # Don't want /usr/-linux to exist in any package + : # Don't want /usr/-linux to exist in any package (except libiberty-dev) rm -rf $(d_bin)/$(PF)/$(DEB_HOST_GNU_TYPE) : # Remove windres manpages @@ -767,9 +766,12 @@ : # Remove empty directory rmdir $(d_bin)/$(PF)/include/ - : # install libiberty PIC library + : # split out libiberty-dev + $(install_dir) $(d_iberty)/$(PF)/lib/$(DEB_HOST_GNU_TYPE) $(d_iberty)/$(PF)/include/$(DEB_HOST_GNU_TYPE) + mv $(d_dev)/$(PF)/include/libiberty.h $(d_iberty)/$(PF)/include/$(DEB_HOST_GNU_TYPE) + mv $(d_dev)/$(PF)/lib/libiberty.a $(d_iberty)/$(PF)/lib/$(DEB_HOST_GNU_TYPE) $(install_file) builddir-single/libiberty/pic/libiberty.a \ - $(d_dev)/$(PF)/lib/libiberty_pic.a + $(d_iberty)/$(PF)/lib/$(DEB_HOST_GNU_TYPE)/libiberty_pic.a touch install-stamp diff -u binutils-2.23.1/debian/control.in binutils-2.23.1/debian/control.in --- binutils-2.23.1/debian/control.in +++ binutils-2.23.1/debian/control.in @@ -33,6 +33,16 @@ that building Debian packages which depend on the shared libbfd is Not Allowed. +Package: libiberty-dev +Architecture: any +Priority: extra +Multi-Arch: same +Breaks: binutils-dev (<< 2.23.1-0ubuntu6ma1) +Replaces: binutils-dev (<< 2.23.1-0ubuntu6ma1) +Description: GNU binary utilities (libiberty development files) + This package includes header files and static library necessary to build + programs which use the GNU libiberty library, which is part of binutils. + Package: binutils-multiarch Architecture: any Priority: extra