[pkg-s48-maint] Bug#414931: scsh-0.6: patch for amd64 support

[Trent Buck]

Package: scsh-0.6
Version: 0.6.7-3
Severity: wishlist

The attached patch makes scsh 0.6.7 compile on the amd64 platform,
using 32-bit libraries.  I do not know if it has detrimental
side-effects for other platforms.

There are two attachments; the former describes changes to the 0.6.7-3
diff.gz, the latter includes all the 0.6.7-3 changes and is itself a
.diff.gz.
-------------- next part --------------
diff -wpurNd scsh-0.6-0.6.7-3/debian/changelog scsh-0.6-0.6.7-4/debian/changelog
--- scsh-0.6-0.6.7-3/debian/changelog	2007-03-15 07:07:02.000000000 +1100
+++ scsh-0.6-0.6.7-4/debian/changelog	2007-03-15 07:07:12.000000000 +1100
@@ -1,3 +1,9 @@
+scsh-0.6 (0.6.7-4) unstable; urgency=low
+
+  * Add support for amd64 via ia32-libs.
+
+ -- Trent Buck <trentbuck at gmail.com>  Thu, 15 Mar 2007 06:07:12 +1100
+
 scsh-0.6 (0.6.7-3) unstable; urgency=low
 
   * Be binNMU-safe in dependency to -common
diff -wpurNd scsh-0.6-0.6.7-3/debian/control scsh-0.6-0.6.7-4/debian/control
--- scsh-0.6-0.6.7-3/debian/control	2007-03-15 07:07:02.000000000 +1100
+++ scsh-0.6-0.6.7-4/debian/control	2007-03-15 07:07:11.000000000 +1100
@@ -4,10 +4,10 @@ Priority: optional
 Maintainer: Scheme48 Maintainers Task Force <pkg-scheme48-maintainers at lists.alioth.debian.org>
 Uploaders: Lionel Elie Mamane <lmamane at debian.org>, Jorgen Sch?fer <forcer at debian.org>
 Standards-Version: 3.7.2
-Build-Depends: debhelper (>= 4), libelfg0-dev, type-handling
+Build-Depends: debhelper (>= 4), libelfg0-dev, type-handling, libc6-dev-i386 [amd64], ia32-libs [amd64]
 
 Package: scsh-0.6
-Architecture: i386 darwin-i386 freebsd-i386 kfreebsd-i386 knetbsd-i386 netbsd-i386 openbsd-i386 hurd-i386 arm darwin-arm freebsd-arm kfreebsd-arm knetbsd-arm netbsd-arm openbsd-arm hurd-arm hppa darwin-hppa freebsd-hppa kfreebsd-hppa knetbsd-hppa netbsd-hppa openbsd-hppa hurd-hppa m32r darwin-m32r freebsd-m32r kfreebsd-m32r knetbsd-m32r netbsd-m32r openbsd-m32r hurd-m32r m68k darwin-m68k freebsd-m68k kfreebsd-m68k knetbsd-m68k netbsd-m68k openbsd-m68k hurd-m68k mips darwin-mips freebsd-mips kfreebsd-mips knetbsd-mips netbsd-mips openbsd-mips hurd-mips mipsel darwin-mipsel freebsd-mipsel kfreebsd-mipsel knetbsd-mipsel netbsd-mipsel openbsd-mipsel hurd-mipsel powerpc darwin-powerpc freebsd-powerpc kfreebsd-powerpc knetbsd-powerpc netbsd-powerpc openbsd-powerpc hurd-powerpc s390 darwin-s390 freebsd-s390 kfreebsd-s390 knetbsd-s390 netbsd-s390 openbsd-s390 hurd-s390 sh3 darwin-sh3 freebsd-sh3 kfreebsd-sh3 knetbsd-sh3 netbsd-sh3 openbsd-sh3 hurd-sh3 sh3eb darwin-sh3eb freebsd-sh3eb kfreebsd-sh3eb knetbsd-sh3eb netbsd-sh3eb openbsd-sh3eb hurd-sh3eb sh4 darwin-sh4 freebsd-sh4 kfreebsd-sh4 knetbsd-sh4 netbsd-sh4 openbsd-sh4 hurd-sh4 sh4eb darwin-sh4eb freebsd-sh4eb kfreebsd-sh4eb knetbsd-sh4eb netbsd-sh4eb openbsd-sh4eb hurd-sh4eb sparc darwin-sparc freebsd-sparc kfreebsd-sparc knetbsd-sparc netbsd-sparc openbsd-sparc hurd-sparc
+Architecture: i386 darwin-i386 freebsd-i386 kfreebsd-i386 knetbsd-i386 netbsd-i386 openbsd-i386 hurd-i386 amd64 darwin-amd64 freebsd-amd64 kfreebsd-amd64 knetbsd-amd64 netbsd-amd64 openbsd-amd64 hurd-amd64 arm darwin-arm freebsd-arm kfreebsd-arm knetbsd-arm netbsd-arm openbsd-arm hurd-arm hppa darwin-hppa freebsd-hppa kfreebsd-hppa knetbsd-hppa netbsd-hppa openbsd-hppa hurd-hppa m32r darwin-m32r freebsd-m32r kfreebsd-m32r knetbsd-m32r netbsd-m32r openbsd-m32r hurd-m32r m68k darwin-m68k freebsd-m68k kfreebsd-m68k knetbsd-m68k netbsd-m68k openbsd-m68k hurd-m68k mips darwin-mips freebsd-mips kfreebsd-mips knetbsd-mips netbsd-mips openbsd-mips hurd-mips mipsel darwin-mipsel freebsd-mipsel kfreebsd-mipsel knetbsd-mipsel netbsd-mipsel openbsd-mipsel hurd-mipsel powerpc darwin-powerpc freebsd-powerpc kfreebsd-powerpc knetbsd-powerpc netbsd-powerpc openbsd-powerpc hurd-powerpc s390 darwin-s390 freebsd-s390 kfreebsd-s390 knetbsd-s390 netbsd-s390 openbsd-s390 hurd-s390 sh3 darwin-sh3 freebsd-sh3 kfreebsd-sh3 knetbsd-sh3 netbsd-sh3 openbsd-sh3 hurd-sh3 sh3eb darwin-sh3eb freebsd-sh3eb kfreebsd-sh3eb knetbsd-sh3eb netbsd-sh3eb openbsd-sh3eb hurd-sh3eb sh4 darwin-sh4 freebsd-sh4 kfreebsd-sh4 knetbsd-sh4 netbsd-sh4 openbsd-sh4 hurd-sh4 sh4eb darwin-sh4eb freebsd-sh4eb kfreebsd-sh4eb knetbsd-sh4eb netbsd-sh4eb openbsd-sh4eb hurd-sh4eb sparc darwin-sparc freebsd-sparc kfreebsd-sparc knetbsd-sparc netbsd-sparc openbsd-sparc hurd-sparc
 Depends: ${shlibs:Depends}, scsh-common-0.6 (= ${source:Version})
 Replaces: scsh (<= 0.6.6-3)
 Conflicts: scsh (<= 0.6.6-3)
