[SCM] Emulator of the Super Nintendo Entertainment System (TM) branch, master, updated. debian/1.510+bz2-3-7-g31bf3b5

[Etienne Millon]

The following commit has been merged in the master branch:
commit 56a66c979943eeb3df8eee6176054a44d9651966
Author: Etienne Millon <me at emillon.org>
Date:   Fri Jun 29 17:36:56 2012 +0200

    Disable build on amd64

diff --git a/debian/changelog b/debian/changelog
index b583922..ca18ce2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+zsnes (1.510+bz2-4) UNRELEASED; urgency=low
+
+  * Disable build on amd64 (Closes: #679526, #672935)
+
+ -- Etienne Millon <etienne.millon at gmail.com>  Fri, 29 Jun 2012 17:37:53 +0200
+
 zsnes (1.510+bz2-3) unstable; urgency=low
 
   * New patches :
diff --git a/debian/control b/debian/control
index 28eca5b..9610e34 100644
--- a/debian/control
+++ b/debian/control
@@ -8,24 +8,20 @@ Uploaders: Etienne Millon <etienne.millon at gmail.com>,
 Build-Depends: debhelper (>= 8),
                dh-autoreconf,
                dpkg-dev (>= 1.13.2),
-               g++-multilib [amd64],
-               gcc-multilib [amd64],
-               ia32-libs-dev [amd64],
-               lib32ncurses5-dev [amd64],
-               libao-dev [i386],
+               libao-dev,
                libgl1-mesa-dev | libgl-dev,
                libncurses5-dev | libncurses-dev,
                libpng-dev,
                libsdl1.2-dev (>= 1.2.2-3.1),
                nasm,
                sharutils,
-               zlib1g-dev [i386] | lib32z1-dev [amd64]
+               zlib1g-dev
 Standards-Version: 3.9.3
 Vcs-Git: git://git.debian.org/pkg-games/zsnes.git
 Vcs-Browser: http://git.debian.org/?p=pkg-games/zsnes.git
 
 Package: zsnes
-Architecture: amd64 i386
+Architecture: i386
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Emulator of the Super Nintendo Entertainment System
  ZSNES allows you to play classic games written for the Super Nintendo (SNES)
diff --git a/debian/rules b/debian/rules
index b4e19db..6d43f26 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,23 +10,14 @@
 #export DH_VERBOSE=1
 #export DH_OPTIONS=-v
 
-DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
-
 %:
 	dh $@ --sourcedirectory=src --with autoreconf
 
-ifeq ($(DEB_HOST_ARCH_CPU),i386)
-CONFIGURE_LIBAO := --enable-libao
-else
-CONFIGURE_LIBAO := --disable-libao
-LIBS := -L/usr/lib32
-endif
-
 override_dh_auto_configure:
 	dh_auto_configure --sourcedirectory=src -- \
-		LIBS="$(LIBS)" CFLAGS=-m32 LDFLAGS=-lpthread --enable-opengl \
+		CFLAGS=-m32 LDFLAGS=-lpthread --enable-opengl \
 		--disable-cpucheck --enable-release \
-		$(CONFIGURE_LIBAO) force_arch=i486
+		--enable-libao force_arch=i486
 
 override_dh_clean:
 	rm -f $$(find src/ -type f -name *.o) src/Makefile src/cfg.h src/config.h src/config.log src/config.status src/input.h src/makefile.dep src/md.h src/parsegen src/tools/depbuild src/zsnes

-- 
Emulator of the Super Nintendo Entertainment System (TM)