Commit 82c9d557 authored by Colin Tuckley's avatar Colin Tuckley Committed by Andreas Tille

Import Debian changes 2.6.1-1

lbreakout2 (2.6.1-1) unstable; urgency=low

  * New upstream release (Closes: #342869).
  * Remove circular dependency (Closes: #561372).
  * Replace the -Wall CFLAGS option removed by upstream.
  * Add a man page for lbreakout2server.
parents e7a36a4d 6b05bfbe
2.6.1:
- fixed missing font transparency in help screen (24/12/09 MS)
- fixed bug in menus's level set list that prevented first few entries
to show up (24/12/09 MS)
- fixed odd sound sample rates (all are 22050 now) (24/12/09 AM)
- fixed english translation issues (23/12/09 CT)
2.6:
- added XDG desktop file (09/10/26 PT)
- fixed compiling on Fedora (09/10/26 SG)
......
......@@ -160,6 +160,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
POSUB = @POSUB@
......
......@@ -156,6 +156,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
POSUB = @POSUB@
......@@ -266,9 +267,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu client/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign client/Makefile'; \
cd $(top_srcdir) && \
$(AUTOMAKE) --gnu client/Makefile
$(AUTOMAKE) --foreign client/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
......
......@@ -223,7 +223,7 @@ void client_data_create( void )
"a new ball is created and you can continue playing.#"
"2) Hitting your opponents paddle with the plasma weapon will give you "
"1000 points while stealing him/her the same amount.#"
"3) Bonus/malus magnet will attract _all_ bonuses/maluses even those "
"3) Bonus/penalty magnet will attract _all_ bonuses/penalties even those "
"released by your opponent.##"
"Note: If you pause the game by pressing 'p' a chat will pop up and you "
"can talk to your opponent."));
......
......@@ -123,6 +123,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
POSUB = @POSUB@
......@@ -218,9 +219,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu client/gfx/AbsoluteB/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign client/gfx/AbsoluteB/Makefile'; \
cd $(top_srcdir) && \
$(AUTOMAKE) --gnu client/gfx/AbsoluteB/Makefile
$(AUTOMAKE) --foreign client/gfx/AbsoluteB/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
......
......@@ -123,6 +123,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
POSUB = @POSUB@
......@@ -214,9 +215,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu client/gfx/Classic/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign client/gfx/Classic/Makefile'; \
cd $(top_srcdir) && \
$(AUTOMAKE) --gnu client/gfx/Classic/Makefile
$(AUTOMAKE) --foreign client/gfx/Classic/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
......
......@@ -132,6 +132,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
POSUB = @POSUB@
......@@ -239,9 +240,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu client/gfx/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign client/gfx/Makefile'; \
cd $(top_srcdir) && \
$(AUTOMAKE) --gnu client/gfx/Makefile
$(AUTOMAKE) --foreign client/gfx/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
......
......@@ -123,6 +123,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
POSUB = @POSUB@
......@@ -219,9 +220,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu client/gfx/Moiree/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign client/gfx/Moiree/Makefile'; \
cd $(top_srcdir) && \
$(AUTOMAKE) --gnu client/gfx/Moiree/Makefile
$(AUTOMAKE) --foreign client/gfx/Moiree/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
......
......@@ -123,6 +123,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
POSUB = @POSUB@
......@@ -218,9 +219,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu client/gfx/Oz/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign client/gfx/Oz/Makefile'; \
cd $(top_srcdir) && \
$(AUTOMAKE) --gnu client/gfx/Oz/Makefile
$(AUTOMAKE) --foreign client/gfx/Oz/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
......
......@@ -123,6 +123,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
POSUB = @POSUB@
......@@ -221,9 +222,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu client/gui_theme/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign client/gui_theme/Makefile'; \
cd $(top_srcdir) && \
$(AUTOMAKE) --gnu client/gui_theme/Makefile
$(AUTOMAKE) --foreign client/gui_theme/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
......
......@@ -122,19 +122,19 @@ void draw_bonus_screen()
draw_bonus_info( bonus_x + bonus_w * 0, bonus_y + bonus_h * 3, 13, _("Bonus floor") );
draw_bonus_info( bonus_x + bonus_w * 1, bonus_y + bonus_h * 3, 18, _("Deccelerate balls to minimum speed") );
draw_bonus_info( bonus_x + bonus_w * 0, bonus_y + bonus_h * 4, 6, _("1,000 points extra score from bricks with no bonus") );
draw_bonus_info( bonus_x + bonus_w * 0, bonus_y + bonus_h * 5, 19, _("Instantly collect all bonuses and destroy all maluses") );
draw_bonus_info( bonus_x + bonus_w * 0, bonus_y + bonus_h * 5, 19, _("Instantly collect all bonuses and destroy all penalties") );
draw_bonus_info( bonus_x + bonus_w * 0, bonus_y + bonus_h * 6, 25, _("Explosive balls") );
draw_bonus_info( bonus_x + bonus_w * 1, bonus_y + bonus_h * 6, 26, _("Paddle attracts bonuses") );
/* maluses */
/* penalties */
stk_font_write( help_caption_font, stk_display,
malus_x, malus_y - 30, STK_OPAQUE, _("Maluses:") );
malus_x, malus_y - 30, STK_OPAQUE, _("Penalties:") );
draw_bonus_info( malus_x + malus_w * 0, malus_y + malus_h * 0, 7, _("Shrink paddle") );
draw_bonus_info( malus_x + malus_w * 0, malus_y + malus_h * 3, 17, _("Accelerate balls") );
draw_bonus_info( malus_x + malus_w * 0, malus_y + malus_h * 1, 14, _("Freeze paddle") );
draw_bonus_info( malus_x + malus_w * 1, malus_y + malus_h * 1, 21, _("Random ball reflection at bricks") );
draw_bonus_info( malus_x + malus_w * 0, malus_y + malus_h * 2, 20, _("Darkness") );
draw_bonus_info( malus_x + malus_w * 1, malus_y + malus_h * 2, 27, _("Paddle attracts maluses") );
draw_bonus_info( malus_x + malus_w * 1, malus_y + malus_h * 2, 27, _("Paddle attracts penalties") );
draw_bonus_info( malus_x + malus_w * 1, malus_y + malus_h * 0, 22, _("Paddle disappears when not moving") );
draw_bonus_info( malus_x + malus_w * 1, malus_y + malus_h * 3, 28, /* xgettext:no-c-format */ _("40% chance that a ball doesn't damage brick") );
......@@ -208,9 +208,9 @@ void draw_ingame_hints_screen()
stk_font_write( help_caption_font, stk_display,
extra_x, extra_y - 30, STK_OPAQUE, _("Neutral Power-Ups:") );
draw_bonus_info( extra_x, extra_y + extra_h * 0, 16, _("Any of the listed bonuses/maluses.") );
draw_bonus_info( extra_x, extra_y + extra_h * 1, 23, _("Resets all active bonuses and maluses.") );
draw_bonus_info( extra_x, extra_y + extra_h * 2, 24, _("Adds 7 seconds to all active bonuses/maluses.") );
draw_bonus_info( extra_x, extra_y + extra_h * 0, 16, _("Any of the listed bonuses/penalties.") );
draw_bonus_info( extra_x, extra_y + extra_h * 1, 23, _("Resets all active bonuses and penalties.") );
draw_bonus_info( extra_x, extra_y + extra_h * 2, 24, _("Adds 7 seconds to all active bonuses/penalties.") );
help_caption_font->align = STK_FONT_ALIGN_LEFT | STK_FONT_ALIGN_TOP;
stk_font_write( help_caption_font, stk_display,
......@@ -289,9 +289,13 @@ Load/delete help resources.
void help_create()
{
help_font = stk_font_load( SDL_SWSURFACE, "f_small_yellow.png" );
SDL_SetColorKey( help_font->surface, SDL_SRCCOLORKEY,
stk_surface_get_pixel( help_font->surface, 0,0 ) );
help_caption_font = stk_font_load( SDL_SWSURFACE, "f_yellow.png" );
/* background -- will be filled when running help */
help_bkgnd = stk_surface_create( SDL_SWSURFACE, stk_display->w, stk_display->h );
SDL_SetColorKey( help_caption_font->surface, SDL_SRCCOLORKEY,
stk_surface_get_pixel( help_caption_font->surface, 0,0 ) );
/* background -- will be filled when running help */
help_bkgnd = stk_surface_create( SDL_SWSURFACE, stk_display->w, stk_display->h );
SDL_SetColorKey( help_bkgnd, 0, 0 );
}
void help_delete()
......
......@@ -123,6 +123,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
POSUB = @POSUB@
......@@ -326,9 +327,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu client/levels/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign client/levels/Makefile'; \
cd $(top_srcdir) && \
$(AUTOMAKE) --gnu client/levels/Makefile
$(AUTOMAKE) --foreign client/levels/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
......
......@@ -59,7 +59,7 @@ extern int theme_count;
#define HINT_ANIM _("If you turn animations low there'll be less details which will speed up the game a great deal.")
#define HINT_TRP _("Enable/disable transparency of bonuses and animations.")
#define HINT_SHADOW _("If you disable shadows it will speed up the game but won't look that good. ;-)")
#define HINT_BONUS_INFO _("If this is enabled you'll see the time left for all bonuses and maluses at the right side of the screen.")
#define HINT_BONUS_INFO _("If this is enabled you'll see the time left for all bonuses and penalties at the right side of the screen.")
#define HINT_DISPLAY _("You may run LBreakout2 either fullscreen or windowed. This switch may be done anywhere by pressing 'f'.")
#define HINT_FPS _("You you don't want LBreakout2 to consume all of your CPU (best performance) limit the frame rate.")
#define HINT_CONVEX _("As long as this option is enabled the paddle is treated as convex allowing easy aiming. If you "\
......@@ -70,7 +70,7 @@ extern int theme_count;
#define HINT_USEHINTS _("Enable/disable these quick hints. See the manual for more information about how to use LBreakout2!")
#define HINT_KEYSPEED _("Adjust the paddle speed for movement by keys. (pixels per second)")
#define HINT_PLAYERS _("These are the number of players and their names. If one player looses a ball or restarts the level it's the next player's turn.")
#define HINT_DIFF _("KIDS:#Lives: 9 (max. 12)#Paddle Size: 252 (max. 396)#Ball Speed: 100-200#Bonus: -50% (no maluses, no bad speech)##"\
#define HINT_DIFF _("KIDS:#Lives: 9 (max. 12)#Paddle Size: 252 (max. 396)#Ball Speed: 100-200#Bonus: -50% (no penalties, no bad speech)##"\
"EASY:#Lives: 6 (max. 9)#Paddle Size: 72 (max. 180)#Ball Speed: 240-400 pixels/sec#Bonus: -20%##"\
"MEDIUM:#Lives: 5 (max. 7)#Paddle Size: 54 (max. 144)#Ball Speed: 270-430 pixels/sec##"\
"HARD:#Lives: 4 (max. 5)#Paddle Size: 54 (max. 108)#Ball Speed: 300-450 pixels/sec#Bonus: +30%")
......@@ -173,7 +173,7 @@ char hint_theme[512]; /* theme information */
"Loosing your ball means going to the next level.")
#define HINT_HUNTER _("Your task is to hunt down bricks by moving a chaos brick indirectly. Therefore "\
"each side of the playing field has a brick color and you can hit small pads bearing these colors. "\
"When you hit one, the chaos brick will move toward the appropiate side. You must not hit "\
"When you hit one, the chaos brick will move toward the appropriate side. You must not hit "\
"the bordering bricks and you must get to the brick within a time limit, as always "\
"displayed in the lower right-hand side of the screen. The faster you are, the more score "\
"you'll gain.##"\
......@@ -303,12 +303,12 @@ void levelsets_load_names()
levelset_names_home[0] = NEW_SET;
/* create static local set list */
list_reset( levelset_names );
levelset_count_local = 1;
levelset_count_local = default_set_count;
while ( ( name = list_next( levelset_names ) ) )
if ( !levelset_is_network( name ) )
levelset_count_local++;
levelset_names_local = calloc( levelset_count_local, sizeof( char* ) );
list_reset( levelset_names ); i = 1;
list_reset( levelset_names ); i = default_set_count;
while ( ( name = list_next( levelset_names ) ) )
if ( !levelset_is_network( name ) )
levelset_names_local[i++] = name;
......
......@@ -123,6 +123,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
POSUB = @POSUB@
......@@ -221,9 +222,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu client/sounds/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign client/sounds/Makefile'; \
cd $(top_srcdir) && \
$(AUTOMAKE) --gnu client/sounds/Makefile
$(AUTOMAKE) --foreign client/sounds/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
......
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
......@@ -141,6 +141,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
POSUB = @POSUB@
......@@ -237,9 +238,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu common/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign common/Makefile'; \
cd $(top_srcdir) && \
$(AUTOMAKE) --gnu common/Makefile
$(AUTOMAKE) --foreign common/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
......
......@@ -240,6 +240,9 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
/* Define to the home page for this package. */
#undef PACKAGE_URL
/* Define to the version of this package. */
#undef PACKAGE_VERSION
......@@ -261,20 +264,30 @@
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
/* Version number of package */
#undef VERSION
/* Define to 1 if on AIX 3.
System headers sometimes define this.
We just want to avoid a redefinition error message. */
/* Enable extensions on AIX 3, Interix. */
#ifndef _ALL_SOURCE
# undef _ALL_SOURCE
#endif
/* Enable GNU extensions on systems that have them. */
#ifndef _GNU_SOURCE
# undef _GNU_SOURCE
#endif
/* Enable threading extensions on Solaris. */
#ifndef _POSIX_PTHREAD_SEMANTICS
# undef _POSIX_PTHREAD_SEMANTICS
#endif
/* Enable extensions on HP NonStop. */
#ifndef _TANDEM_SOURCE
# undef _TANDEM_SOURCE
#endif
/* Enable general extensions on Solaris. */
#ifndef __EXTENSIONS__
# undef __EXTENSIONS__
#endif
/* Version number of package */
#undef VERSION
/* Define to 1 if on MINIX. */
#undef _MINIX
......@@ -286,17 +299,6 @@
/* Define to 1 if you need to in order for `stat' and other things to work. */
#undef _POSIX_SOURCE
/* Enable extensions on Solaris. */
#ifndef __EXTENSIONS__
# undef __EXTENSIONS__
#endif
#ifndef _POSIX_PTHREAD_SEMANTICS
# undef _POSIX_PTHREAD_SEMANTICS
#endif
#ifndef _TANDEM_SOURCE
# undef _TANDEM_SOURCE
#endif
/* Define to empty if `const' does not conform to ANSI C. */
#undef const
......
This diff is collapsed.
......@@ -7,7 +7,7 @@ AC_USE_SYSTEM_EXTENSIONS
AM_CONFIG_HEADER(config.h)
AM_INIT_AUTOMAKE(lbreakout2,2.6)
AM_INIT_AUTOMAKE(lbreakout2,2.6.1)
dnl Checks for programs.
AM_GNU_GETTEXT
......
lbreakout2 (2.6.1-1) unstable; urgency=low
* New upstream release (Closes: #342869).
* Remove circular dependency (Closes: #561372).
* Replace the -Wall CFLAGS option removed by upstream.
* Add a man page for lbreakout2server.
-- Colin Tuckley <colint@debian.org> Sun, 03 Jan 2010 15:34:24 +0000
lbreakout2 (2.6-2) unstable; urgency=low
* Fix various problems with duplicated and mis-placed files
......
......@@ -8,7 +8,7 @@ Standards-Version: 3.8.3
Package: lbreakout2
Architecture: any
Depends: ${shlibs:Depends}, lbreakout2-data (= ${source:Version})
Depends: ${shlibs:Depends}, ${misc:Depends}, lbreakout2-data (= ${source:Version})
Description: A ball-and-paddle game with nice graphics
lbreakout2 is a game similar to the classics breakout and xboing, featuring
a number of added graphical enhancements and effects. You control a paddle
......@@ -20,7 +20,7 @@ Description: A ball-and-paddle game with nice graphics
Package: lbreakout2-data
Architecture: all
Depends: lbreakout2 (>= ${source:Version})
Depends: ${misc:Depends}
Description: A ball-and-paddle game with nice graphics (DATA FILES)
lbreakout2 is a game similar to the classics breakout and xboing, featuring
a number of added graphical enhancements and effects. You control a paddle
......
#!/bin/bash -e
if test -L /usr/share/doc/lbreakout2-data; then
rm /usr/share/doc/lbreakout2-data;
fi
#DEBHELPER#
......@@ -2,7 +2,7 @@
.\" First parameter, NAME, should be all caps
.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
.\" other parameters are allowed: see man(7), man(1)
.TH LBREAKOUT2 6 "October 15, 2000"
.TH LBREAKOUT2 6 "December 18, 2009"
.\" Please adjust this date whenever revising the manpage.
.\"
.\" Some roff macros, for reference:
......@@ -26,7 +26,7 @@ command.
This manual page was written for the Debian GNU/Linux distribution
because the original program does not have a manual page.
.br
Further documentation is available in /usr/share/doc/lbreakout2/docs.
Further documentation is available in /usr/share/doc/lbreakout2.
.br
\fBlbreakout2\fP is a game written in the style of the games Breakout
and xboing. The goal is to eliminate a series of screens of bricks by
......@@ -34,7 +34,7 @@ repeatedly striking them with bouncing balls.
.SH OPTIONS
lbreakout2 accepts no options.
.SH SEE ALSO
/usr/share/doc/lbreakout2/docs/index.html
/usr/share/doc/lbreakout2/index.html
.SH AUTHOR
This manual page was written by Daniel Burrows <Daniel_Burrows@brown.edu>,
for the Debian GNU/Linux system (but may be used by others).
.TH LBREAKOUT2SERVER 6 "December 18, 2009"
.\" Please adjust this date whenever revising the manpage.
.\"
.\" Some roff macros, for reference:
.\" .nh disable hyphenation
.\" .hy enable hyphenation
.\" .ad l left justify
.\" .ad b justify to both left and right margins
.\" .nf disable filling
.\" .fi enable filling
.\" .br insert line break
.\" .sp <n> insert n+1 empty lines
.\" for manpage-specific macros, see man(7)
.SH NAME
lbreakout2server \- lbreakout2 multi-player server
.SH SYNOPSIS
.B lbreakout2server
.SH DESCRIPTION
This manual page briefly documents the
.B lbreakout2server
command.
This manual page was written for the Debian GNU/Linux distribution
because the original program does not have a manual page.
.br
Further documentation is available in /usr/share/doc/lbreakout2.
.br
\fBlbreakout2\fP is a game written in the style of the games Breakout
and xboing. This server allows two or more players to play against each other.
.SH OPTIONS
.LP
.TP
\fB\-p <port>\fR
the port the server will run on (default is 2002).
.TP
\fB\-l <limit>\fR
maximum number of users that may connect to the server (default is 30).
.TP
\fB\-m <message>\fR
this message is displayed to welcome a user.
.TP
\fB\-a <password>\fR
a user that logs in with this name will become administrator named admin (default is no admin).
.TP
\fB\-f <framerate>\fR
the number of calls to the send/recv handler per second. The default is 33.
.SH SEE ALSO
/usr/share/doc/lbreakout2/index.html
.SH AUTHOR
This manual page was written by Colin Tuckley <colint@debian.org>,
for the Debian GNU/Linux system (but may be used by others).
10-ball-turbo-key-pref.dpatch
20-appropriate-spelling.dpatch
40-cflags-Wall.dpatch
#! /bin/sh /usr/share/dpatch/dpatch-run
## 20-appropriate-spelling.dpatch by <colint@debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Fix spelling of "appropriate".
@DPATCH@
diff -urNad lbreakout2-2.6~/client/manager.c lbreakout2-2.6/client/manager.c
--- lbreakout2-2.6~/client/manager.c 2005-10-19 21:51:21.000000000 +0100
+++ lbreakout2-2.6/client/manager.c 2009-12-14 21:19:19.082763789 +0000
@@ -173,7 +173,7 @@
"Loosing your ball means going to the next level.")
#define HINT_HUNTER _("Your task is to hunt down bricks by moving a chaos brick indirectly. Therefore "\
"each side of the playing field has a brick color and you can hit small pads bearing these colors. "\
- "When you hit one, the chaos brick will move toward the appropiate side. You must not hit "\
+ "When you hit one, the chaos brick will move toward the appropriate side. You must not hit "\
"the bordering bricks and you must get to the brick within a time limit, as always "\
"displayed in the lower right-hand side of the screen. The faster you are, the more score "\
"you'll gain.##"\
diff -urNad lbreakout2-2.6~/game/balls.c lbreakout2-2.6/game/balls.c
--- lbreakout2-2.6~/game/balls.c 2005-06-07 18:57:30.000000000 +0100
+++ lbreakout2-2.6/game/balls.c 2009-12-14 21:20:40.565590121 +0000
@@ -1483,7 +1483,7 @@
else
prim->side = SIDE_RIGHT;
#ifdef WITH_BUG_REPORT
- sprintf( side_str, "Had to change side as TOP wasn't appropiate!" );
+ sprintf( side_str, "Had to change side as TOP wasn't appropriate!" );
#endif
}
break;
@@ -1494,7 +1494,7 @@
else
prim->side = SIDE_RIGHT;
#ifdef WITH_BUG_REPORT
- sprintf( side_str, "Had to change side as BOTTOM wasn't appropiate!" );
+ sprintf( side_str, "Had to change side as BOTTOM wasn't appropriate!" );
#endif
}
break;
@@ -1505,7 +1505,7 @@
else
prim->side = SIDE_BOTTOM;
#ifdef WITH_BUG_REPORT
- sprintf( side_str, "Had to change side as LEFT wasn't appropiate!" );
+ sprintf( side_str, "Had to change side as LEFT wasn't appropriate!" );
#endif
}
break;
@@ -1516,7 +1516,7 @@
else
prim->side = SIDE_BOTTOM;
#ifdef WITH_BUG_REPORT
- sprintf( side_str, "Had to change side as RIGHT wasn't appropiate!" );
+ sprintf( side_str, "Had to change side as RIGHT wasn't appropriate!" );
#endif
}
break;
#! /bin/sh /usr/share/dpatch/dpatch-run
## 40-cflags-Wall.dpatch by <colint@debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Replace the -Wall CFLAGS option removed by upstream.
@DPATCH@
diff -urNad lbreakout2-2.6~/configure.in lbreakout2-2.6/configure.in
--- lbreakout2-2.6~/configure.in 2009-10-26 15:36:45.000000000 +0000
+++ lbreakout2-2.6/configure.in 2009-12-16 18:36:26.180211802 +0000
@@ -20,6 +20,8 @@
AC_CHECK_LIB(z, main,, AC_MSG_ERROR(libz is needed))
AC_CHECK_LIB(png, main,, AC_MSG_ERROR(libpng is needed))
+CFLAGS="$CFLAGS -Wall"
+
dnl check SDL version
AM_PATH_SDL(1.2.0,, AC_MSG_ERROR(lib SDL is needed))
CFLAGS="$CFLAGS $SDL_CFLAGS"
......@@ -45,6 +45,7 @@ clean: unpatch
rm -f build-stamp configure-stamp
[ ! -f Makefile ] || $(MAKE) distclean
rm -f lbreakout2.desktop
ifneq "$(wildcard /usr/share/misc/config.sub)" ""
rm -f config.sub
......@@ -63,7 +64,7 @@ install: build
dh_installdirs
$(MAKE) install DESTDIR=`pwd`/debian/lbreakout2
ln -s lbreakout2 debian/lbreakout2-data/usr/share/doc/lbreakout2-data
mkdir -p debian/lbreakout2-data/usr/share/doc/lbreakout2-data
dh_install -plbreakout2-data
rm -fr debian/lbreakout2/usr/share/games/lbreakout2
......@@ -84,6 +85,8 @@ install: build
binary-indep: build install
dh_testdir -i
dh_testroot -i
dh_installdocs -i -plbreakout2-data
dh_installchangelogs -i -a ChangeLog
dh_compress -i
dh_fixperms -i
......@@ -97,7 +100,7 @@ binary-arch: build install
dh_testroot -a
dh_installdocs -plbreakout2
dh_installmenu -a
dh_installman -a debian/lbreakout2.6
dh_installman -a debian/lbreakout2.6 debian/lbreakout2server.6
dh_installchangelogs -a ChangeLog
dh_strip -a
dh_compress -a
......
......@@ -123,6 +123,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
POSUB = @POSUB@
......@@ -221,9 +222,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign docs/Makefile'; \
cd $(top_srcdir) && \
$(AUTOMAKE) --gnu docs/Makefile
$(AUTOMAKE) --foreign docs/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
......
This diff is collapsed.
......@@ -142,6 +142,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
POSUB = @POSUB@
......@@ -249,9 +250,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu game/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign game/Makefile'; \
cd $(top_srcdir) && \
$(AUTOMAKE) --gnu game/Makefile
$(AUTOMAKE) --foreign game/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
......
......@@ -121,7 +121,7 @@ void ball_check_brick_reflection( Ball *b )
(cur_game->extra_active[EX_METAL] &&
cur_game->bricks[b->target.mx][b->target.my].type != MAP_WALL ) )
b->idle_time = 0;
/* or if it is within the last four rows and no chaotic malus is active it will
/* or if it is within the last four rows and no chaotic penalty is active it will
hit the paddle soon so reset here too */
if ( b->target.my >= MAP_HEIGHT - 4 && b->vel.y > 0 && !cur_game->extra_active[EX_CHAOS] )
b->idle_time = 0;
......@@ -1483,7 +1483,7 @@ void ball_get_target( Ball *ball )
else
prim->side = SIDE_RIGHT;
#ifdef WITH_BUG_REPORT
sprintf( side_str, "Had to change side as TOP wasn't appropiate!" );
sprintf( side_str, "Had to change side as TOP wasn't appropriate!" );
#endif
}
break;
......@@ -1494,7 +1494,7 @@ void ball_get_target( Ball *ball )
else
prim->side = SIDE_RIGHT;
#ifdef WITH_BUG_REPORT
sprintf( side_str, "Had to change side as BOTTOM wasn't appropiate!" );