[SCM] Arcade style game branch, master, updated. debian/3.3.0.1+dfsg1-1

[Dmitry E. Oboukhov]

The following commit has been merged in the master branch:
commit 260609e0576b3df9b2510ccf182f0190503c7697
Author: Dmitry E. Oboukhov <unera at debian.org>
Date:   Thu Jun 17 10:43:35 2010 +0400

    old patches

diff --git a/debian/patches/fix-manpage-errors b/debian/patches/fix-manpage-errors
index 14344d9..e993c52 100644
--- a/debian/patches/fix-manpage-errors
+++ b/debian/patches/fix-manpage-errors
@@ -24,8 +24,8 @@ Forwarded: <no|not-needed|url proving that it has been forwarded>
 Reviewed-By: <name and email of someone who approved the patch>
 Last-Update: <YYYY-MM-DD>
 
---- rocksndiamonds-3.3.0.0+dfsg1.orig/rocksndiamonds.1
-+++ rocksndiamonds-3.3.0.0+dfsg1/rocksndiamonds.1
+--- rocksndiamonds-3.3.0.1+dfsg1.orig/rocksndiamonds.1
++++ rocksndiamonds-3.3.0.1+dfsg1/rocksndiamonds.1
 @@ -150,8 +150,8 @@ keys or with the joystick (if you have n
  keys on your keyboard, you can use the keys 'i', 'j', 'k' and 'm' for
  the directions. To 'snap' a field near you without moving to it, you
diff --git a/debian/patches/fix-shlibdeps-warning b/debian/patches/fix-shlibdeps-warning
index 8b794fd..d668146 100644
--- a/debian/patches/fix-shlibdeps-warning
+++ b/debian/patches/fix-shlibdeps-warning
@@ -25,8 +25,8 @@ Forwarded: <no|not-needed|url proving that it has been forwarded>
 Reviewed-By: <name and email of someone who approved the patch>
 Last-Update: <YYYY-MM-DD>
 
---- rocksndiamonds-3.3.0.0+dfsg1.orig/src/Makefile
-+++ rocksndiamonds-3.3.0.0+dfsg1/src/Makefile
+--- rocksndiamonds-3.3.0.1+dfsg1.orig/src/Makefile
++++ rocksndiamonds-3.3.0.1+dfsg1/src/Makefile
 @@ -102,13 +102,13 @@ endif
  
  ifeq ($(TARGET),sdl)			# compiling for SDL target
diff --git a/rocksndiamonds.1 b/rocksndiamonds.1
index 4c14c4b..e155fa2 100644
--- a/rocksndiamonds.1
+++ b/rocksndiamonds.1
@@ -150,8 +150,8 @@ keys or with the joystick (if you have no joystick and even no arrow
 keys on your keyboard, you can use the keys 'i', 'j', 'k' and 'm' for
 the directions. To 'snap' a field near you without moving to it, you
 can use the left fire button on your joystick (hold it down, move the
-stick to 'snap' the field, release the button) or the keys 'e', 's',
-'d' and 'x'. To place a piece of dynamite, use the right fire button
+stick to 'snap' the field, release the button) or the keys 'e', 's', 'd'
+and 'x'. To place a piece of dynamite, use the right fire button
 on your joystick or use the 'b' key (and, after placing the dynamite,
 better see to move away from this field...).
 
@@ -195,9 +195,9 @@ elements and something like that. The four 3x3 field on the upper left
 can be edited like the level field and indicate the 'contents' of smashed
 crunchers (just try it out with some crunchers in one of your own levels).
 
-'Undo & Exit' leaves the level editor, throwing away all the changes you
+ 'Undo & Exit' leaves the level editor, throwing away all the changes you
 have done to the level.
-'Save & Exit' leveas the level editor and saves the new level (the old one
+ 'Save & Exit' leveas the level editor and saves the new level (the old one
 will be deleted).
 
 
@@ -216,8 +216,8 @@ to press 'Start Game' as usual.
 .TP
 .B Saving a game tape:
 To save a tape to the tape file corresponding to the level (that means
-that you can only save one tape file for each level), just press the
-'eject' button (the very left button). Then you will be prompted if
+that you can only save one tape file for each level), just press the 'eject'
+button (the very left button). Then you will be prompted if
 you really want to replace the old tape (if an old tape exists).
 
 .TP
diff --git a/src/Makefile b/src/Makefile
index 4bbbcca..34f01f6 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -102,13 +102,13 @@ endif
 
 ifeq ($(TARGET),sdl)			# compiling for SDL target
 SYS_CFLAGS  = -DTARGET_SDL $(shell sdl-config --cflags)
-SDL_LIBS = -lSDL_image -lSDL_mixer -lSDL_net -lsmpeg
+SDL_LIBS = -lSDL_image -lSDL_mixer -lSDL_net
 SYS_LDFLAGS = $(SDL_LIBS) $(shell sdl-config --libs)
 endif
 
 ifeq ($(TARGET),sdl-static)		# compiling for SDL target (static)
 SYS_CFLAGS  = -DTARGET_SDL $(shell sdl-config --cflags)
-SDL_LIBS = -lSDL_image -lSDL_mixer -lSDL_net -lsmpeg
+SDL_LIBS = -lSDL_image -lSDL_mixer -lSDL_net
 SYS_LDFLAGS = $(SDL_LIBS) $(shell sdl-config --static-libs)
 endif
 

-- 
Arcade style game