This is an automated email from the git hooks/post-receive script. skitt pushed a commit to branch master in repository rocksndiamonds.
commit 178bf397bfec76c7715a0704056298b3d49ae832 Author: Stephen Kitt <[email protected]> Date: Tue Jan 17 13:07:55 2017 +0100 New upstream release, switching to SDL2 --- debian/changelog | 6 ++- debian/control | 8 ++-- debian/docs | 1 - debian/links | 1 - debian/manpages | 1 - debian/patches/651620-world-writable-dirs.patch | 43 ----------------- debian/patches/fix-manpage-errors | 62 ------------------------- debian/patches/fix-shlibdeps-warning | 45 ------------------ debian/patches/gcc-5-build.patch | 14 ------ debian/patches/series | 4 -- debian/rules | 10 ++-- 11 files changed, 11 insertions(+), 184 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3147c5f..1e05709 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,11 @@ -rocksndiamonds (3.3.0.1+dfsg1-4) UNRELEASED; urgency=medium +rocksndiamonds (4.0.0.1+dfsg-1) UNRELEASED; urgency=medium + * Team upload. + * New upstream release, obsoleting all patches (closes: #752493). * Update debian/watch; thanks to Bart Martens! * Fix the VCS browser URL. - -- Stephen Kitt <[email protected]> Sun, 20 Sep 2015 22:50:55 +0200 + -- Stephen Kitt <[email protected]> Tue, 17 Jan 2017 12:45:49 +0100 rocksndiamonds (3.3.0.1+dfsg1-3) unstable; urgency=medium diff --git a/debian/control b/debian/control index bf3c053..074e291 100644 --- a/debian/control +++ b/debian/control @@ -4,10 +4,10 @@ Priority: extra Uploaders: Debian Games Team <[email protected]> Maintainer: Dmitry E. Oboukhov <[email protected]> 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) + libsdl2-dev, + libsdl2-image-dev, + libsdl2-mixer-dev, + libsdl2-net-dev Standards-Version: 3.8.4 Homepage: http://artsoft.org VCS-Browser: https://anonscm.debian.org/cgit/collab-maint/rocksndiamonds.git diff --git a/debian/docs b/debian/docs deleted file mode 100644 index e845566..0000000 --- a/debian/docs +++ /dev/null @@ -1 +0,0 @@ -README diff --git a/debian/links b/debian/links deleted file mode 100644 index aba34d8..0000000 --- a/debian/links +++ /dev/null @@ -1 +0,0 @@ -/usr/share/man/man6/rocksndiamonds.6.gz /usr/share/man/man6/rocksndiamonds-bin.6.gz diff --git a/debian/manpages b/debian/manpages deleted file mode 100644 index 483d156..0000000 --- a/debian/manpages +++ /dev/null @@ -1 +0,0 @@ -rocksndiamonds.6 diff --git a/debian/patches/651620-world-writable-dirs.patch b/debian/patches/651620-world-writable-dirs.patch deleted file mode 100644 index 22cc0a5..0000000 --- a/debian/patches/651620-world-writable-dirs.patch +++ /dev/null @@ -1,43 +0,0 @@ -Description: Don't play with directory permissions - The ~/.rocksndiamonds directory and its subdirectories - were created as writable to anybody - . - rocksndiamonds (3.3.0.1+dfsg1-2.2) unstable; urgency=low - . - * Non-maintainer upload. - * Fixed permissions when creating directories (Closes: #651620) -Author: Igor Pashev <[email protected]> -Bug-Debian: http://bugs.debian.org/651620 -Origin: vendor -Forwarded: no -Last-Update: 2012-05-13 - ---- rocksndiamonds-3.3.0.1+dfsg1.orig/src/libgame/setup.c -+++ rocksndiamonds-3.3.0.1+dfsg1/src/libgame/setup.c -@@ -1438,26 +1438,10 @@ void createDirectory(char *dir, char *te - of USERDATA_DIR_MODE are not masked */ - mode_t dir_mode = (permission_class == PERMS_PRIVATE ? - DIR_PERMS_PRIVATE : DIR_PERMS_PUBLIC); -- mode_t last_umask = posix_umask(0); -- mode_t group_umask = ~(dir_mode & S_IRWXG); -- int running_setgid = posix_process_running_setgid(); -- -- /* if we're setgid, protect files against "other" */ -- /* else keep umask(0) to make the dir world-writable */ -- -- if (running_setgid) -- posix_umask(last_umask & group_umask); -- else -- dir_mode |= MODE_W_ALL; - - if (!fileExists(dir)) - if (posix_mkdir(dir, dir_mode) != 0) - Error(ERR_WARN, "cannot create %s directory '%s'", text, dir); -- -- if (permission_class == PERMS_PUBLIC && !running_setgid) -- chmod(dir, dir_mode); -- -- posix_umask(last_umask); /* restore previous umask */ - } - - void InitUserDataDirectory() diff --git a/debian/patches/fix-manpage-errors b/debian/patches/fix-manpage-errors deleted file mode 100644 index e993c52..0000000 --- a/debian/patches/fix-manpage-errors +++ /dev/null @@ -1,62 +0,0 @@ -Description: Upstream changes introduced in version 3.3.0.0+dfsg1-1 - This patch has been created by dpkg-source during the package build. - Here's the last changelog entry, hopefully it gives details on why - those changes were made: - . - 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. - . - The person named in the Author field signed this changelog entry. -Author: Dmitry E. Oboukhov <[email protected]> - ---- -The information above should follow the Patch Tagging Guidelines, please -checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here -are templates for supplementary fields that you might want to add: - -Origin: <vendor|upstream|other>, <url of original patch> -Bug: <url in upstream bugtracker> -Bug-Debian: http://bugs.debian.org/<bugnumber> -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.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 - 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 fo - 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/debian/patches/fix-shlibdeps-warning b/debian/patches/fix-shlibdeps-warning deleted file mode 100644 index d668146..0000000 --- a/debian/patches/fix-shlibdeps-warning +++ /dev/null @@ -1,45 +0,0 @@ -Description: Upstream changes introduced in version 3.3.0.0+dfsg1-1 - This patch has been created by dpkg-source during the package build. - Here's the last changelog entry, hopefully it gives details on why - those changes were made: - . - 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. - * Fixed dh_shlibdeps warning. - . - The person named in the Author field signed this changelog entry. -Author: Dmitry E. Oboukhov <[email protected]> - ---- -The information above should follow the Patch Tagging Guidelines, please -checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here -are templates for supplementary fields that you might want to add: - -Origin: <vendor|upstream|other>, <url of original patch> -Bug: <url in upstream bugtracker> -Bug-Debian: http://bugs.debian.org/<bugnumber> -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.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 - 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 - diff --git a/debian/patches/gcc-5-build.patch b/debian/patches/gcc-5-build.patch deleted file mode 100644 index 68d1c5d..0000000 --- a/debian/patches/gcc-5-build.patch +++ /dev/null @@ -1,14 +0,0 @@ -Description: Build with gcc 5 -Author: Stephen Kitt <[email protected]> - ---- a/src/init.c -+++ b/src/init.c -@@ -257,7 +257,7 @@ - gadgets_initialized = TRUE; - } - --inline void InitElementSmallImagesScaledUp(int graphic) -+void InitElementSmallImagesScaledUp(int graphic) - { - #if 0 - struct FileInfo *fi = getImageListEntryFromImageID(graphic); diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 4230383..0000000 --- a/debian/patches/series +++ /dev/null @@ -1,4 +0,0 @@ -fix-manpage-errors -fix-shlibdeps-warning -651620-world-writable-dirs.patch -gcc-5-build.patch diff --git a/debian/rules b/debian/rules index 954ab3f..388e06f 100755 --- a/debian/rules +++ b/debian/rules @@ -12,8 +12,8 @@ LEVEL_DIR := /usr/share/games/rocksndiamonds include /usr/share/cdbs/1/rules/debhelper.mk -build/rocksndiamonds:: rocksndiamonds.6 - make RO_GAME_DIR=$(LEVEL_DIR) sdl +build/rocksndiamonds:: + make RO_GAME_DIR=$(LEVEL_DIR) sdl2 install/rocksndiamonds:: set -e; \ @@ -25,12 +25,8 @@ install/rocksndiamonds:: mv rocksndiamonds rocksndiamonds-bin install -m 0755 debian/start_binary.sh rocksndiamonds -rocksndiamonds.6: rocksndiamonds.1 - sed 's/^\.TH ROCKSNDIAMONDS 1L/.TH ROCKSNDIAMONDS 6/' $< > $@ - clean:: make clean - rm -fr rocksndiamonds.6 \ - src/conftime.h rocksndiamonds-bin \ + rm -fr src/conftime.h rocksndiamonds-bin \ debian/postinst debian/preinst debian/prerm debconf-updatepo -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/rocksndiamonds.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
