r10653 - in packages/trunk/desmume/debian: . patches

[Evgeni Golov]

Author: evgeni
Date: 2010-01-03 19:31:30 +0000 (Sun, 03 Jan 2010)
New Revision: 10653

Removed:
   packages/trunk/desmume/debian/patches/01_link-with-GL.patch
   packages/trunk/desmume/debian/patches/02_build-with-gcc-4.4.patch
   packages/trunk/desmume/debian/patches/03_build-on-hurd.patch
Modified:
   packages/trunk/desmume/debian/
   packages/trunk/desmume/debian/changelog
   packages/trunk/desmume/debian/control
   packages/trunk/desmume/debian/copyright
   packages/trunk/desmume/debian/patches/series
Log:
new upstream release



Property changes on: packages/trunk/desmume/debian
___________________________________________________________________
Modified: svn-bp:origUrl
   - http://pkg-games.alioth.debian.org/tarballs/desmume_0.9.4.orig.tar.gz
   + http://pkg-games.alioth.debian.org/tarballs/desmume_0.9.5.orig.tar.gz

Modified: packages/trunk/desmume/debian/changelog
===================================================================
--- packages/trunk/desmume/debian/changelog	2010-01-02 14:58:49 UTC (rev 10652)
+++ packages/trunk/desmume/debian/changelog	2010-01-03 19:31:30 UTC (rev 10653)
@@ -1,3 +1,15 @@
+desmume (0.9.5-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/copyright:
+    + Update my e-mail address and copyright years.
+  * debian/control:
+    + Add libagg-dev B-D.
+  * debian/patches:
+    + Drop all patches, either applied or superseeded by upstream.
+
+ -- Evgeni Golov <evgeni at debian.org>  Sun, 03 Jan 2010 20:30:35 +0100
+
 desmume (0.9.4-2) unstable; urgency=low
 
   [ Miriam Ruiz ]

Modified: packages/trunk/desmume/debian/control
===================================================================
--- packages/trunk/desmume/debian/control	2010-01-02 14:58:49 UTC (rev 10652)
+++ packages/trunk/desmume/debian/control	2010-01-03 19:31:30 UTC (rev 10653)
@@ -5,7 +5,7 @@
 Uploaders: Pascal Giard <pascal at debian.org>,
  Evgeni Golov <evgeni at debian.org>
 Build-Depends: debhelper (>= 5), libglade2-dev, libgtk2.0-dev, libsdl1.2-dev,
- libosmesa6-dev, intltool, quilt
+ libosmesa6-dev, libagg-dev, intltool, quilt
 Standards-Version: 3.8.3
 Homepage: http://desmume.org/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/desmume/

Modified: packages/trunk/desmume/debian/copyright
===================================================================
--- packages/trunk/desmume/debian/copyright	2010-01-02 14:58:49 UTC (rev 10652)
+++ packages/trunk/desmume/debian/copyright	2010-01-03 19:31:30 UTC (rev 10653)
@@ -178,7 +178,7 @@
 Files: debian/*
 Copyright: © 2007-2009 Reinhard Tartler <siretart at tauware.de> 
 Copyright: © 2007-2009 Pascal Giard <pascal at debian.org>
-Copyright: © 2008-2009 Evgeni Golov <sargentd at die-welt.net>
+Copyright: © 2008-2010 Evgeni Golov <evgeni at debian.org>
 License: GPL-2+
 
 License: GPL-2+ | GPL-any

Deleted: packages/trunk/desmume/debian/patches/01_link-with-GL.patch
===================================================================
--- packages/trunk/desmume/debian/patches/01_link-with-GL.patch	2010-01-02 14:58:49 UTC (rev 10652)
+++ packages/trunk/desmume/debian/patches/01_link-with-GL.patch	2010-01-03 19:31:30 UTC (rev 10653)
@@ -1,36 +0,0 @@
-From: Evgeni Golov <evgeni at debian.org>
-Date: 2009-04-26 08:29:37 +0200
-Subject: Link with -lGL so it does not FTBFS with --as-needed
-License: 3-BSD
-
---- desmume-0.9.2-1/configure	2009-04-24 21:39:30.000000000 +0200
-+++ desmume-0.9.2-1.patched/configure	2009-04-26 08:29:37.000000000 +0200
-@@ -6686,7 +6686,7 @@
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lOSMesa  $LIBS"
-+LIBS="-lOSMesa -lGL $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -6746,7 +6746,7 @@
- #define HAVE_LIBOSMESA 1
- _ACEOF
- 
--		LIBS="-lOSMesa $LIBS"
-+		LIBS="-lOSMesa -lGL $LIBS"
- 
- fi
- 
---- desmume-0.9.2-1/configure.ac	2009-04-24 21:38:35.000000000 +0200
-+++ desmume-0.9.2-1.patched/configure.ac	2009-04-26 08:28:16.000000000 +0200
-@@ -63,7 +63,7 @@
- 	AC_CHECK_LIB(OSMesa, main,[
- 		useosmesa=yes
- 		AC_DEFINE(HAVE_LIBOSMESA)
--		LIBS="-lOSMesa $LIBS"
-+		LIBS="-lOSMesa -lGL $LIBS"
- 	])
- fi
- 

Deleted: packages/trunk/desmume/debian/patches/02_build-with-gcc-4.4.patch
===================================================================
--- packages/trunk/desmume/debian/patches/02_build-with-gcc-4.4.patch	2010-01-02 14:58:49 UTC (rev 10652)
+++ packages/trunk/desmume/debian/patches/02_build-with-gcc-4.4.patch	2010-01-03 19:31:30 UTC (rev 10653)
@@ -1,14 +0,0 @@
-# See: http://bugs.debian.org/539545
-# See: http://desmume.svn.sourceforge.net/viewvc/desmume?view=rev&revision=2441
-
---- desmume-0.9.4.orig/src/texcache.h
-+++ desmume-0.9.4/src/texcache.h
-@@ -43,7 +43,7 @@
- 
- void TexCache_Reset();
- 
--template<TexCache_TexFormat format>
-+template<TexCache_TexFormat>
- void TexCache_SetTexture(u32 format, u32 texpal);
- 
- void TexCache_Invalidate();

Deleted: packages/trunk/desmume/debian/patches/03_build-on-hurd.patch
===================================================================
--- packages/trunk/desmume/debian/patches/03_build-on-hurd.patch	2010-01-02 14:58:49 UTC (rev 10652)
+++ packages/trunk/desmume/debian/patches/03_build-on-hurd.patch	2010-01-03 19:31:30 UTC (rev 10653)
@@ -1,20 +0,0 @@
-# Fix FTBFS on hurd-i386, patch taken from upstream SVN revision 2754.
-# See: http://desmume.svn.sourceforge.net/viewvc/desmume?view=rev&revision=2754
-
-Index: desmume-0.9.4/src/types.h
-===================================================================
---- desmume-0.9.4.orig/src/types.h	2009-08-09 23:57:16.000000000 +0200
-+++ desmume-0.9.4/src/types.h	2009-08-09 23:58:33.000000000 +0200
-@@ -38,8 +38,12 @@
- 
- #ifdef __GNUC__
- #include <limits.h>
-+#ifndef PATH_MAX
-+#define MAX_PATH 1024
-+#else
- #define MAX_PATH PATH_MAX
- #endif
-+#endif
- 
- #if defined(_MSC_VER) || defined(__INTEL_COMPILER)
- #define ALIGN(X) __declspec(align(X))

Modified: packages/trunk/desmume/debian/patches/series
===================================================================
--- packages/trunk/desmume/debian/patches/series	2010-01-02 14:58:49 UTC (rev 10652)
+++ packages/trunk/desmume/debian/patches/series	2010-01-03 19:31:30 UTC (rev 10653)
@@ -1,3 +1 @@
-01_link-with-GL.patch
-02_build-with-gcc-4.4.patch
-03_build-on-hurd.patch
+#