r15444 - in packages/trunk/supertux/debian: . patches

[Vincent Cheng]

Author: vcheng
Date: 2015-06-02 06:41:32 +0000 (Tue, 02 Jun 2015)
New Revision: 15444

Removed:
   packages/trunk/supertux/debian/patches/fix_spelling_errors.patch
Modified:
   packages/trunk/supertux/debian/changelog
   packages/trunk/supertux/debian/patches/embedded_libsquirrel.patch
   packages/trunk/supertux/debian/patches/fix_desktop_file.patch
   packages/trunk/supertux/debian/patches/series
Log:
supertux: refresh patches


Modified: packages/trunk/supertux/debian/changelog
===================================================================
--- packages/trunk/supertux/debian/changelog	2015-06-02 06:23:46 UTC (rev 15443)
+++ packages/trunk/supertux/debian/changelog	2015-06-02 06:41:32 UTC (rev 15444)
@@ -2,6 +2,7 @@
 
   * Upload to unstable. (Closes: #720108)
   * New upstream release. (Closes: #785686)
+  * Refresh existing patches.
   * Drop "--disable-sfx --disable-music" args in supertux menu file; sound
     effects and music are no longer excluded due to DFSG incompatibility.
   * Update debian/copyright.

Modified: packages/trunk/supertux/debian/patches/embedded_libsquirrel.patch
===================================================================
--- packages/trunk/supertux/debian/patches/embedded_libsquirrel.patch	2015-06-02 06:23:46 UTC (rev 15443)
+++ packages/trunk/supertux/debian/patches/embedded_libsquirrel.patch	2015-06-02 06:41:32 UTC (rev 15444)
@@ -4,7 +4,7 @@
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -154,7 +154,7 @@
+@@ -201,7 +201,7 @@
  
  ## Add squirrel lib dir to search path
  

Modified: packages/trunk/supertux/debian/patches/fix_desktop_file.patch
===================================================================
--- packages/trunk/supertux/debian/patches/fix_desktop_file.patch	2015-06-02 06:23:46 UTC (rev 15443)
+++ packages/trunk/supertux/debian/patches/fix_desktop_file.patch	2015-06-02 06:41:32 UTC (rev 15444)
@@ -1,6 +1,7 @@
-Description: Remove embedded Encoding key in supertux's menu entry file.
+Description: Update desktop menu entry file to conform to XDG specs
 Author: Vincent Cheng <vcheng at debian.org>
-Forwarded: not-yet
+Forwarded: https://github.com/SuperTux/supertux/pull/78
+Last-Update: 2015-06-01
 
 --- a/supertux2.desktop
 +++ b/supertux2.desktop
@@ -12,3 +13,8 @@
  Name=SuperTux 2
  Name[en]=SuperTux 2
  GenericName=Platform Game
+@@ -41,3 +40,4 @@
+ Terminal=false
+ StartupNotify=false
+ Categories=Game;ArcadeGame;
++Keywords=game;arcade;platform;

Deleted: packages/trunk/supertux/debian/patches/fix_spelling_errors.patch
===================================================================
--- packages/trunk/supertux/debian/patches/fix_spelling_errors.patch	2015-06-02 06:23:46 UTC (rev 15443)
+++ packages/trunk/supertux/debian/patches/fix_spelling_errors.patch	2015-06-02 06:41:32 UTC (rev 15444)
@@ -1,26 +0,0 @@
-Description: Fix various spelling errors caught by lintian
-Author: Vincent Cheng <vcheng at debian.org>
-Forwarded: not-yet
-
---- a/external/squirrel/sqstdlib/sqstdstring.cpp
-+++ b/external/squirrel/sqstdlib/sqstdstring.cpp
-@@ -88,7 +88,7 @@
- 		else {
- 			n++;
- 			if( nparam > sq_gettop(v) )
--				return sq_throwerror(v,_SC("not enough paramters for the given format string"));
-+				return sq_throwerror(v,_SC("not enough parameters for the given format string"));
- 			n = validate_format(v,fmt,format,n,w);
- 			if(n < 0) return -1;
- 			SQInteger addlen = 0;
---- a/external/tinygettext/tinygettext/po_parser.cpp
-+++ b/external/tinygettext/tinygettext/po_parser.cpp
-@@ -173,7 +173,7 @@
-   else
-   {
-     if (pedantic)
--      warning("keyword and string must be seperated by a single space");
-+      warning("keyword and string must be separated by a single space");
- 
-     for(;;)
-     {

Modified: packages/trunk/supertux/debian/patches/series
===================================================================
--- packages/trunk/supertux/debian/patches/series	2015-06-02 06:23:46 UTC (rev 15443)
+++ packages/trunk/supertux/debian/patches/series	2015-06-02 06:41:32 UTC (rev 15444)
@@ -1,3 +1,2 @@
 embedded_libsquirrel.patch
 fix_desktop_file.patch
-fix_spelling_errors.patch