tags 646302 + patch
tags 646302 + pending
thanks
Dear maintainer,
I am NMUing old-but-straightforward multiarch bugs. aalib has one such.
I've prepared an NMU for aalib (versioned as 1.4p5-39.1) to give it
multiarch support using vorlon's patch, and uploaded it to DELAYED/10,
as I note y0ou aren't in the low-threashold-NMU list. I hope this is
OK with you.
This fix is necessary for cross-building as well as multiple
architecture support. This package has build rdepends from 26 packages
in the archive. I test-built three of them (bb, jugglemaster and vlc)
to check that the multiarching didn't cause any obvious breakage. They
were fine.
I have not tried to fix up the aalib-config issue in order to make
libaa1-dev M-A: same too. I'll discuss this in another bug.
cheers,
Wookey
-- IMPORTANT NOTICE: The contents of this email and any attachments are
confidential and may also be privileged. If you are not the intended recipient,
please notify the sender immediately and do not disclose the contents to any
other person, use it for any purpose, or store or copy the information in any
medium. Thank you.
diff -u aalib-1.4p5/debian/libaa1-dev.install aalib-1.4p5/debian/libaa1-dev.install
--- aalib-1.4p5/debian/libaa1-dev.install
+++ aalib-1.4p5/debian/libaa1-dev.install
@@ -1,6 +1,6 @@
-usr/lib/libaa.so
-usr/lib/libaa.a
-usr/lib/libaa.la
+usr/lib/*/libaa.so
+usr/lib/*/libaa.a
+usr/lib/*/libaa.la
usr/bin/aalib-config
usr/include/
usr/share/man/man3/
diff -u aalib-1.4p5/debian/rules aalib-1.4p5/debian/rules
--- aalib-1.4p5/debian/rules
+++ aalib-1.4p5/debian/rules
@@ -37,15 +37,9 @@
dh_link -plibaa1-dbg /usr/share/doc/libaa1 /usr/share/doc/libaa1-dbg
dh install --remaining -v
- # Remove -lgpm from libaa.la
- sed s/-lgpm// debian/libaa1-dev/usr/lib/libaa.la > \
- debian/libaa1-dev/usr/lib/libaa.la.new
- mv -f debian/libaa1-dev/usr/lib/libaa.la.new \
- debian/libaa1-dev/usr/lib/libaa.la
-
# Empty dependency_libs field http://wiki.debian.org/ReleaseGoals/LAFileRemoval
# fixes non-empty-dependency_libs-in-la-file
- sed -i "/dependency_libs/ s/'.*'/''/" debian/libaa1-dev/usr/lib/libaa.la
+ sed -i "/dependency_libs/ s/'.*'/''/" debian/libaa1-dev/usr/lib/*/libaa.la
binary-arch: install
dh_strip -Nlibaa-bin --dbg-package=libaa1-dbg
diff -u aalib-1.4p5/debian/libaa1.install aalib-1.4p5/debian/libaa1.install
--- aalib-1.4p5/debian/libaa1.install
+++ aalib-1.4p5/debian/libaa1.install
@@ -1,2 +1,2 @@
-usr/lib/libaa.so.1.*
-usr/lib/libaa.so.1
+usr/lib/*/libaa.so.1.*
+usr/lib/*/libaa.so.1
diff -u aalib-1.4p5/debian/compat aalib-1.4p5/debian/compat
--- aalib-1.4p5/debian/compat
+++ aalib-1.4p5/debian/compat
@@ -1 +1 @@
-7
+9
diff -u aalib-1.4p5/debian/changelog aalib-1.4p5/debian/changelog
--- aalib-1.4p5/debian/changelog
+++ aalib-1.4p5/debian/changelog
@@ -1,3 +1,10 @@
+aalib (1.4p5-39.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Add multiarch support (from Steve Langasek) (Closes: #646302)
+
+ -- Wookey <woo...@wookware.org> Wed, 16 May 2012 16:48:15 +0000
+
aalib (1.4p5-39) unstable; urgency=low
* Replaced "... | not+linux-gnu" by "... [linux-any]". Closes: #587860.
diff -u aalib-1.4p5/debian/control aalib-1.4p5/debian/control
--- aalib-1.4p5/debian/control
+++ aalib-1.4p5/debian/control
@@ -2,7 +2,7 @@
Section: libs
Priority: optional
Maintainer: Bart Martens <ba...@debian.org>
-Build-Depends: dpkg-dev (>= 1.14.9), debhelper (>= 7), libslang2-dev, libx11-dev, libxt-dev, libncurses5-dev, libgpmg1-dev [linux-any], autoconf, libtool (>= 1.3.5), automake | automake1.10, dpkg-dev (>= 1.9.0), texinfo, patch
+Build-Depends: dpkg-dev (>= 1.14.9), debhelper (>= 8.1.3~), libslang2-dev, libx11-dev, libxt-dev, libncurses5-dev, libgpmg1-dev [linux-any], autoconf, libtool (>= 1.3.5), automake | automake1.10, dpkg-dev (>= 1.9.0), texinfo, patch
Standards-Version: 3.9.2
Homepage: http://aa-project.sourceforge.net/aalib/
@@ -22,8 +22,10 @@
Package: libaa1
Architecture: any
+Multi-Arch: same
Provides: aalib1
Replaces: aalib1
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: ASCII art library
AAlib is a portable ASCII art graphics library. Internally, it works like
@@ -46,6 +48,7 @@
Package: libaa1-dbg
Architecture: any
+Multi-Arch: same
Section: debug
Priority: extra
Depends: libaa1 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
