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

[Stephen Kitt]

The following commit has been merged in the master branch:
commit c1b2e8cb0c2cbc01f4ba1d9d35de5d34a3856fef
Author: Stephen Kitt <steve at sk2.org>
Date:   Mon May 30 07:07:49 2011 +0200

    Drop all patches, merged upstream.

diff --git a/debian/changelog b/debian/changelog
index a7952a2..79cb272 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ stella (3.4-1) unstable; urgency=low
   * New upstream version.
   * Update package description with new features in 3.4.
   * Standards-Version 3.9.2, no change required.
+  * Drop all patches, merged upstream.
 
  -- Stephen Kitt <steve at sk2.org>  Mon, 30 May 2011 07:02:40 +0200
 
diff --git a/debian/patches/01-fix-desktop.patch b/debian/patches/01-fix-desktop.patch
deleted file mode 100644
index 9616967..0000000
--- a/debian/patches/01-fix-desktop.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-Remove the unnecessary Encoding specification.
-
---- stella-3.1.orig/src/unix/stella.desktop
-+++ stella-3.1/src/unix/stella.desktop
-@@ -1,5 +1,4 @@
- [Desktop Entry]
--Encoding=UTF-8
- Name=Stella
- Comment=A multi-platform Atari 2600 emulator
- Exec=stella
diff --git a/debian/patches/02-kfreebsd-hurd-support.patch b/debian/patches/02-kfreebsd-hurd-support.patch
deleted file mode 100644
index ccf806f..0000000
--- a/debian/patches/02-kfreebsd-hurd-support.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-Handle kfreebsd and hurd in the same way as other Unix variants.  On
-hurd, we can't use MAXPATHLEN since it doesn't exist, so use
-get_current_dir_name() instead; and since path names don't have a
-limit on length, removing the length check on the HOME environment
-variable doesn't weaken security.
-
---- stella.orig/configure
-+++ stella/configure
-@@ -472,7 +472,7 @@
- 	echo_n "Checking hosttype... "
- 	echo $_host_os
- 	case $_host_os in
--		linux* | openbsd* | freebsd* | netbsd* | bsd* | sunos* | hpux* | beos*)
-+		linux* | openbsd* | freebsd* | kfreebsd* | netbsd* | bsd* | gnu0.3 | sunos* | hpux* | beos*)
- 			DEFINES="$DEFINES -DUNIX"
- 			_host_os=unix
- 			;;
---- stella.orig/src/unix/FSNodePOSIX.cxx
-+++ stella/src/unix/FSNodePOSIX.cxx
-@@ -134,7 +134,11 @@
-   if ( p.length() >= 2 && p[0] == '~' && p[1] == '/')
-   {
-     const char *home = getenv("HOME");
-+#ifdef MAXPATHLEN
-     if (home != NULL && strlen(home) < MAXPATHLEN)
-+#else // No MAXPATHLEN, as happens on Hurd
-+    if (home != NULL)
-+#endif
-     {
-       _path = home;
-       // Skip over the tilde.  We know that p contains at least
-@@ -145,14 +149,22 @@
-   // Expand "./" to the current directory
-   else if ( p.length() >= 2 && p[0] == '.' && p[1] == '/')
-   {
-+#ifdef MAXPATHLEN
-     char buf[MAXPATHLEN];
-     char* ret = getcwd(buf, MAXPATHLEN);
--    if (ret == buf)
-+#else // No MAXPATHLEN, as happens on Hurd
-+    char* ret = get_current_dir_name();
-+    char* buf = ret;
-+#endif
-+    if (ret == buf && ret != NULL)
-     {
-       _path = buf;
--      // Skip over the tilda.  We know that p contains at least
-+      // Skip over the dot.  We know that p contains at least
-       // two chars, so this is safe:
-       _path += p.c_str() + 1;
-+#ifndef MAXPATHLEN
-+      free(ret);
-+#endif
-     }
-   }
-   else
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 1792cf2..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-01-fix-desktop.patch
-02-kfreebsd-hurd-support.patch

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