diff -wpurNd scsh-0.6-0.6.7-3/debian/control.in scsh-0.6-0.6.7-4/debian/control.in
--- scsh-0.6-0.6.7-3/debian/control.in	2007-03-15 07:07:04.000000000 +1100
+++ scsh-0.6-0.6.7-4/debian/control.in	2007-03-15 07:07:13.000000000 +1100
@@ -4,10 +4,10 @@ Priority: optional
 Maintainer: Scheme48 Maintainers Task Force <pkg-scheme48-maintainers at lists.alioth.debian.org>
 Uploaders: Lionel Elie Mamane <lmamane at debian.org>, Jorgen Sch?fer <forcer at debian.org>
 Standards-Version: 3.7.2
-Build-Depends: debhelper (>= 4), libelfg0-dev, type-handling
+Build-Depends: debhelper (>= 4), libelfg0-dev, type-handling, libc6-dev-i386 [amd64], ia32-libs [amd64]
 
 Package: scsh-0.6
-Cpu: i386,arm,hppa,m32r,m68k,mips,mipsel,powerpc,s390,sh3,sh3eb,sh4,sh4eb,sparc
+Cpu: i386,arm,hppa,m32r,m68k,mips,mipsel,powerpc,s390,sh3,sh3eb,sh4,sh4eb,sparc,amd64
 System: any
 Depends: ${shlibs:Depends}, scsh-common-0.6 (= ${source:Version})
 Replaces: scsh (<= 0.6.6-3)
diff -wpurNd scsh-0.6-0.6.7-3/debian/rules scsh-0.6-0.6.7-4/debian/rules
--- scsh-0.6-0.6.7-3/debian/rules	2007-03-15 07:07:02.000000000 +1100
+++ scsh-0.6-0.6.7-4/debian/rules	2007-03-15 07:07:11.000000000 +1100
@@ -2,7 +2,7 @@
 
 SHELL = /bin/bash
 
-CFLAGS = -g -Wall
+CFLAGS = -g -Wall -m32
 
 INSTALL:=install
 INSTALL_DATA:=$(INSTALL) -m 644
-------------- next part --------------
A non-text attachment was scrubbed...
Name: scsh-0.6_0.6.7-4.diff.gz
Type: application/octet-stream
Size: 95214 bytes
Desc: not available
Url : http://lists.alioth.debian.org/pipermail/pkg-scheme48-maintainers/attachments/20070315/82d2d1c6/scsh-0.6_0.6.7-4.diff-0001.obj