[SCM] Arcade style game branch, master, updated. debian/3.3.0.1+dfsg1-1
The following commit has been merged in the master branch: commit 260609e0576b3df9b2510ccf182f0190503c7697 Author: Dmitry E. Oboukhov un...@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: -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: -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 ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
[SCM] Arcade style game branch, master, updated. debian/3.3.0.1+dfsg1-1
The following commit has been merged in the master branch:
commit c8d7d472a9e6acf4411776f02f2024902aa6a7b4
Author: Dmitry E. Oboukhov un...@debian.org
Date: Thu Jun 17 10:38:37 2010 +0400
new upstream version
diff --git a/ChangeLog b/ChangeLog
index 9451858..db17bdf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2010-06-08
+ * version 3.3.0.1 released
+
+2010-06-08
+ * added configurable key shortcuts for snap+direction player actions
+ (probably most useful for recording tool-assisted speedrun (TAS)
+ tapes using the single-step mode of the tape recorder)
+
+2010-05-28
+ * version number set to 3.3.0.1
+
+2010-05-25
+ * version 3.3.0.0 released
+
2010-05-22
* fixed missing memory allocation in SP engine when saving engine data
for non-SP game engine snapshots (which also stores SP engine part)
diff --git a/debian/changelog b/debian/changelog
index f2891ba..572b8bf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+rocksndiamonds (3.3.0.1+dfsg1-1) unstable; urgency=low
+
+ * New upstream bugfix version.
+
+ -- Dmitry E. Oboukhov un...@debian.org Thu, 17 Jun 2010 10:37:21 +0400
+
rocksndiamonds (3.3.0.0+dfsg1-1) unstable; urgency=low
* New upstream version.
diff --git a/debian/postinst.in b/debian/postinst.in
index 5d433fb..9ab256c 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 = '191b7a63de9706b0aee52cdf983b3267',
+md5 = '813ced99d54f89db7c593c518d197d18',
topdir = 'rocksndiamonds-#VERSION#',
},
diff --git a/rocksndiamonds.1 b/rocksndiamonds.1
index e155fa2..4c14c4b 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 34f01f6..4bbbcca 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
+SDL_LIBS = -lSDL_image -lSDL_mixer -lSDL_net -lsmpeg
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
+SDL_LIBS = -lSDL_image -lSDL_mixer -lSDL_net -lsmpeg
SYS_LDFLAGS = $(SDL_LIBS) $(shell sdl-config --static-libs)
endif
diff --git a/src/events.c b/src/events.c
index 9a42eb4..8c7aeca 100644
--- a/src/events.c
+++ b/src/events.c
@@ -607,20 +607,22 @@ static void HandleKeysSpecial(Key key)
void HandleKey(Key key, int key_status)
{
boolean anyTextGadgetActiveOrJustFinished = anyTextGadgetActive();
- static struct SetupKeyboardInfo custom_key;
+ static struct SetupKeyboardInfo ski;
+ static struct SetupShortcutInfo ssi;
static struct
{
Key *key_custom;
+Key *key_snap;
Key key_default;
byte action;
} key_info[] =
{
-{ custom_key.left, DEFAULT_KEY_LEFT, JOY_LEFT },
-{ custom_key.right, DEFAULT_KEY_RIGHT, JOY_RIGHT
[SCM] Arcade style game branch, pristine-tar, updated. 30a03302a560e090e11488754cc5b5d5196744d0
The following commit has been merged in the pristine-tar branch: commit 30a03302a560e090e11488754cc5b5d5196744d0 Author: Dmitry E. Oboukhov un...@debian.org Date: Thu Jun 17 10:45:48 2010 +0400 pristine-tar data for rocksndiamonds_3.3.0.1+dfsg1.orig.tar.gz diff --git a/rocksndiamonds_3.3.0.1+dfsg1.orig.tar.gz.delta b/rocksndiamonds_3.3.0.1+dfsg1.orig.tar.gz.delta new file mode 100644 index 000..2638d6e Binary files /dev/null and b/rocksndiamonds_3.3.0.1+dfsg1.orig.tar.gz.delta differ diff --git a/rocksndiamonds_3.3.0.1+dfsg1.orig.tar.gz.id b/rocksndiamonds_3.3.0.1+dfsg1.orig.tar.gz.id new file mode 100644 index 000..1c6491d --- /dev/null +++ b/rocksndiamonds_3.3.0.1+dfsg1.orig.tar.gz.id @@ -0,0 +1 @@ +078933bc8f45ff1623f4d3921e12eef19a53e69c -- Arcade style game ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
[SCM] Arcade style game annotated tag, debian/3.3.0.1+dfsg1-1, created. debian/3.3.0.1+dfsg1-1
The annotated tag, debian/3.3.0.1+dfsg1-1 has been created at 078933bc8f45ff1623f4d3921e12eef19a53e69c (tag) tagging 260609e0576b3df9b2510ccf182f0190503c7697 (commit) replaces debian/3.3.0.0+dfsg1-1 tagged by Dmitry E. Oboukhov on Thu Jun 17 10:45:32 2010 +0400 - Shortlog Debian release 3.3.0.1+dfsg1-1 Dmitry E. Oboukhov (2): new upstream version old patches --- -- Arcade style game ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
[SCM] Packaging for gplanarity branch, master, created. 650f9ed2c2b9c166ab471d260324f5f2f9d8bcf3
The branch, master has been created
at 650f9ed2c2b9c166ab471d260324f5f2f9d8bcf3 (commit)
- Shortlog
commit 650f9ed2c2b9c166ab471d260324f5f2f9d8bcf3
Author: Vincent Legout vinc...@legout.info
Date: Tue Jun 15 15:10:50 2010 +0200
Rewrite debian/rules
commit 8e1cd85532cc410c3ae70724df3425527b5fd794
Author: Vincent Legout vinc...@legout.info
Date: Tue Jun 15 14:54:55 2010 +0200
Update debian/copyright
commit bce7ced9dd244eef9d9ab200842b088b7f682f9c
Author: Vincent Legout vinc...@legout.info
Date: Tue Jun 15 14:53:01 2010 +0200
Update desktop file
commit 5f9f5c07c838c4c8c0f6ccbe3b995f223d1aeeb0
Author: Vincent Legout vinc...@legout.info
Date: Tue Jun 15 14:51:30 2010 +0200
Add Homepage field
commit 4dc045149c1b73d9b4b2f0346ff372356dc5f617
Author: Vincent Legout vinc...@legout.info
Date: Thu Jun 10 17:25:21 2010 +0200
Switch to 3.0 (quilt) format
commit cf95900f8ba3f8d42a015a004957b319c2afa5ad
Author: Vincent Legout vinc...@legout.info
Date: Thu Jun 10 17:24:17 2010 +0200
Set debhelper compatibility level to 7
commit 3f611f35a1282e615033763b3bc71d17eb91e5b5
Author: Vincent Legout vinc...@legout.info
Date: Thu Jun 10 17:06:52 2010 +0200
pdate Standards-Version to 3.8.4
commit e55cad85da9db67371453a57122191064442ba0a
Author: Vincent Legout vinc...@legout.info
Date: Thu Jun 10 17:05:53 2010 +0200
Add ${misc:Depends}
commit 146138666a02b735c1150d3d593ac99f16017e04
Author: Vincent Legout vinc...@legout.info
Date: Thu Jun 10 17:03:55 2010 +0200
Set Debian Games Team as Maintainer
commit f7c4284f9134eea66fea6b3db5c1ed7a55dceaf0
Merge: ba345e934bcc419361db2385d89c8a50ee583437
9dcbd3ec85ae3cccbf49f7961fa635ff9055f648
Author: Vincent Legout vinc...@legout.info
Date: Thu Jun 10 11:30:18 2010 +0200
Merge commit 'upstream/16723'
Conflicts:
version.h
commit 9dcbd3ec85ae3cccbf49f7961fa635ff9055f648
Author: Vincent Legout vinc...@legout.info
Date: Thu Jun 10 11:29:48 2010 +0200
Imported Upstream version 16723
commit ba345e934bcc419361db2385d89c8a50ee583437
Author: Stefano Zacchiroli z...@debian.org
Date: Tue Sep 1 17:24:31 2009 +0200
Imported Debian patch 11496-2.2
commit 4d95d2a994a4f10f7a83dfb834d42fa4fc3fc3da
Author: Vincent Legout vinc...@legout.info
Date: Thu Jun 10 11:27:27 2010 +0200
Imported Upstream version 11496
---
--
Packaging for gplanarity
___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
[SCM] Packaging for gplanarity branch, upstream, created. 9dcbd3ec85ae3cccbf49f7961fa635ff9055f648
The branch, upstream has been created at 9dcbd3ec85ae3cccbf49f7961fa635ff9055f648 (commit) - Shortlog --- -- Packaging for gplanarity ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
[SCM] Packaging for gplanarity branch, pristine-tar, created. bba36eeed87984ec5648d9e991cb66450e17c269
The branch, pristine-tar has been created at bba36eeed87984ec5648d9e991cb66450e17c269 (commit) - Shortlog commit bba36eeed87984ec5648d9e991cb66450e17c269 Author: Vincent Legout vinc...@legout.info Date: Thu Jun 10 11:29:48 2010 +0200 pristine-tar data for gplanarity_16723.orig.tar.gz commit aeaba3ca29662db935e9eaa191368451aba42184 Author: Vincent Legout vinc...@legout.info Date: Thu Jun 10 11:27:29 2010 +0200 pristine-tar data for gplanarity_11496.orig.tar.gz --- -- Packaging for gplanarity ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
[SCM] Packaging for gplanarity annotated tag, debian/11496-2.2, created. debian/11496-2.2
The annotated tag, debian/11496-2.2 has been created at d1fec2916b866f19f7929b0660bd47ce4dea64f6 (tag) tagging ba345e934bcc419361db2385d89c8a50ee583437 (commit) replaces upstream/11496 tagged by Vincent Legout on Thu Jun 10 11:27:30 2010 +0200 - Shortlog Debian release 11496-2.2 Stefano Zacchiroli (1): Imported Debian patch 11496-2.2 --- -- Packaging for gplanarity ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
[SCM] Packaging for gplanarity annotated tag, upstream/11496, created. upstream/11496
The annotated tag, upstream/11496 has been created at 62dcc5d51e894729ce9d05020b9a651c907466ef (tag) tagging 4d95d2a994a4f10f7a83dfb834d42fa4fc3fc3da (commit) tagged by Vincent Legout on Thu Jun 10 11:27:27 2010 +0200 - Shortlog Upstream version 11496 Vincent Legout (1): Imported Upstream version 11496 --- -- Packaging for gplanarity ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
[SCM] Packaging for gplanarity annotated tag, upstream/16723, created. upstream/16723
The annotated tag, upstream/16723 has been created at f092ca868dc5c238c7e0895cdda8e41fb2ae753a (tag) tagging 9dcbd3ec85ae3cccbf49f7961fa635ff9055f648 (commit) replaces upstream/11496 tagged by Vincent Legout on Thu Jun 10 11:29:48 2010 +0200 - Shortlog Upstream version 16723 Vincent Legout (1): Imported Upstream version 16723 --- -- Packaging for gplanarity ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
[SCM] Packaging for gplanarity branch, master, updated. upstream/16723-12-g07bea65
The following commit has been merged in the master branch:
commit 07bea65f3469f3c46da5834bef044bbd8c20b466
Author: Vincent Legout vinc...@legout.info
Date: Thu Jun 17 10:21:10 2010 +0200
Add Vcs-Git and Vcs-Browser fields
diff --git a/debian/changelog b/debian/changelog
index ad61149..23f3523 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ gplanarity (16723-1) unstable; urgency=low
- Add ${misc:Depends}
- Update Standards-Version to 3.8.4
- Add Homepage field
+- Add Vcs-Git and Vcs-Browser fields
* Set debhelper compatibility level to 7
* Add debian/source/format: Switch to 3.0 (quilt) format
* debian/gplanarity.desktop: Remove Encoding key and update Categories
@@ -18,7 +19,7 @@ gplanarity (16723-1) unstable; urgency=low
* debian/patches/nls.patch: Added, Fix FTBFS
* debian/patches/makefile.patch: Added, Fix install directories
- -- Vincent Legout vinc...@legout.info Thu, 10 Jun 2010 16:59:56 +0200
+ -- Vincent Legout vinc...@legout.info Thu, 17 Jun 2010 10:20:56 +0200
gplanarity (11496-2.2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index b32ed2b..2d7f6ce 100644
--- a/debian/control
+++ b/debian/control
@@ -6,6 +6,8 @@ Uploaders: Vincent Legout vinc...@legout.info
Build-Depends: debhelper (= 7.0.50~), libgtk2.0-dev, libcairo2-dev,
libfreetype6-dev, docbook-to-man, libtiff-dev, libjasper-dev
Standards-Version: 3.8.4
Homepage: http://web.mit.edu/xiphmont/Public/gPlanarity.html
+Vcs-Git: git://git.debian.org/git/pkg-games/gplanarity.git
+Vcs-Browser: http://git.debian.org/?p=pkg-games/gplanarity.git
Package: gplanarity
Architecture: any
--
Packaging for gplanarity
___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
r11024 - packages/trunk/libphysfs/debian
Author: pmatthaei Date: 2010-06-17 17:26:14 + (Thu, 17 Jun 2010) New Revision: 11024 Modified: packages/trunk/libphysfs/debian/changelog packages/trunk/libphysfs/debian/libphysfs1.links Log: * Fix link from libphysfs-1.0.so.0 to libphysfs.so.2.0.1. Closes: #586248 Modified: packages/trunk/libphysfs/debian/changelog === --- packages/trunk/libphysfs/debian/changelog 2010-06-16 21:32:05 UTC (rev 11023) +++ packages/trunk/libphysfs/debian/changelog 2010-06-17 17:26:14 UTC (rev 11024) @@ -1,3 +1,10 @@ +libphysfs (2.0.1-2) UNRELEASED; urgency=low + + * Fix link from libphysfs-1.0.so.0 to libphysfs.so.2.0.1. +Closes: #586248 + + -- Patrick Matthäi pmatth...@debian.org Thu, 17 Jun 2010 19:25:22 +0200 + libphysfs (2.0.1-1) unstable; urgency=low * New upstream release. Modified: packages/trunk/libphysfs/debian/libphysfs1.links === --- packages/trunk/libphysfs/debian/libphysfs1.links2010-06-16 21:32:05 UTC (rev 11023) +++ packages/trunk/libphysfs/debian/libphysfs1.links2010-06-17 17:26:14 UTC (rev 11024) @@ -1 +1 @@ -usr/lib/libphysfs.so.2.0.0 usr/lib/libphysfs-1.0.so.0 +usr/lib/libphysfs.so.2.0.1 usr/lib/libphysfs-1.0.so.0 ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
