This is an automated email from the git hooks/post-receive script. skitt pushed a commit to branch master in repository gnurobbo.
commit 2311138caed1451c5b2f302920b63eb9f96d7c59 Author: Stephen Kitt <[email protected]> Date: Thu Aug 27 22:50:03 2015 +0200 New upstream version; refresh patches. --- debian/changelog | 7 +++++ debian/patches/Makefile.diff | 42 ++++++++++-------------------- debian/patches/format-security.patch | 50 ++++++++++++++++++------------------ 3 files changed, 45 insertions(+), 54 deletions(-) diff --git a/debian/changelog b/debian/changelog index 15ec9d5..5630f97 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +gnurobbo (0.68+dfsg-1) UNRELEASED; urgency=medium + + * New upstream version. + * Refresh patches. + + -- Stephen Kitt <[email protected]> Thu, 27 Aug 2015 22:49:48 +0200 + gnurobbo (0.66+dfsg-4) unstable; urgency=medium * Update debian/copyright to machine-readable format, and use diff --git a/debian/patches/Makefile.diff b/debian/patches/Makefile.diff index 6517f92..ffd8ea7 100644 --- a/debian/patches/Makefile.diff +++ b/debian/patches/Makefile.diff @@ -8,16 +8,14 @@ Description: adapt the build to Debian's requirements . Disable music support. . - Add -lm to support building with gold. - . Remove the gnurobbo binary when cleaning. Author: Stephen Kitt <[email protected]> -Last-Update: 2010-12-03 +Last-Update: 2015-08-27 ---- gnurobbo.orig/Makefile -+++ gnurobbo/Makefile -@@ -5,9 +5,9 @@ - #DOCDIR?=/usr/local/share/$(TARGET) +--- a/Makefile ++++ b/Makefile +@@ -16,9 +16,9 @@ + # GNU Debian system wide installation -#PACKAGE_DATA_DIR?=/usr/share/games/$(TARGET) @@ -29,7 +27,7 @@ Last-Update: 2010-12-03 # Local installation within your home folder #PACKAGE_DATA_DIR?=$(HOME)/Games/$(TARGET) -@@ -15,12 +15,12 @@ +@@ -26,12 +26,12 @@ #DOCDIR?=$(HOME)/Games/$(TARGET) # Run from current folder i.e. no installation (default) @@ -45,31 +43,17 @@ Last-Update: 2010-12-03 +#MUSIC=-DHAVE_MUSIC # Comment out the line below if you want to disable the designer DESIGNER=-DHAVE_DESIGNER + #Comment this if you do not want the lightning effects enabled +@@ -63,7 +63,7 @@ -@@ -36,17 +36,18 @@ - - # These should be ok for most - SDL_CONFIG?=sdl-config --CFLAGS?=-O3 -pipe --CFLAGS+=-Wall `$(SDL_CONFIG) --cflags` -DPLATFORM_PC -DVERSION=\"$(VERSION)\" \ -+CPPFLAGS?= -+CFLAGS?=-O3 -+CFLAGS+=-pipe -Wall `$(SDL_CONFIG) --cflags` -DPLATFORM_PC -DVERSION=\"$(VERSION)\" \ + CFLAGS+=-d -Wall `$(SDL_CONFIG) --cflags` -DPLATFORM_PC -DVERSION=\"$(VERSION)\" $(SMOOTH_SCRL) $(LIGHTNING)\ -DPACKAGE_DATA_DIR=\"$(PACKAGE_DATA_DIR)\" $(FONT_USE_PIXMAP) $(MUSIC) $(DESIGNER) -LDFLAGS= +LDFLAGS?= # Use these instead for debugging and/or profiling (mainly intended for GNU Robbo developers) #CFLAGS?=-O0 -pipe -g -pg #CFLAGS+=-Wall `$(SDL_CONFIG) --cflags` -DPLATFORM_PC -DVERSION=\"$(VERSION)\" \ - # -DPACKAGE_DATA_DIR=\"$(PACKAGE_DATA_DIR)\" $(FONT_USE_PIXMAP) $(MUSIC) $(DESIGNER) - #LDFLAGS=-pg - LINK=$(CC) --LIBS=`$(SDL_CONFIG) --libs` -lSDL_image -lSDL_mixer $(FONT_USE_SDL_TTF) -+LIBS=-lm `$(SDL_CONFIG) --libs` -lSDL_image -lSDL_mixer $(FONT_USE_SDL_TTF) - - # You won't need to alter anything below - all: $(SOURCES) $(TARGET) -@@ -55,12 +56,12 @@ +@@ -85,12 +85,12 @@ $(LINK) $(LDFLAGS) $(OBJECTS) $(LIBS) -o $@ %.o: %.c @@ -84,7 +68,7 @@ Last-Update: 2010-12-03 install: @if [ "$(PACKAGE_DATA_DIR)" = ./data ] ; then \ -@@ -68,10 +69,6 @@ +@@ -98,10 +98,6 @@ exit 2; \ fi mkdir -p $(PACKAGE_DATA_DIR)/levels @@ -95,7 +79,7 @@ Last-Update: 2010-12-03 mkdir -p $(PACKAGE_DATA_DIR)/rob mkdir -p $(PACKAGE_DATA_DIR)/skins/original mkdir -p $(PACKAGE_DATA_DIR)/skins/tronic -@@ -87,19 +84,10 @@ +@@ -117,19 +113,10 @@ mkdir -p $(BINDIR) mkdir -p $(DOCDIR) cp data/levels/* $(PACKAGE_DATA_DIR)/levels/ @@ -115,7 +99,7 @@ Last-Update: 2010-12-03 cp data/locales/cz_CZ/* $(PACKAGE_DATA_DIR)/locales/cz_CZ/ cp data/locales/de_DE/* $(PACKAGE_DATA_DIR)/locales/de_DE/ cp data/locales/en_GB/* $(PACKAGE_DATA_DIR)/locales/en_GB/ -@@ -109,8 +97,3 @@ +@@ -139,8 +126,3 @@ cp data/locales/sk_SK/* $(PACKAGE_DATA_DIR)/locales/sk_SK/ cp data/locales/sv_SE/* $(PACKAGE_DATA_DIR)/locales/sv_SE/ cp $(TARGET) $(BINDIR)/ diff --git a/debian/patches/format-security.patch b/debian/patches/format-security.patch index 22e70d3..95893e4 100644 --- a/debian/patches/format-security.patch +++ b/debian/patches/format-security.patch @@ -1,11 +1,11 @@ Description: Always use a format string with sprintf() Author: Stephen Kitt <[email protected]> Forwarded: https://sourceforge.net/tracker/?func=detail&aid=3414732&group_id=64186&atid=506596 -Last-Update: 2011-09-27 +Last-Update: 2015-08-27 ---- gnurobbo.orig/konstruktor.c -+++ gnurobbo/konstruktor.c -@@ -245,7 +245,7 @@ +--- a/konstruktor.c ++++ b/konstruktor.c +@@ -247,7 +247,7 @@ else if (level.w == 32 && level.h == 31) gsize = 1; inforedraw = 1; @@ -14,7 +14,7 @@ Last-Update: 2011-09-27 robbo.keys = k_count_obj(KEY); /* count keys on a map */ robbo.bullets = k_count_obj(BULLET) * 9; /* count bullets */ game_area.redraw = REDRAW_EVERYTHING; -@@ -654,12 +654,12 @@ +@@ -656,12 +656,12 @@ nx = nx + k_view.x; ny = ny + k_view.y; if (selected != -1) { @@ -29,8 +29,8 @@ Last-Update: 2011-09-27 } /* * do we try to delete one of the counted objects? -@@ -686,7 +686,7 @@ - ); +@@ -688,7 +688,7 @@ + create_object(nx, ny, BOMB2); switch (K_icons[selected].game_obj) { case GROUND: - sprintf(infostring, txt_konstruktor_Ground); @@ -38,7 +38,7 @@ Last-Update: 2011-09-27 break; case STOP: sprintf(infostring, "%s (%d %s)", -@@ -743,7 +743,7 @@ +@@ -745,7 +745,7 @@ txt_konstruktor_on_map); break; case EMPTY_FIELD: @@ -47,7 +47,7 @@ Last-Update: 2011-09-27 break; case BUTTERFLY: sprintf(infostring, "%s (%d %s)", -@@ -781,9 +781,9 @@ +@@ -783,9 +783,9 @@ case WALL: board[nx][ny].state = wallnumber; if (wallnumber != 3) @@ -56,10 +56,10 @@ Last-Update: 2011-09-27 else - sprintf(infostring, txt_konstruktor_Black_Wall); + sprintf(infostring, "%s", txt_konstruktor_Black_Wall); + // game_area.redraw=REDRAW_EVERYTHING; break; case TELEPORT: - board[nx][ny].teleportnumber = teleportnr; -@@ -883,7 +883,7 @@ +@@ -905,7 +905,7 @@ break; case K_RELOAD: if (cnt == lastselected) { @@ -68,7 +68,7 @@ Last-Update: 2011-09-27 clear_screen(); level_init(); konstruktor_viewport_init(); -@@ -901,7 +901,7 @@ +@@ -923,7 +923,7 @@ k_redraw_all(); cnt = -1; } else { @@ -77,7 +77,7 @@ Last-Update: 2011-09-27 txt_konstruktor_Reload_level_select_again_to_reload); lastclick = 50; }; -@@ -929,7 +929,7 @@ +@@ -951,7 +951,7 @@ inforedraw = 1; break; case ROBBO: @@ -86,7 +86,7 @@ Last-Update: 2011-09-27 inforedraw = 1; break; case GUN: -@@ -1026,16 +1026,16 @@ +@@ -1048,16 +1048,16 @@ inforedraw = 1; break; case EMPTY_FIELD: @@ -96,7 +96,7 @@ Last-Update: 2011-09-27 break; case WALL: if (cnt == selected) - wallnumber = (wallnumber + 1) % 9; + wallnumber = (wallnumber + 1) % 10; if (wallnumber != 3) - sprintf(infostring, txt_konstruktor_Wall); + sprintf(infostring, "%s", txt_konstruktor_Wall); @@ -106,7 +106,7 @@ Last-Update: 2011-09-27 inforedraw = 1; break; case K_LASER: -@@ -1056,7 +1056,7 @@ +@@ -1078,7 +1078,7 @@ teleportnr = (teleportnr % 11) + 1; break; case GROUND: @@ -115,7 +115,7 @@ Last-Update: 2011-09-27 inforedraw = 1; break; case BIRD: -@@ -1079,16 +1079,16 @@ +@@ -1101,16 +1101,16 @@ direction = (direction + 1) % 4; switch (direction) { case 0: @@ -136,7 +136,7 @@ Last-Update: 2011-09-27 break; } inforedraw = 1; -@@ -1097,13 +1097,13 @@ +@@ -1119,13 +1119,13 @@ ltype = (ltype + 1) % 3; switch (ltype) { case 0: @@ -153,7 +153,7 @@ Last-Update: 2011-09-27 break; } inforedraw = 1; -@@ -1114,23 +1114,23 @@ +@@ -1136,23 +1136,23 @@ movable = (rmstate & 1); switch (rmstate) { case 0: @@ -182,7 +182,7 @@ Last-Update: 2011-09-27 insert = 1; /* * Clear board -@@ -1154,7 +1154,7 @@ +@@ -1176,7 +1176,7 @@ cnt = -1; } else { @@ -191,7 +191,7 @@ Last-Update: 2011-09-27 txt_konstruktor_New_level_select_again_to_create); lastclick = 50; } -@@ -1165,7 +1165,7 @@ +@@ -1187,7 +1187,7 @@ * Clear board */ if (lastselected == cnt) { @@ -200,7 +200,7 @@ Last-Update: 2011-09-27 robbo.screws = 0; robbo.keys = 0; robbo.bullets = 0; /* Thunor: I added this as it was missing */ -@@ -1184,7 +1184,7 @@ +@@ -1206,7 +1206,7 @@ clear_entire_board(); cnt = -1; } else { @@ -209,7 +209,7 @@ Last-Update: 2011-09-27 txt_konstruktor_Clear_level_select_again_to_clear); lastclick = 50; } -@@ -1193,9 +1193,9 @@ +@@ -1215,9 +1215,9 @@ case K_SAVE: if (lastselected == cnt) { if (insert == 1) @@ -221,7 +221,7 @@ Last-Update: 2011-09-27 cnt = -1; k_save_map(); -@@ -1206,10 +1206,10 @@ +@@ -1228,10 +1228,10 @@ lastclick = 50; if (insert == 1) @@ -234,7 +234,7 @@ Last-Update: 2011-09-27 txt_konstruktor_Save_select_again_to_save_changes); } inforedraw = 1; -@@ -1275,7 +1275,7 @@ +@@ -1297,7 +1297,7 @@ konstruktor_end(); cnt = -1; } else { -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/gnurobbo.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
