r12484 - in packages/trunk/foobillard/debian: . patches

[Bruno Fuddl-guestquot; Fuddl" Kleinert]

Author: fuddl-guest
Date: 2011-06-27 16:11:53 +0000 (Mon, 27 Jun 2011)
New Revision: 12484

Added:
   packages/trunk/foobillard/debian/patches/switched_button_2_and_3
   packages/trunk/foobillard/debian/patches/switched_button_2_and_3_in_helpscreen
Modified:
   packages/trunk/foobillard/debian/changelog
   packages/trunk/foobillard/debian/control
   packages/trunk/foobillard/debian/patches/series
Log:
Fix wrong documentation about button 2 and 3, in-game and in manpage

Fix two lintian warnings


Modified: packages/trunk/foobillard/debian/changelog
===================================================================
--- packages/trunk/foobillard/debian/changelog	2011-06-25 20:00:41 UTC (rev 12483)
+++ packages/trunk/foobillard/debian/changelog	2011-06-27 16:11:53 UTC (rev 12484)
@@ -1,10 +1,21 @@
-foobillard (3.0a-4) UNRELEASED; urgency=low
+foobillard (3.0a-4) unstable; urgency=low
 
   * Team upload.
+
+  [ Paul Wise ]
   * Update Homepage to sf.net one since sunsite one is closed
 
- -- Paul Wise <pabs at debian.org>  Thu, 18 Nov 2010 19:28:58 +0800
+  [ Bruno "Fuddl" Kleinert ]
+  * Mouse buttons 2 and 3 were switched in manpage and in the helpscreen of the
+    game. This introduces two new patches: switched_button_2_and_3 and
+    switched_button_2_and_3_in_helpscreen. (Closes: #414404)
+  * Fix lintian warning about missing ${misc:Depends} in the binary packages
+    Dependencies field.
+  * Fix lintian warning about the package description beginning with an
+    article.
 
+ -- Bruno "Fuddl" Kleinert <fuddl at debian.org>  Mon, 27 Jun 2011 18:00:44 +0200
+
 foobillard (3.0a-3) unstable; urgency=low
 
   [ Frank Gevaerts ]

Modified: packages/trunk/foobillard/debian/control
===================================================================
--- packages/trunk/foobillard/debian/control	2011-06-25 20:00:41 UTC (rev 12483)
+++ packages/trunk/foobillard/debian/control	2011-06-27 16:11:53 UTC (rev 12484)
@@ -11,9 +11,9 @@
 
 Package: foobillard
 Architecture: any
-Depends: ${shlibs:Depends} , ttf-freefont
+Depends: ${misc:Depends}, ${shlibs:Depends} , ttf-freefont
 Suggests: ttf-larabie-deco , ttf-larabie-straight
-Description: a 3D billiards game using OpenGL
+Description: 3D billiards game using OpenGL
  Foobillard is a billiards game with a three dimensional display.
  It supports 8-ball, 9-ball, carambol and snooker, as well as a
  computer opponent and network play.  It is written using OpenGL, and

Modified: packages/trunk/foobillard/debian/patches/series
===================================================================
--- packages/trunk/foobillard/debian/patches/series	2011-06-25 20:00:41 UTC (rev 12483)
+++ packages/trunk/foobillard/debian/patches/series	2011-06-27 16:11:53 UTC (rev 12484)
@@ -5,3 +5,5 @@
 05_foul_explanation
 06_show_ball_to_hit
 07_superfluous_link_libraries
+switched_button_2_and_3
+switched_button_2_and_3_in_helpscreen

Added: packages/trunk/foobillard/debian/patches/switched_button_2_and_3
===================================================================
--- packages/trunk/foobillard/debian/patches/switched_button_2_and_3	                        (rev 0)
+++ packages/trunk/foobillard/debian/patches/switched_button_2_and_3	2011-06-27 16:11:53 UTC (rev 12484)
@@ -0,0 +1,21 @@
+Index: foobillard-3.0a/foobillard.6
+===================================================================
+--- foobillard-3.0a.orig/foobillard.6	2011-06-27 17:35:33.940176611 +0200
++++ foobillard-3.0a/foobillard.6	2011-06-27 17:36:30.688457864 +0200
+@@ -152,14 +152,14 @@
+ .PP
+ .Vb 20
+ \&Mouse moving + button1             rotate
+-\&Mouse moving + button2             zoom
++\&Mouse moving + button2             shoot
+ \&Mouse moving + hold b2 after b1    place cue ball
+ \&Mouse moving + hold b1 after b2    adjust effet
+ \&No mouse move + b1 after b2        toggle cue view on/off
+ \&Mouse moving + button2 + Ctrl      FOV - adjust
+ \&Mouse moving + button1 + Shift     place cue ball (when active)
+ \&Mouse moving + button2 + Shift     cue offset adjust
+-\&Mouse button 3                     shoot
++\&Mouse button 3                     zoom
+ \&<space> or <enter>                 shoot
+ \&<up>, <down>                       adjust strength
+ \&<pg up>, <pg down>                 adjust strength

Added: packages/trunk/foobillard/debian/patches/switched_button_2_and_3_in_helpscreen
===================================================================
--- packages/trunk/foobillard/debian/patches/switched_button_2_and_3_in_helpscreen	                        (rev 0)
+++ packages/trunk/foobillard/debian/patches/switched_button_2_and_3_in_helpscreen	2011-06-27 16:11:53 UTC (rev 12484)
@@ -0,0 +1,18 @@
+Index: foobillard-3.0a/src/helpscreen.c
+===================================================================
+--- foobillard-3.0a.orig/src/helpscreen.c	2011-06-27 17:40:05.965525480 +0200
++++ foobillard-3.0a/src/helpscreen.c	2011-06-27 17:44:08.962732942 +0200
+@@ -48,11 +48,11 @@
+         text++;
+         *text = textObj_new( " <b2>after<b1> (no move) ... toggle cue/external view", options_help_fontname, 21);
+         text++;
+-        *text = textObj_new( " <ctrl>+<button2> ... set FOV (zoom)", options_help_fontname, 21);
++        *text = textObj_new( " <button3> ... set FOV (zoom)", options_help_fontname, 21);
+         text++;
+         *text = textObj_new( " <ctrl>+<button1> ... direct mouse-cue-shot", options_help_fontname, 21);
+         text++;
+-        *text = textObj_new( " <space> or <enter> or <button3> ... shoot", options_help_fontname, 21);
++        *text = textObj_new( " <space> or <enter> or <button2> ... shoot", options_help_fontname, 21);
+         text++;
+         *text = textObj_new( " <up>,<down> or <pg-up><pg-down> ... strength adj.", options_help_fontname, 21);
+         text++;