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

[Miriam Ruiz]

Author: miriam
Date: 2013-09-13 19:36:28 +0000 (Fri, 13 Sep 2013)
New Revision: 14564

Added:
   packages/trunk/zaz/debian/patches/jumpy_keyboard.patch
Modified:
   packages/trunk/zaz/debian/changelog
   packages/trunk/zaz/debian/compat
   packages/trunk/zaz/debian/control
   packages/trunk/zaz/debian/patches/series
   packages/trunk/zaz/debian/rules
Log:
Prepare release



Modified: packages/trunk/zaz/debian/changelog
===================================================================
--- packages/trunk/zaz/debian/changelog	2013-09-13 18:44:16 UTC (rev 14563)
+++ packages/trunk/zaz/debian/changelog	2013-09-13 19:36:28 UTC (rev 14564)
@@ -1,7 +1,12 @@
-zaz (1.0.0~dfsg1-2) UNRELEASED; urgency=low
+zaz (1.0.0~dfsg1-2) unstable; urgency=low
 
   [ Miriam Ruiz ]
   * Fixed man page
+  * Added patch by Steve Cotton to fix jumpu keyboard. Closes: #649021
+  * Changed my email to miriam at debian.org
+  * Upgraded Standards-Version from 3.9.2 to 3.9.4
+  * Upgraded compat level to 9
+  * Fortified build
 
   [ Paul Wise ]
   * Add patches by Steve Cotton to fix crashes (Closes: #649017; LP: #656468)
@@ -18,7 +23,7 @@
   [ Evgeni Golov ]
   * Correct Vcs-* URLs to point to anonscm.debian.org
 
- -- Miriam Ruiz <little_miry at yahoo.es>  Tue, 29 Nov 2011 23:11:19 +0100
+ -- Miriam Ruiz <miriam at debian.org>  Fri, 13 Sep 2013 21:08:20 +0200
 
 zaz (1.0.0~dfsg1-1) unstable; urgency=low
 

Modified: packages/trunk/zaz/debian/compat
===================================================================
--- packages/trunk/zaz/debian/compat	2013-09-13 18:44:16 UTC (rev 14563)
+++ packages/trunk/zaz/debian/compat	2013-09-13 19:36:28 UTC (rev 14564)
@@ -1 +1 @@
-7
+9

Modified: packages/trunk/zaz/debian/control
===================================================================
--- packages/trunk/zaz/debian/control	2013-09-13 18:44:16 UTC (rev 14563)
+++ packages/trunk/zaz/debian/control	2013-09-13 19:36:28 UTC (rev 14564)
@@ -2,10 +2,10 @@
 Section: games
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Uploaders: Miriam Ruiz <little_miry at yahoo.es>
+Uploaders: Miriam Ruiz <miriam at debian.org>
 Build-Depends:
  autotools-dev,
- debhelper (>= 7),
+ debhelper (>= 9),
  gettext,
  libftgl-dev,
  libgl1-mesa-dev,
@@ -17,7 +17,7 @@
  libxext-dev,
  pkg-config,
  ttf-freefont
-Standards-Version: 3.9.2
+Standards-Version: 3.9.4
 Homepage: http://phuzzboxmedia.com/games/open-sourced-zaz
 Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/zaz/
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/zaz/

Added: packages/trunk/zaz/debian/patches/jumpy_keyboard.patch
===================================================================
--- packages/trunk/zaz/debian/patches/jumpy_keyboard.patch	                        (rev 0)
+++ packages/trunk/zaz/debian/patches/jumpy_keyboard.patch	2013-09-13 19:36:28 UTC (rev 14564)
@@ -0,0 +1,26 @@
+--- a/src/scene.cpp
++++ b/src/scene.cpp
+@@ -365,14 +365,17 @@
+         }
+     }
+ 
+-    if (mmotion)
+-    {
+-        if (logicInputFrame == 0)
+-            rmx = rmy = 0;
++    // Set the ev.relmouse* members even if the mouse hasn't moved.
++    // Shooting causing a move based on those values, even if playing
++    // with the keyboard only.
++    if (logicInputFrame == 0)
++        rmx = rmy = 0;
+ 
+-        ev.relmouseX = rmx;
+-        ev.relmouseY = rmy;
++    ev.relmouseX = rmx;
++    ev.relmouseY = rmy;
+ 
++    if (mmotion)
++    {
+         ev.mouseX = (double)mmx / (double)surface->w;
+         ev.mouseY = (double)mmy / (double)surface->h;
+ 

Modified: packages/trunk/zaz/debian/patches/series
===================================================================
--- packages/trunk/zaz/debian/patches/series	2013-09-13 18:44:16 UTC (rev 14563)
+++ packages/trunk/zaz/debian/patches/series	2013-09-13 19:36:28 UTC (rev 14564)
@@ -1,3 +1,4 @@
 no_music.patch
 no_music_2.patch
 mismatched_delete.patch
+jumpy_keyboard.patch

Modified: packages/trunk/zaz/debian/rules
===================================================================
--- packages/trunk/zaz/debian/rules	2013-09-13 18:44:16 UTC (rev 14563)
+++ packages/trunk/zaz/debian/rules	2013-09-13 19:36:28 UTC (rev 14564)
@@ -3,6 +3,12 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
+CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
+CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS)
+LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
+LDFLAGS2:=-Wl,-z,defs  -Wl,-as-needed -Wl,--no-undefined
+
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
@@ -37,8 +43,9 @@
 		--datarootdir=\$${prefix}/share/games \
 		--mandir=\$${prefix}/share/man \
 		--infodir=\$${prefix}/share/info \
-		CFLAGS="$(CFLAGS)" \
-		LDFLAGS="-Wl,-z,defs -Wl,--as-needed -Wl,--no-undefined"
+		CFLAGS="$(CFLAGS) $(CPPFLAGS)" \
+		CXXFLAGS="$(CXXFLAGS) $(CPPFLAGS)" \
+		LDFLAGS="$(LDFLAGS) $(LDFLAGS2)"
 	touch $@
 
 build: build-stamp