tags 629693 + patch tags 629693 + pending thanks Dear maintainer,
I've prepared an NMU for spim (versioned as 8.0+dfsg-5.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Regards. -- .''`. Homepage: http://info.comodo.priv.at/ - OpenPGP key 0xBB3A68018649AA06 : :' : Debian GNU/Linux user, admin, and developer - http://www.debian.org/ `. `' Member of VIBE!AT & SPI, fellow of the Free Software Foundation Europe `- NP: Rod Stewart: You're In My Heart
diff -Nru spim-8.0+dfsg/debian/changelog spim-8.0+dfsg/debian/changelog --- spim-8.0+dfsg/debian/changelog 2010-04-20 13:37:45.000000000 +0200 +++ spim-8.0+dfsg/debian/changelog 2012-01-30 17:46:38.000000000 +0100 @@ -1,3 +1,14 @@ +spim (8.0+dfsg-5.1) unstable; urgency=low + + * Non-maintainer upload. + * Fix "FTBFS: ../CPU/spim-utils.c:117:7: error: invalid use of void + expression": add patch configure-multiarch from Ubuntu / Matthias Klose: + - Fix configury with multiarch libc. LP: #756116. + Additionally, add versioned build dependency on dpkg-dev. + (Closes: #629693) + + -- gregor herrmann <[email protected]> Mon, 30 Jan 2012 17:43:23 +0100 + spim (8.0+dfsg-5) unstable; urgency=low * Remove nonsensical recommends (thanks Piotr Engelking)(closes: #578484) diff -Nru spim-8.0+dfsg/debian/control spim-8.0+dfsg/debian/control --- spim-8.0+dfsg/debian/control 2010-04-20 13:37:45.000000000 +0200 +++ spim-8.0+dfsg/debian/control 2012-01-30 17:46:38.000000000 +0100 @@ -3,7 +3,7 @@ Priority: extra Maintainer: Jean-Christophe Dubacq <[email protected]> Uploaders: Mackenzie Morgan <[email protected]> -Build-depends: debhelper (>= 7.0.50~), libxaw7-dev, bison, flex, xutils-dev +Build-depends: debhelper (>= 7.0.50~), libxaw7-dev, bison, flex, xutils-dev, dpkg-dev (>= 1.16.0) Standards-Version: 3.8.4 Vcs-Browser: https://www-lipn.univ-paris13.fr/projects/jcdubacq/browser/debian/trunk/spim Vcs-Svn: https://www-lipn.univ-paris13.fr/svn/jcdubacq/debian/trunk/spim diff -Nru spim-8.0+dfsg/debian/patches/configure-multiarch spim-8.0+dfsg/debian/patches/configure-multiarch --- spim-8.0+dfsg/debian/patches/configure-multiarch 1970-01-01 01:00:00.000000000 +0100 +++ spim-8.0+dfsg/debian/patches/configure-multiarch 2012-01-30 17:43:15.000000000 +0100 @@ -0,0 +1,35 @@ +Description: Fix configury with multiarch libc. +Bug-Ubuntu: https://bugs.launchpad.net/bugs/756116 +Bug-Debian: http://bugs.debian.org/629693 +Forwarded: no +Author: Matthias Klose <[email protected]> +Reviewed-by: gregor herrmann <[email protected]> +Last-Update: 2012-01-30 + +--- spim-8.0+dfsg.orig/spim/Configure ++++ spim-8.0+dfsg/spim/Configure +@@ -74,7 +74,15 @@ fi; + rm -f endian endian.exe + + +-if [ -f /usr/lib/libc.a ]; then ++multiarch=$(dpkg-architecture -qDEB_HOST_MULTIARCH) ++ ++if [ -f /usr/lib/$multiarch/libc.a ]; then ++ # Debian Universe: ++ echo Looks like a Debian universe exists... ++ echo Scaning libc ++ nm /usr/lib/$multiarch/libc.a > library_contents ++ set flag = -s ++else if [ -f /usr/lib/libc.a ]; then + # BSD Universe: + echo Looks like a BSD universe exists... + echo Scaning libc +@@ -106,6 +114,7 @@ else if [ -f /usr/lib64/libc.a ]; then + fi; + fi; + fi; ++fi; + fi; + fi; + diff -Nru spim-8.0+dfsg/debian/patches/series spim-8.0+dfsg/debian/patches/series --- spim-8.0+dfsg/debian/patches/series 2010-04-20 13:37:45.000000000 +0200 +++ spim-8.0+dfsg/debian/patches/series 2012-01-30 17:41:53.000000000 +0100 @@ -1,2 +1,3 @@ build hyphens +configure-multiarch
signature.asc
Description: Digital signature
