reopen 637326 tags 637326 patch thanks Hi Steve,
The libaudio2 package is now marked Multi-Arch: same, but because all documentation is compressed with gzip without passing -n, the packages are not actually coinstallable - every gzipped file in the package, right down to the changelog, will be different for each build. Please update debian/rules to pass -n to gzip where appropriate. BTW, once this is done, it should also be possible to mark libaudio-dev Multi-Arch: same. :) Please find attached a patch to fix up these remaining issues. -- Steve Langasek Give me a lever long enough and a Free OS Debian Developer to set it on, and I can move the world. Ubuntu Developer http://www.debian.org/ slanga...@ubuntu.com vor...@debian.org
=== modified file 'debian/changelog'
--- debian/changelog 2011-08-10 12:45:41 +0000
+++ debian/changelog 2011-08-11 19:38:26 +0000
@@ -1,3 +1,13 @@
+nas (1.9.2-8ubuntu1) UNRELEASED; urgency=low
+
+ * Use -n for all gzip invocations, for multiarch. Closes: #637326.
+ * Mark libaudio-dev Multi-Arch: same as well.
+ * Install AuErrorDB to /usr/lib, not to a multiarch path, since it's
+ arch-independent; however, libaudio is looking for it in /usr/lib/X11
+ instead and has for some time, so there's still a bug here...
+
+ -- Steve Langasek <steve.langa...@ubuntu.com> Thu, 11 Aug 2011 11:32:46 -0700
+
nas (1.9.2-8) unstable; urgency=low
* Switch to multi-arch. Closes: #637326
=== modified file 'debian/control'
--- debian/control 2011-08-10 12:45:41 +0000
+++ debian/control 2011-08-11 19:40:38 +0000
@@ -45,6 +45,7 @@
Package: libaudio-dev
Priority: optional
Architecture: any
+Multi-Arch: same
Depends: libaudio2 (= ${binary:Version}), ${shlibs:Depends}
Provides: nas-dev
Replaces: nas-dev
=== modified file 'debian/rules'
--- debian/rules 2011-08-10 12:45:41 +0000
+++ debian/rules 2011-08-11 19:30:04 +0000
@@ -61,7 +61,7 @@
install -m644 README FAQ TODO debian/nas-doc/usr/share/doc/nas-doc
install -m644 HISTORY debian/nas-doc/usr/share/doc/nas-doc/changelog
install -m644 debian/changelog debian/nas-doc/usr/share/doc/nas-doc/changelog.Debian
- -gzip -9v debian/nas-doc/usr/share/doc/*/*
+ -gzip -9vn debian/nas-doc/usr/share/doc/*/*
cp debian/copyright debian/nas-doc/usr/share/doc/nas-doc
for file in preinst postinst prerm postrm config ; \
do \
@@ -129,7 +129,8 @@
ln -s libaudio.so.2.4 debian/libaudio-dev/usr/lib/$(DEB_HOST_MULTIARCH)/libaudio.so
# install libaudio2
- install -m644 lib/audio/libaudio.so.2.4 lib/audio/AuErrorDB debian/libaudio2/usr/lib/$(DEB_HOST_MULTIARCH)
+ install -m644 lib/audio/AuErrorDB debian/libaudio2/usr/lib
+ install -m644 lib/audio/libaudio.so.2.4 debian/libaudio2/usr/lib/$(DEB_HOST_MULTIARCH)
ln -s libaudio.so.2.4 debian/libaudio2/usr/lib/$(DEB_HOST_MULTIARCH)/libaudio.so.2
install -m644 lib/audio/libaudio.so.2.4 debian/libaudio2/usr/lib/$(DEB_HOST_MULTIARCH)
strip --strip-unneeded --remove-section=.comment --remove-section=.note debian/libaudio2/usr/lib/$(DEB_HOST_MULTIARCH)/libaudio.so.2.4
@@ -141,9 +142,9 @@
install -m 644 debian/start-nas.man debian/nas/usr/share/man/man1/start-nas.1nas
install -m 644 doc/man/nas.man debian/nas/usr/share/man/man1/nas.1nas
# Install documentation
- -gzip -9v debian/nas/usr/share/man/man*/*
- -gzip -9v debian/nas-bin/usr/share/man/man*/*
- -gzip -9v debian/libaudio-dev/usr/share/man/man*/*
+ -gzip -9vn debian/nas/usr/share/man/man*/*
+ -gzip -9vn debian/nas-bin/usr/share/man/man*/*
+ -gzip -9vn debian/libaudio-dev/usr/share/man/man*/*
ln -s nas.1nas.gz debian/nas/usr/share/man/man1/au.1nas.gz
for dir in $(archpacs); do install -m644 README FAQ TODO debian/$$dir/usr/share/doc/$$dir; done
for dir in $(archpacs); do install -m644 HISTORY debian/$$dir/usr/share/doc/$$dir/changelog; done
@@ -151,10 +152,10 @@
install -m644 debian/nas.README.Debian debian/nas/usr/share/doc/nas/README.Debian
# Now compress docs & clean up permissions
- -gzip -9v debian/nas/usr/share/doc/*/*
- -gzip -9v debian/libaudio-dev/usr/share/doc/*/*
- -gzip -9v debian/nas-bin/usr/share/doc/*/*
- -gzip -9v debian/libaudio2/usr/share/doc/*/*
+ -gzip -9vn debian/nas/usr/share/doc/*/*
+ -gzip -9vn debian/libaudio-dev/usr/share/doc/*/*
+ -gzip -9vn debian/nas-bin/usr/share/doc/*/*
+ -gzip -9vn debian/libaudio2/usr/share/doc/*/*
-chmod -Rv u+w debian/nas/usr/share/man
-chmod -Rv u+w debian/libaudio-dev/usr/include debian/libaudio-dev/usr/share/man
signature.asc
Description: Digital signature
