[SCM] Atari 2600 Emulator for SDL & the X Window System branch, master, updated. debian/3.4.1-1-2-g06f3748

[Stephen Kitt]

The following commit has been merged in the master branch:
commit 06f3748067db453975d2102a0af7c8d3092a2b95
Author: Stephen Kitt <steve at sk2.org>
Date:   Wed Oct 26 23:47:47 2011 +0200

    Build with gcc 4.6.1 (which identifies itself as gcc 4.6).

diff --git a/debian/changelog b/debian/changelog
index e7f19a4..a5b5ed3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ stella (3.4.1-2) unstable; urgency=low
   * Make Stella available in the "Open With Other Applications..." menu
     in Gnome (and presumably similar entries in other desktop
     environments; LP: #880114).
+  * Build with gcc 4.6.1 (which identifies itself as gcc 4.6).
 
  -- Stephen Kitt <steve at sk2.org>  Wed, 26 Oct 2011 23:04:32 +0200
 
diff --git a/debian/patches/build-with-gcc-4.6.patch b/debian/patches/build-with-gcc-4.6.patch
new file mode 100644
index 0000000..776531d
--- /dev/null
+++ b/debian/patches/build-with-gcc-4.6.patch
@@ -0,0 +1,19 @@
+Description: Build with gcc 4.6 which reports itself as 4.6 only
+Author: Stephen Kitt <steve at sk2.org>
+Forwarded: yes
+
+gcc 4.6.1 on Debian now reports its version as 4.6 only. This patch
+adds the appropriate expression to the case statement matching
+supported gcc versions.
+
+--- stella.orig/configure
++++ stella/configure
+@@ -383,7 +383,7 @@
+ fi
+ 
+ case $cxx_version in
+-	2.95.[2-9]|2.95.[2-9][-.]*|3.[0-9]|3.[0-9].[0-9]|3.[0-9].[0-9][-.]*|4.[0-9].[0-9]|4.[0-9].[0-9][-.]*)
++	2.95.[2-9]|2.95.[2-9][-.]*|3.[0-9]|3.[0-9].[0-9]|3.[0-9].[0-9][-.]*|4.[0-9]|4.[0-9].[0-9]|4.[0-9].[0-9][-.]*)
+ 		_cxx_major=`echo $cxx_version | cut -d '.' -f 1`
+ 		_cxx_minor=`echo $cxx_version | cut -d '.' -f 2`
+ 		cxx_version="$cxx_version, ok"
diff --git a/debian/patches/series b/debian/patches/series
index 27e6e75..dbbf82c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+build-with-gcc-4.6.patch
 stella-open-with.patch

-- 
Atari 2600 Emulator for SDL & the X Window System