r13266 - in packages/trunk/zaz/debian: . patches

[Paul Wise]

Author: pabs
Date: 2012-02-19 08:36:54 +0000 (Sun, 19 Feb 2012)
New Revision: 13266

Modified:
   packages/trunk/zaz/debian/changelog
   packages/trunk/zaz/debian/patches/mismatched_delete.patch
   packages/trunk/zaz/debian/patches/no_music.patch
   packages/trunk/zaz/debian/patches/no_music_2.patch
Log:
Clean up patches and add DEP-3 headers

Modified: packages/trunk/zaz/debian/changelog
===================================================================
--- packages/trunk/zaz/debian/changelog	2012-02-19 08:27:01 UTC (rev 13265)
+++ packages/trunk/zaz/debian/changelog	2012-02-19 08:36:54 UTC (rev 13266)
@@ -8,6 +8,7 @@
   * Wrap and sort various files for more readable diffs
   * Drop dh-buildinfo since it isn't useful these days
   * Drop quilt build-dep, not needed with dpkg-source v3
+  * Clean up patches and add DEP-3 headers
   * Use slightly shorter homepage
 
  -- Miriam Ruiz <little_miry at yahoo.es>  Tue, 29 Nov 2011 23:11:19 +0100

Modified: packages/trunk/zaz/debian/patches/mismatched_delete.patch
===================================================================
--- packages/trunk/zaz/debian/patches/mismatched_delete.patch	2012-02-19 08:27:01 UTC (rev 13265)
+++ packages/trunk/zaz/debian/patches/mismatched_delete.patch	2012-02-19 08:36:54 UTC (rev 13266)
@@ -2,6 +2,8 @@
 Description: Fix crash, fixes a potential memory corruption
 Bug-Debian: http://bugs.debian.org/649017
 Bug-Ubuntu: http://launchpad.net/bugs/656468                         
+Forwarded: no
+Last-Update: 2011-11-16
 --- a/src/game.cpp
 +++ b/src/game.cpp
 @@ -266,7 +266,7 @@

Modified: packages/trunk/zaz/debian/patches/no_music.patch
===================================================================
--- packages/trunk/zaz/debian/patches/no_music.patch	2012-02-19 08:27:01 UTC (rev 13265)
+++ packages/trunk/zaz/debian/patches/no_music.patch	2012-02-19 08:36:54 UTC (rev 13266)
@@ -1,5 +1,9 @@
---- zaz-1.0.0.orig/data/Makefile.am
-+++ zaz-1.0.0/data/Makefile.am
+Author: Miriam Ruiz <little_miry at yahoo.es>
+Description: disable the use of the non-free music
+Forwarded: no
+Last-Update: 2011-11-16
+--- a/data/Makefile.am
++++ b/data/Makefile.am
 @@ -20,10 +20,6 @@
  	player.png\
  	FreeSans.ttf\
@@ -11,8 +15,8 @@
  	pull.ogg\
  	push.ogg\
  	ouch.ogg\
---- zaz-1.0.0.orig/data/Makefile.in
-+++ zaz-1.0.0/data/Makefile.in
+--- a/data/Makefile.in
++++ b/data/Makefile.in
 @@ -216,10 +216,6 @@
  	player.png\
  	FreeSans.ttf\
@@ -24,8 +28,8 @@
  	pull.ogg\
  	push.ogg\
  	ouch.ogg\
---- zaz-1.0.0.orig/src/mainmenu.cpp
-+++ zaz-1.0.0/src/mainmenu.cpp
+--- a/src/mainmenu.cpp
++++ b/src/mainmenu.cpp
 @@ -113,10 +113,6 @@
      credits.push_back(CreditsLine(_("Remigiusz Dybka"), true));
      credits.push_back(CreditsLine(_("[remigiusz.dybka at gmail.com] Released under GPLv3 License")));
@@ -37,8 +41,8 @@
      credits.push_back(CreditsLine(_("quality assurance:")));
      credits.push_back(CreditsLine(_("Kinga Dybka"), true));
      credits.push_back(CreditsLine(_("Michael Sterrett"), true));
---- zaz-1.0.0.orig/src/game.cpp
-+++ zaz-1.0.0/src/game.cpp
+--- a/src/game.cpp
++++ b/src/game.cpp
 @@ -251,7 +251,8 @@
      }
      else
@@ -49,8 +53,8 @@
      }
      return string(phname);
  }
---- zaz-1.0.0.orig/src/streamingoggsample.cpp
-+++ zaz-1.0.0/src/streamingoggsample.cpp
+--- a/src/streamingoggsample.cpp
++++ b/src/streamingoggsample.cpp
 @@ -27,10 +27,16 @@
      bufflen = 0;
      buff = 0;

Modified: packages/trunk/zaz/debian/patches/no_music_2.patch
===================================================================
--- packages/trunk/zaz/debian/patches/no_music_2.patch	2012-02-19 08:27:01 UTC (rev 13265)
+++ packages/trunk/zaz/debian/patches/no_music_2.patch	2012-02-19 08:36:54 UTC (rev 13266)
@@ -2,6 +2,8 @@
 Description: Fix crash, makes Restart() a no-op if the music isn't loaded
 Bug-Debian: http://bugs.debian.org/649017
 Bug-Ubuntu: http://launchpad.net/bugs/656468
+Forwarded: no
+Last-Update: 2011-11-16
 --- a/src/streamingoggsample.cpp
 +++ b/src/streamingoggsample.cpp
 @@ -141,6 +141,11 @@