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

Miriam Ruiz miriam at alioth.debian.org
Wed Nov 16 01:38:01 UTC 2011 

Author: miriam
Date: 2011-11-16 01:38:01 +0000 (Wed, 16 Nov 2011)
New Revision: 12804

Modified:
   packages/trunk/zaz/debian/changelog
   packages/trunk/zaz/debian/control
   packages/trunk/zaz/debian/patches/no_music.patch
   packages/trunk/zaz/debian/rules
Log:
New Upstream Release



Modified: packages/trunk/zaz/debian/changelog
===================================================================
--- packages/trunk/zaz/debian/changelog	2011-11-14 19:55:28 UTC (rev 12803)
+++ packages/trunk/zaz/debian/changelog	2011-11-16 01:38:01 UTC (rev 12804)
@@ -1,3 +1,11 @@
+zaz (1.0.0~dfsg1-1) UNRELEASED; urgency=low
+
+  * New Upstream Release
+  * Upgraded Standards-Version from 3.8.3 to 3.9.2
+  * New homepage: http://phuzzboxmedia.com/index.php/games/open-sourced-zaz
+
+ -- Miriam Ruiz <little_miry at yahoo.es>  Wed, 16 Nov 2011 02:28:10 +0100
+
 zaz (0.3.1+dfsg1-1) UNRELEASED; urgency=low
 
   * New Upstream Release

Modified: packages/trunk/zaz/debian/control
===================================================================
--- packages/trunk/zaz/debian/control	2011-11-14 19:55:28 UTC (rev 12803)
+++ packages/trunk/zaz/debian/control	2011-11-16 01:38:01 UTC (rev 12804)
@@ -1,13 +1,13 @@
 Source: zaz
 Section: games
-Priority: extra
+Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Miriam Ruiz <little_miry at yahoo.es>
 Build-Depends: debhelper (>= 7), quilt, dh-buildinfo, autotools-dev, pkg-config,
  gettext, ttf-freefont, libgl1-mesa-dev, libglu1-mesa-dev, libsdl1.2-dev,
  libxext-dev, libsdl-image1.2-dev, libftgl-dev, libvorbis-dev, libtheora-dev
-Standards-Version: 3.8.3
-Homepage: http://sourceforge.net/projects/zaz/
+Standards-Version: 3.9.2
+Homepage: http://phuzzboxmedia.com/index.php/games/open-sourced-zaz
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/zaz/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/zaz/?op=log
 

Modified: packages/trunk/zaz/debian/patches/no_music.patch
===================================================================
--- packages/trunk/zaz/debian/patches/no_music.patch	2011-11-14 19:55:28 UTC (rev 12803)
+++ packages/trunk/zaz/debian/patches/no_music.patch	2011-11-16 01:38:01 UTC (rev 12804)
@@ -1,6 +1,6 @@
---- a/data/Makefile.am
-+++ b/data/Makefile.am
-@@ -14,10 +14,6 @@ shared_DATA = \
+--- zaz-1.0.0.orig/data/Makefile.am
++++ zaz-1.0.0/data/Makefile.am
+@@ -20,10 +20,6 @@
  	player.png\
  	FreeSans.ttf\
  	FreeMonoBold.ttf\
@@ -11,9 +11,9 @@
  	pull.ogg\
  	push.ogg\
  	ouch.ogg\
---- a/data/Makefile.in
-+++ b/data/Makefile.in
-@@ -213,10 +213,6 @@ shared_DATA = \
+--- zaz-1.0.0.orig/data/Makefile.in
++++ zaz-1.0.0/data/Makefile.in
+@@ -216,10 +216,6 @@
  	player.png\
  	FreeSans.ttf\
  	FreeMonoBold.ttf\
@@ -24,24 +24,22 @@
  	pull.ogg\
  	push.ogg\
  	ouch.ogg\
