Bug#692137: unblock(pre-approval): zsnes/1.510+bz2-5

[Fabian Greffrath <fabian@greffrath.com>]

Am 02.11.2012 16:24, schrieb Fabian Greffrath:
> Please find the output of git-diff attached.

The patch got mangled up somehow. Please find the right one attached.

 - Fabian


diff --git a/debian/changelog b/debian/changelog
index d33b3f6..5ed5541 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+zsnes (1.510+bz2-5) unstable; urgency=low
+
+  * Build zsnes without libao support for wheezy.
+    libao has often been a source of trouble for zsnes. Without libao support
+    it will fall back to the SDL audio driver. Furthermore it will make it
+    possible to install the zsnes package via multi-arch (see #638741).
+
+ -- Fabian Greffrath <fabian+debian@greffrath.com>  Fri, 02 Nov 2012 15:07:44 +0100
+
 zsnes (1.510+bz2-4) unstable; urgency=low
 
   [ Etienne Millon ]
diff --git a/debian/control b/debian/control
index 436e071..ad02959 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,6 @@ Uploaders: Etienne Millon <etienne.millon@gmail.com>,
 Build-Depends: debhelper (>= 9),
                dh-autoreconf,
                dpkg-dev (>= 1.13.2),
-               libao-dev,
                libgl1-mesa-dev | libgl-dev,
                libncurses5-dev | libncurses-dev,
                libpng-dev,
diff --git a/debian/rules b/debian/rules
index 5090080..6bba2f4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,7 +19,7 @@ override_dh_auto_configure:
 	dh_auto_configure --sourcedirectory=src -- \
 		--enable-opengl \
 		--disable-cpucheck --enable-release \
-		--enable-libao force_arch=i486
+		force_arch=i486
 
 override_dh_clean:
 	rm -f 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