[SCM] Arcade style game branch, master, updated. debian/3.3.0.0+dfsg1-1
Dmitry E. Oboukhov
unera at debian.org
Fri Jun 4 09:49:46 UTC 2010
The following commit has been merged in the master branch:
commit 935c9de316db5592abad13d4f5de1e23005ae94e
Author: Dmitry E. Oboukhov <unera at debian.org>
Date: Fri Jun 4 12:47:13 2010 +0400
is built but doesn't work
diff --git a/debian/changelog b/debian/changelog
index a7cf102..d5dfb2a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
rocksndiamonds (3.3.0.0+dfsg1-1) unstable; urgency=low
* New upstream version.
+ * Switched debian source format (3.0 quilt).
+ * Bumped Standards-Version to 3.8.4.
-- Dmitry E. Oboukhov <unera at debian.org> Fri, 04 Jun 2010 11:09:56 +0400
diff --git a/debian/control b/debian/control
index c3f2a91..1715c35 100644
--- a/debian/control
+++ b/debian/control
@@ -3,12 +3,12 @@ Section: contrib/games
Priority: extra
Uploaders: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
Maintainer: Dmitry E. Oboukhov <unera at debian.org>
-Build-Depends: debhelper (>= 5), dpatch, po-debconf,
+Build-Depends: debhelper (>= 5), cdbs, po-debconf,
libsdl1.2-dev (>= 1.2),
libsdl-image1.2-dev (>= 1.2),
libsdl-mixer1.2-dev (>= 1.2),
libsdl-net1.2-dev (>= 1.2.7)
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
Homepage: http://artsoft.org
VCS-Browser: http://git.debian.org/?p=collab-maint/rocksndiamonds.git;a=summary
VCS-Git: git://git.debian.org/collab-maint/rocksndiamonds.git
diff --git a/debian/patches/01_removed_libsmpeg_deps b/debian/patches/01_removed_libsmpeg_deps
deleted file mode 100755
index 1163a39..0000000
--- a/debian/patches/01_removed_libsmpeg_deps
+++ /dev/null
@@ -1,11 +0,0 @@
---- rocksndiamonds-3.3.0.0+dfsg1/src/Makefile 2008-11-03 23:22:19.000000000 +0300
-+++ rocksndiamonds-3.3.3.0+dfsg1/src/Makefile 2008-12-08 13:37:18.000000000 +0300
-@@ -102,7 +102,7 @@
-
- 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
-
diff --git a/debian/patches/series b/debian/patches/series
index 86b0e12..693e98f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-01_removed_libsmpeg_deps
+fix-manpage-errors
diff --git a/debian/postinst.in b/debian/postinst.in
index 2885f69..5d433fb 100644
--- a/debian/postinst.in
+++ b/debian/postinst.in
@@ -17,7 +17,7 @@ our %info=
{
url =>
'http://www.artsoft.org/RELEASES/unix/rocksndiamonds/rocksndiamonds-#VERSION#.tar.gz',
- md5 => '75a4a7c7f11e89fc4a664da3b016a783',
+ md5 => '191b7a63de9706b0aee52cdf983b3267',
topdir => 'rocksndiamonds-#VERSION#',
},
diff --git a/debian/rules b/debian/rules
index 0286da4..13f0653 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,105 +1,125 @@
#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-include /usr/share/dpatch/dpatch.make
-
-PACKAGE=rocksndiamonds
-BINARYNAME=rocksndiamonds
-LEVEL_DIR=/usr/share/games/$(PACKAGE)
-LINTIANROOT=/usr/share/lintian
-LINDAROOT=/usr/share/linda
-
-ORIGMAN=rocksndiamonds.1
-DEBMAN=rocksndiamonds.6
VERSION := $(shell dpkg-parsechangelog \
- |grep ^Version \
- |awk '{print $$2}' \
- |sed 's/-[0-9]\+$$//')
+ |grep ^Version \
+ |awk '{print $$2}' \
+ |sed 's/-[0-9]\+$$//')
UPSTREAM_VERSION := $(shell echo $(VERSION)|sed 's/+.*//')
-CFLAGS = -Wall -g
+LEVEL_DIR := /usr/share/games/rocksndiamonds
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
+include /usr/share/cdbs/1/rules/debhelper.mk
-
-scripts-stamp:
+build/rocksndiamonds:: rocksndiamonds.6
+ make RO_GAME_DIR=$(LEVEL_DIR) sdl
+ mv rocksndiamonds rocksndiamonds-bin
+ install -m 0755 debian/start_binary.sh rocksndiamonds
set -e; \
- for file in postinst preinst prerm; do \
- cp debian/$$file.in debian/$$file; \
- perl -pi -e 's/#VERSION#/$(UPSTREAM_VERSION)/g' \
- debian/$$file; \
- done
- touch $@
-
-build: patch build-stamp
-
-build-stamp:
- dh_testdir
- export RO_GAME_DIR=$(LEVEL_DIR); \
- $(MAKE) sdl
- cat $(ORIGMAN)|sed 's/^\.TH ROCKSNDIAMONDS 1L/.TH ROCKSNDIAMONDS 6/' \
- | sed "s/^'/ '/" \
- > $(DEBMAN)
- touch $@
-
-clean: unpatch
- dh_testdir
- dh_testroot
- rm -f build-stamp configure-stamp \
- $(DEBMAN) src/conftime.h scripts-stamp \
+ for file in postinst preinst prerm; do \
+ cp debian/$$file.in debian/$$file; \
+ perl -pi -e 's/#VERSION#/$(UPSTREAM_VERSION)/g' \
+ debian/$$file; \
+ done
+
+rocksndiamonds.6: rocksndiamonds.1
+ sed 's/^\.TH ROCKSNDIAMONDS 1L/.TH ROCKSNDIAMONDS 6/' $< > $@
+
+clean::
+ make clean
+ rm -fr rocksndiamonds.6 .pc \
+ src/conftime.h rocksndiamonds-bin \
debian/postinst debian/preinst debian/prerm
- $(MAKE) clean
- dh_clean
debconf-updatepo
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
- install -m 0755 rocksndiamonds \
- debian/$(PACKAGE)/usr/games/$(BINARYNAME)-bin
- install -m 0755 debian/start_binary.sh \
- debian/$(PACKAGE)/usr/games/$(BINARYNAME)
- umask 022 && \
- echo "usage: 'dpkg-reconfigure $(PACKAGE)' for downloading files" \
- > debian/$(PACKAGE)$(LEVEL_DIR)/README.dir
-
-# Build architecture-independent files here.
-binary-indep:
-
-# Build architecture-dependent files here.
-binary-arch: build install scripts-stamp
- dh_testdir
- dh_testroot
- dh_installchangelogs ChangeLog
- dh_installdocs
- dh_installman
- dh_installmenu
- dh_link
- dh_strip
- dh_installdebconf
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+# PACKAGE=rocksndiamonds
+# BINARYNAME=rocksndiamonds
+# LEVEL_DIR=/usr/share/games/$(PACKAGE)
+# LINTIANROOT=/usr/share/lintian
+#
+# ORIGMAN=rocksndiamonds.1
+# DEBMAN=rocksndiamonds.6
+#
+# VERSION := $(shell dpkg-parsechangelog \
+# |grep ^Version \
+# |awk '{print $$2}' \
+# |sed 's/-[0-9]\+$$//')
+#
+# UPSTREAM_VERSION := $(shell echo $(VERSION)|sed 's/+.*//')
+#
+# CFLAGS = -Wall -g
+#
+# ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+# CFLAGS += -O0
+# else
+# CFLAGS += -O2
+# endif
+#
+#
+# scripts-stamp:
+# set -e; \
+# for file in postinst preinst prerm; do \
+# cp debian/$$file.in debian/$$file; \
+# perl -pi -e 's/#VERSION#/$(UPSTREAM_VERSION)/g' \
+# debian/$$file; \
+# done
+# touch $@
+#
+# build: build-stamp
+#
+# build-stamp:
+# dh_testdir
+# export RO_GAME_DIR=$(LEVEL_DIR); \
+# $(MAKE) sdl
+# cat $(ORIGMAN)|sed 's/^\.TH ROCKSNDIAMONDS 1L/.TH ROCKSNDIAMONDS 6/' \
+# | sed "s/^'/ '/" \
+# > $(DEBMAN)
+# touch $@
+#
+# clean:
+# dh_testdir
+# dh_testroot
+# rm -f build-stamp configure-stamp \
+# $(DEBMAN) src/conftime.h scripts-stamp \
+# debian/postinst debian/preinst debian/prerm
+# $(MAKE) clean
+# dh_clean
+# debconf-updatepo
+#
+# install: build
+# dh_testdir
+# dh_testroot
+# dh_clean -k
+# dh_installdirs
+# install -m 0755 rocksndiamonds \
+# debian/$(PACKAGE)/usr/games/$(BINARYNAME)-bin
+# install -m 0755 debian/start_binary.sh \
+# debian/$(PACKAGE)/usr/games/$(BINARYNAME)
+# umask 022 && \
+# echo "usage: 'dpkg-reconfigure $(PACKAGE)' for downloading files" \
+# > debian/$(PACKAGE)$(LEVEL_DIR)/README.dir
+#
+# # Build architecture-independent files here.
+# binary-indep:
+#
+# # Build architecture-dependent files here.
+# binary-arch: build install scripts-stamp
+# dh_testdir
+# dh_testroot
+# dh_installchangelogs ChangeLog
+# dh_installdocs
+# dh_installman
+# dh_installmenu
+# dh_link
+# dh_strip
+# dh_installdebconf
+# dh_compress
+# dh_fixperms
+# dh_installdeb
+# dh_shlibdeps
+# dh_gencontrol
+# dh_md5sums
+# dh_builddeb
+#
+# binary: binary-indep binary-arch
+# .PHONY: build clean binary-indep binary-arch binary install configure
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
--
Arcade style game
More information about the Pkg-games-commits
mailing list