---- a/src/mainmenu.cpp
-+++ b/src/mainmenu.cpp
-@@ -599,9 +599,9 @@ void MainMenu::Render(ulong frame)
-         CenterMsg(_("Remigiusz Dybka"), 43.5, font, 0.1);
-         CenterMsg(_("[remigiusz.dybka at gmail.com]"), 41.5, font, 0.08);
- 
--        CenterMsg(_("music:"), 37, font, 0.08);
--        CenterMsg(_("paniq"), 34.5, font, 0.1);
--        CenterMsg(_("[http://www.paniq.org] Released under CC BY-SA License"), 32.5, font, 0.08);
-+        //CenterMsg(_("music:"), 37, font, 0.08);
-+        //CenterMsg(_("paniq"), 34.5, font, 0.1);
-+        //CenterMsg(_("[http://www.paniq.org] Released under CC BY-SA License"), 32.5, font, 0.08);
- 
-         CenterMsg(_("quality assurance:"), 28, font, 0.08);
-         CenterMsg(_("Kinga Dybka"), 25.5, font, 0.1);
---- a/src/game.cpp
-+++ b/src/game.cpp
-@@ -235,7 +235,8 @@ const string Game::getRandomMusic()
+--- zaz-1.0.0.orig/src/mainmenu.cpp
++++ zaz-1.0.0/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")));
+     credits.push_back(CreditsLine("-"));
+-    credits.push_back(CreditsLine(_("music:")));
+-    credits.push_back(CreditsLine(_("paniq - Leonard Ritter"), true));
+-    credits.push_back(CreditsLine(_("[http://www.paniq.org] Released under CC BY-SA License")));
+-    credits.push_back(CreditsLine("-"));
+     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
+@@ -251,7 +251,8 @@
      }
      else
      {
@@ -51,9 +49,9 @@
      }
      return string(phname);
  }
---- a/src/streamingoggsample.cpp
-+++ b/src/streamingoggsample.cpp
-@@ -27,10 +27,16 @@ StreamingOggSample::StreamingOggSample(c
+--- zaz-1.0.0.orig/src/streamingoggsample.cpp
++++ zaz-1.0.0/src/streamingoggsample.cpp
+@@ -27,10 +27,16 @@
      bufflen = 0;
      buff = 0;
  
@@ -71,7 +69,7 @@
      }
  
      if (ov_open_callbacks(inphile, &vf, NULL, 0, OV_CALLBACKS_NOCLOSE) < 0)
-@@ -45,6 +51,15 @@ StreamingOggSample::StreamingOggSample(c
+@@ -45,6 +51,15 @@
      length = ov_pcm_total(&vf, -1) * channels;
  
      loaded = true;

Modified: packages/trunk/zaz/debian/rules
===================================================================
--- packages/trunk/zaz/debian/rules	2011-11-14 19:55:28 UTC (rev 12803)
+++ packages/trunk/zaz/debian/rules	2011-11-16 01:38:01 UTC (rev 12804)
@@ -112,20 +112,22 @@
 	dh_md5sums -a
 	dh_builddeb -a
 
+ORIG_VERSION=1.0.0
+
 get-orig-source:
 	dh_testdir
 	dh_testroot
-	rm -fv zaz-0.3.?.tar.gz
-	wget http://downloads.sourceforge.net/project/zaz/zaz-0.3.1.tar.gz?use_mirror=freefr
-	rm -rfv zaz-0.3.?
-	tar xvfz zaz-0.3.?.tar.gz
-	rm -v zaz-0.3.?.tar.gz
-	# Remove CC-by-sa-nc music by Nine Inch Nails
-	rm -fv zaz-0.3.?/data/mus?.ogg
+	rm -fv zaz-$(ORIG_VERSION).tar.bz2
+	wget http://heanet.dl.sourceforge.net/project/zaz/zaz-$(ORIG_VERSION).tar.bz2
+	rm -rfv zaz-$(ORIG_VERSION)
+	tar xvfj zaz-$(ORIG_VERSION).tar.bz2
+	rm -v zaz-$(ORIG_VERSION).tar.bz2
+	# Remove music
+	rm -fv zaz-$(ORIG_VERSION)/data/mus?.ogg
 	rm -fv cvfz ../zaz_0.3.1+dfsg1.orig.tar.gz
-	rm -fv zaz-0.3.?/win32.zip
-	tar cvfz ../zaz_0.3.1+dfsg1.orig.tar.gz zaz-0.3.?
-	rm -rv zaz-0.3.?
+	rm -fv zaz-$(ORIG_VERSION)/win32.zip
+	tar cvfj ../zaz_$(ORIG_VERSION)~dfsg1.orig.tar.bz2 zaz-$(ORIG_VERSION)
+	rm -rv zaz-$(ORIG_VERSION)
 
 binary: binary-indep binary-arch
 .PHONY: get-orig-source config build clean binary-indep binary-arch binary install

More information about the Pkg-games-commits mailing list