Package: bzip2
Version: 1.0.5-1
Severity: wishlist
Tags: patch
Hi,
the attached patch moves libraries to multiarch directories and sets
the Multi-Arch field for packages.
MfG
Goswin
-- System Information:
Debian Release: squeeze/sid
APT prefers unstable-i386
APT policy: (500, 'unstable-i386'), (500, 'unstable'), (200, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.22.2-mrvn
Locale: LANG=C, LC_CTYPE=de_DE (charmap=ISO-8859-1)
Shell: /bin/sh linked to /bin/bash
Versions of packages bzip2 depends on:
ii libbz2-1.0 1.0.5-1 high-quality block-sorting file co
ii libc6 2.9-12 GNU C Library: Shared libraries
bzip2 recommends no packages.
Versions of packages bzip2 suggests:
pn bzip2-doc <none> (no description available)
-- no debconf information
diff -u bzip2-1.0.5/debian/changelog bzip2-1.0.5/debian/changelog
--- bzip2-1.0.5/debian/changelog
+++ bzip2-1.0.5/debian/changelog
@@ -1,3 +1,9 @@
+bzip2 (1.0.5-1a0.multi.1) unstable; urgency=low
+
+ * Convert to multiarch
+
+ -- Goswin von Brederlow <goswin-...@web.de> Mon, 11 May 2009 02:46:51 +0200
+
bzip2 (1.0.5-1) unstable; urgency=low
* Fix "bzdiff doesn't work if $TMPDIR contains spaces"; closes: #493710
diff -u bzip2-1.0.5/debian/rules bzip2-1.0.5/debian/rules
--- bzip2-1.0.5/debian/rules
+++ bzip2-1.0.5/debian/rules
@@ -152,20 +152,20 @@
### Split
# Development package
- install -d debian/tmp-dev/usr/lib
+ install -d debian/tmp-dev/usr/lib/$(DEB_HOST_GNU_TYPE)
rm debian/tmp/lib/libbz2.so
- ln -s /lib/libbz2.so.1.0 debian/tmp-dev/usr/lib/libbz2.so
- mv debian/tmp/lib/libbz2.a debian/tmp-dev/usr/lib/
+ ln -s /lib/$(DEB_HOST_GNU_TYPE)/libbz2.so.1.0 debian/tmp-dev/usr/lib/$(DEB_HOST_GNU_TYPE)/libbz2.so
+ mv debian/tmp/lib/libbz2.a debian/tmp-dev/usr/lib/$(DEB_HOST_GNU_TYPE)/
mv debian/tmp/include debian/tmp-dev/usr/include
# Library package
- install -d debian/tmp-lib/lib
+ install -d debian/tmp-lib/lib/$(DEB_HOST_GNU_TYPE)
for i in $$(ls debian/tmp/lib/libbz2.so*); do \
- (set -x; echo $$i; mv $$i debian/tmp-lib/lib/); \
+ (set -x; echo $$i; mv $$i debian/tmp-lib/lib/$(DEB_HOST_GNU_TYPE)/); \
done
- ln -s libbz2.so.1.0.4 debian/tmp-lib/lib/libbz2.so.1
- chmod -x debian/tmp-lib/lib/*
+ ln -s libbz2.so.1.0.4 debian/tmp-lib/lib/$(DEB_HOST_GNU_TYPE)/libbz2.so.1
+ chmod -x debian/tmp-lib/lib/$(DEB_HOST_GNU_TYPE)/*
# Binary package
install -d debian/tmp-run
@@ -221,14 +221,14 @@
fi; \
done
$(DEBSTRIP) --strip-unneeded -R .note -R .comment \
- debian/tmp-lib/lib/*.so*
- $(DEBSTRIP) --strip-debug debian/tmp-dev/usr/lib/*.a
+ debian/tmp-lib/lib/$(DEB_HOST_GNU_TYPE)/*.so*
+ $(DEBSTRIP) --strip-debug debian/tmp-dev/usr/lib/$(DEB_HOST_GNU_TYPE)/*.a
# Control files
install -d debian/tmp-{lib,dev,run}/DEBIAN
cp debian/shlibs debian/tmp-lib/DEBIAN/shlibs
- dpkg-shlibdeps debian/tmp-lib/lib/*.so*
+ dpkg-shlibdeps debian/tmp-lib/lib/$(DEB_HOST_GNU_TYPE)/*.so*
dpkg-gencontrol -isp -Pdebian/tmp-lib -plibbz2-1.0
rm debian/substvars
dpkg-gencontrol -isp -Pdebian/tmp-dev -plibbz2-dev
diff -u bzip2-1.0.5/debian/control bzip2-1.0.5/debian/control
--- bzip2-1.0.5/debian/control
+++ bzip2-1.0.5/debian/control
@@ -11,6 +11,7 @@
Priority: important
Section: libs
Architecture: any
+Multi-Arch: yes
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: high-quality block-sorting file compressor library - runtime
This package contains libbzip2 which is used by the bzip2 compressor.
@@ -56,6 +57,7 @@
Priority: optional
Section: utils
Architecture: any
+Multi-Arch: no
Depends: libbz2-1.0 (=${binary:Version}), ${shlibs:Depends}
Suggests: bzip2-doc
Replaces: libbz2 (<<0.9.5d-3)
