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

[Stephen Kitt]

The following commit has been merged in the master branch:
commit 94b67b9240c6f7d4e4c24dd12623ae3a6f7061ff
Author: Stephen Kitt <steve at sk2.org>
Date:   Thu Dec 29 23:41:22 2011 +0100

    New upstream version, including all patches.

diff --git a/debian/changelog b/debian/changelog
index a5b5ed3..23d83a4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+stella (3.5-1) unstable; urgency=low
+
+  * New upstream version.
+  * Drop all patches, merged upstream.
+
+ -- Stephen Kitt <steve at sk2.org>  Thu, 29 Dec 2011 23:36:59 +0100
+
 stella (3.4.1-2) unstable; urgency=low
 
   * Make Stella available in the "Open With Other Applications..." menu
diff --git a/debian/patches/build-with-gcc-4.6.patch b/debian/patches/build-with-gcc-4.6.patch
deleted file mode 100644
index 776531d..0000000
--- a/debian/patches/build-with-gcc-4.6.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-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
deleted file mode 100644
index dbbf82c..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-build-with-gcc-4.6.patch
-stella-open-with.patch
diff --git a/debian/patches/stella-open-with.patch b/debian/patches/stella-open-with.patch
deleted file mode 100644
index c25053f..0000000
--- a/debian/patches/stella-open-with.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Indicate that stella accepts a single filename as argument
-Author: Stephen Kitt <steve at sk2.org>
-Forwarded: yes
-
-Adding "%f" to the "Exec" stanza causes Nautilus to make Stella
-available in the "Open With Other Application..." menu on a file. See
-https://bugs.launchpad.net/ubuntu/+source/stella/+bug/880114 for the
-bug report which prompted this.
-
---- stella.orig/src/unix/stella.desktop
-+++ stella/src/unix/stella.desktop
-@@ -1,7 +1,7 @@
- [Desktop Entry]
- Name=Stella
- Comment=A multi-platform Atari 2600 emulator
--Exec=stella
-+Exec=stella %f
- Icon=stella.png
- Terminal=false
- Type=Application

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