[xye] branch pristine-tar updated (9775370 -> d4b7e4b)
This is an automated email from the git hooks/post-receive script. skitt pushed a change to branch pristine-tar in repository xye. from 9775370 pristine-tar data for xye_0.12.2+dfsg.orig.tar.gz new d4b7e4b pristine-tar data for xye_0.12.2+dfsg.orig.tar.gz The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: xye_0.12.2+dfsg.orig.tar.gz.delta | Bin 4321 -> 4237 bytes 1 file changed, 0 insertions(+), 0 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/xye.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[xye] 01/01: pristine-tar data for xye_0.12.2+dfsg.orig.tar.gz
This is an automated email from the git hooks/post-receive script. skitt pushed a commit to branch pristine-tar in repository xye. commit d4b7e4b0fcb5885a667cc757154074de91f7e029 Author: Stephen Kitt Date: Sat Mar 31 18:42:02 2018 +0200 pristine-tar data for xye_0.12.2+dfsg.orig.tar.gz --- xye_0.12.2+dfsg.orig.tar.gz.delta | Bin 4321 -> 4237 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/xye_0.12.2+dfsg.orig.tar.gz.delta b/xye_0.12.2+dfsg.orig.tar.gz.delta index b65daba..81dfbcc 100644 Binary files a/xye_0.12.2+dfsg.orig.tar.gz.delta and b/xye_0.12.2+dfsg.orig.tar.gz.delta differ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/xye.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[scummvm] 04/04: Release
This is an automated email from the git hooks/post-receive script. skitt pushed a commit to branch master in repository scummvm. commit 9b6f9d36fb909f0c5ccfdfd5ddad1d0a17d4692f Author: Stephen Kitt Date: Sun Mar 11 22:56:32 2018 +0100 Release --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5653213..b228ed9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -scummvm (2.0.0+dfsg-1) UNRELEASED; urgency=medium +scummvm (2.0.0+dfsg-1) unstable; urgency=medium * New upstream release, merging all patches. Closes: #886317. * Use pkg-config to find FreeType 2. Closes: #892447. @@ -6,7 +6,7 @@ scummvm (2.0.0+dfsg-1) UNRELEASED; urgency=medium DFSG-free. * Add myself as uploader. - -- Stephen Kitt Sat, 10 Mar 2018 20:42:59 +0100 + -- Stephen Kitt Sun, 11 Mar 2018 22:56:27 +0100 scummvm (1.9.0+dfsg-2) unstable; urgency=medium -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/scummvm.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[scummvm] annotated tag debian/2.0.0+dfsg-1 created (now b9b9ada)
This is an automated email from the git hooks/post-receive script. skitt pushed a change to annotated tag debian/2.0.0+dfsg-1 in repository scummvm. at b9b9ada (tag) tagging 9b6f9d36fb909f0c5ccfdfd5ddad1d0a17d4692f (commit) replaces debian/1.9.0+dfsg-2 tagged by Stephen Kitt on Sun Mar 11 22:59:31 2018 +0100 - Log - scummvm Debian release 2.0.0+dfsg-1 -BEGIN PGP SIGNATURE- iQIyBAABCgAdFiEEnPVX/hPLkMoq7x0ggNMC9Yhtg5wFAlqlpsMACgkQgNMC9Yht g5w/Pg/4qh84btxPx3ZIUGLUujYNRJAUXXB6F8dhTf+10SMaDQ7pDYeAgjitAtXa eckCsmCDdkt8nfUW3agKwrBMbzv7QhInnpKOSoezjhG9X4gl067eFLUoIROKGq+y xWPaWnANI5NOy4K5ECTZpCgMSehoUW6mAanl0WUZJ+V9uUenc2si36B1aIU7jRqw ROoonDL3KETfb9wUkAa7ikYuKcAAap3W8FcEj3kfBFB6neu5O3+3M8UaTgGBRlHz B2KBSxDfhzdLgE0GEftd3zVKRF9kfhRVdxWCkDP+ytM2oBuhz/5nH+hyGh5OOxNY gGseAIwr/jggtKg24YdCIL6pwhPRQx+Vh+5rsFIJVTmSktDNUOjv1oEpzWDmxRqH CGrp3Vua6el+mQaOtr4T6Fl9cMcZ6vLo1fTYucHecU693cd6vAchwHDi2l0uWphw IN7dZtJuOMOMksgaOs5M7n1JsWFpGKVDhMQjk9jVmqU2lnXCppT4hPom2vj0KUcz XSgkZyeKrnypffrZS0RIFX2VWSwgGFqdVI661WgPtQcK3pQdDDo0ZPnD/EpWpv7A /J/YcmrCd+JfXKnfuux2ifwLvJXu3LiwUDqP9BK6NUCBRh5EFvM/c/qiheWweF4D cP6BVkMcdN4c5tOyWt/VOB13R7bWXSkdDS4n+1WdeynF6PDG9g== =2tm0 -END PGP SIGNATURE- Stephen Kitt (6): New upstream release Use pkg-config to find FreeType 2 Remove convert_utf.* and disable Wintermute Fix up minor post-upgrade issues in debian/copyright Add myself as uploader Release --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/scummvm.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[scummvm] 03/04: Add myself as uploader
This is an automated email from the git hooks/post-receive script. skitt pushed a commit to branch master in repository scummvm. commit a125369c4c2e7a60ae1aa579f4ede3882093b811 Author: Stephen Kitt Date: Sun Mar 11 21:04:19 2018 +0100 Add myself as uploader --- debian/changelog | 2 +- debian/control | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index d954bed..5653213 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ scummvm (2.0.0+dfsg-1) UNRELEASED; urgency=medium - * Team upload. * New upstream release, merging all patches. Closes: #886317. * Use pkg-config to find FreeType 2. Closes: #892447. * Remove convert_utf.* and disable Wintermute, the files are not DFSG-free. + * Add myself as uploader. -- Stephen Kitt Sat, 10 Mar 2018 20:42:59 +0100 diff --git a/debian/control b/debian/control index aac6f55..b0b1f79 100644 --- a/debian/control +++ b/debian/control @@ -5,6 +5,7 @@ Maintainer: Debian Games Team Uploaders: David Weinehall ,Moritz Muehlenhoff ,Dmitry Smirnov + ,Stephen Kitt Build-Depends: debhelper (>= 9), autotools-dev ,fonts-freefont-ttf ,libasound2-dev [linux-any] -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/scummvm.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[scummvm] branch master updated (91f10d1 -> 9b6f9d3)
This is an automated email from the git hooks/post-receive script. skitt pushed a change to branch master in repository scummvm. from 91f10d1 Use pkg-config to find FreeType 2 new 6fd197d Remove convert_utf.* and disable Wintermute new a856f74 Fix up minor post-upgrade issues in debian/copyright new a125369 Add myself as uploader new 9b6f9d3 Release The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 8 +--- debian/control | 1 + debian/copyright | 25 +++-- debian/rules | 3 ++- 4 files changed, 11 insertions(+), 26 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/scummvm.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[scummvm] 01/04: Remove convert_utf.* and disable Wintermute
This is an automated email from the git hooks/post-receive script. skitt pushed a commit to branch master in repository scummvm. commit 6fd197d0b7a502cf77af6a73d9138e0c69474e99 Author: Stephen Kitt Date: Sun Mar 11 20:56:54 2018 +0100 Remove convert_utf.* and disable Wintermute --- debian/changelog | 2 ++ debian/copyright | 20 +--- debian/rules | 3 ++- 3 files changed, 5 insertions(+), 20 deletions(-) diff --git a/debian/changelog b/debian/changelog index adba45a..d954bed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ scummvm (2.0.0+dfsg-1) UNRELEASED; urgency=medium * Team upload. * New upstream release, merging all patches. Closes: #886317. * Use pkg-config to find FreeType 2. Closes: #892447. + * Remove convert_utf.* and disable Wintermute, the files are not +DFSG-free. -- Stephen Kitt Sat, 10 Mar 2018 20:42:59 +0100 diff --git a/debian/copyright b/debian/copyright index 38071b1..6e69de0 100644 --- a/debian/copyright +++ b/debian/copyright @@ -7,6 +7,7 @@ Comment: then adopted by David Weinehall the 30th Jan 2006, then adopted by the Debian Games Team by Moritz Muehlenhoff Files-Excluded: +engines/wintermute/utils/convert_utf.* gui/themes/fonts/topaz gui/themes/fonts/Arial* */*/*/*/*.o* @@ -214,25 +215,6 @@ Files: engines/sword25/util/lua/* Copyright: 1994-2008 Lua.org, PUC-Rio. License: Expat -Files: engines/wintermute/utils/convert_utf.* -Copyright: 2001-2004 Unicode, Inc. -License: unicode - This source code is provided as is by Unicode, Inc. No claims are - made as to fitness for any particular purpose. No warranties of any - kind are expressed or implied. The recipient agrees to determine - applicability of information provided. If this file has been - purchased on magnetic or optical media from Unicode, Inc., the - sole remedy for any claim will be exchange of defective media - within 90 days of receipt. - . - Limitations on Rights to Redistribute This Code - . - Unicode, Inc. hereby grants the right to freely use the information - supplied in this file in the creation of products supporting the - Unicode Standard, and to make copies of this file in any form - for internal or external distribution as long as this notice - remains attached. - Files: engines/wintermute/utils/crc.* Copyright: 2000 Michael Barr License: public-domain-crc diff --git a/debian/rules b/debian/rules index 4b91a47..bbadd99 100755 --- a/debian/rules +++ b/debian/rules @@ -36,7 +36,8 @@ override_dh_auto_configure: --disable-eventrecorder \ --enable-release \ --enable-verbose-build \ ---prefix=/usr $(OPTARGS) +--prefix=/usr $(OPTARGS) \ + --disable-engine=wintermute FPATH=gui/themes/scummmodern override_dh_auto_build: -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/scummvm.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[scummvm] 02/04: Fix up minor post-upgrade issues in debian/copyright
This is an automated email from the git hooks/post-receive script. skitt pushed a commit to branch master in repository scummvm. commit a856f74a8455a7d113d41aada67c0580601ea4ee Author: Stephen Kitt Date: Sun Mar 11 21:03:10 2018 +0100 Fix up minor post-upgrade issues in debian/copyright --- debian/copyright | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/debian/copyright b/debian/copyright index 6e69de0..8df3b75 100644 --- a/debian/copyright +++ b/debian/copyright @@ -82,7 +82,7 @@ License: LGPL-2.1+ Files: audio/softsynth/mt32/sha1/* Copyright: 2011 Micael Hildenborg -License: BSD-3-clause +License: BSD-3-clause-Hildenborg Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: * Redistributions of source code must retain the above copyright @@ -116,7 +116,7 @@ Files: backends/platform/ds/arm9/source/fat/io_m3_common.* backends/platform/ds/arm9/source/fat/io_njsd.* backends/platform/ds/arm9/source/fat/io_sd_* Copyright: 2006 Michael "Chishm" Chisholm -License: BSD-3-clause +License: BSD-3-clause-Chisholm Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: . @@ -231,7 +231,6 @@ Files: engines/wage/dialog.h engines/wage/entities.cpp engines/wage/entities.h -engines/wage/gui-console.cpp engines/wage/gui.cpp engines/wage/gui.h engines/wage/randomhat.cpp -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/scummvm.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[scummvm] branch master updated (2709edc -> 91f10d1)
This is an automated email from the git hooks/post-receive script. skitt pushed a change to branch master in repository scummvm. from 2709edc Avoid disabling -Wformat, which causes a build failure with GCC 7 new 277916b New upstream release new 91f10d1 Use pkg-config to find FreeType 2 The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 27 --- debian/control| 1 + debian/copyright | 101 +++- debian/patches/disable-arm-asm.patch | 32 debian/patches/freetype2-pkg-config.patch | 124 ++ debian/patches/series | 3 +- debian/patches/wno-format.patch | 22 -- debian/scummvm.lintian-overrides | 2 + 8 files changed, 242 insertions(+), 70 deletions(-) delete mode 100644 debian/patches/disable-arm-asm.patch create mode 100644 debian/patches/freetype2-pkg-config.patch delete mode 100644 debian/patches/wno-format.patch create mode 100644 debian/scummvm.lintian-overrides -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/scummvm.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[scummvm] 02/02: Use pkg-config to find FreeType 2
This is an automated email from the git hooks/post-receive script.
skitt pushed a commit to branch master
in repository scummvm.
commit 91f10d13cb372a523318308f7ee2fd5901418d52
Author: Stephen Kitt
Date: Sat Mar 10 21:44:19 2018 +0100
Use pkg-config to find FreeType 2
---
debian/changelog | 1 +
debian/control| 1 +
debian/patches/freetype2-pkg-config.patch | 124 ++
debian/patches/series | 1 +
4 files changed, 127 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index cca4b30..adba45a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ scummvm (2.0.0+dfsg-1) UNRELEASED; urgency=medium
* Team upload.
* New upstream release, merging all patches. Closes: #886317.
+ * Use pkg-config to find FreeType 2. Closes: #892447.
-- Stephen Kitt Sat, 10 Mar 2018 20:42:59 +0100
diff --git a/debian/control b/debian/control
index a1ffa15..aac6f55 100644
--- a/debian/control
+++ b/debian/control
@@ -21,6 +21,7 @@ Build-Depends: debhelper (>= 9), autotools-dev
,libvorbis-dev
,libz-dev
,nasm [i386]
+ ,pkg-config
,python
,zip
# Cloud integration:
diff --git a/debian/patches/freetype2-pkg-config.patch
b/debian/patches/freetype2-pkg-config.patch
new file mode 100644
index 000..1c75532
--- /dev/null
+++ b/debian/patches/freetype2-pkg-config.patch
@@ -0,0 +1,124 @@
+Description: Use pkg-config to find freetype2
+Author: Stephen Kitt
+
+--- a/configure
b/configure
+@@ -201,7 +201,6 @@
+ _sparklepath=
+ _sdlconfig=sdl2-config
+ _libcurlconfig=curl-config
+-_freetypeconfig=freetype-config
+ _sdlpath="$PATH"
+ _freetypepath="$PATH"
+ _libcurlpath="$PATH"
+@@ -417,40 +416,6 @@
+ }
+
+ #
+-# Determine freetype-config
+-#
+-find_freetypeconfig() {
+- echo_n "Looking for freetype-config... "
+- freetypeconfigs="$_freetypeconfig"
+- _freetypeconfig=
+-
+- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$SEPARATOR"
+- for path_dir in $_freetypepath; do
+- #reset separator to parse freetypeconfigs
+- IFS=":"
+- for freetypeconfig in $freetypeconfigs; do
+- if test -f "$path_dir/$freetypeconfig" ; then
+- _freetypeconfig="$path_dir/$freetypeconfig"
+- echo $_freetypeconfig
+- # Save the prefix
+- _freetypepath=$path_dir
+- if test `basename $path_dir` = bin ; then
+- _freetypepath=`dirname $path_dir`
+- fi
+- # break at first freetype-config found in path
+- break 2
+- fi
+- done
+- done
+-
+- IFS="$ac_save_ifs"
+-
+- if test -z "$_freetypeconfig"; then
+- echo "none found!"
+- fi
+-}
+-
+-#
+ # Determine curl-config
+ #
+ find_libcurlconfig() {
+@@ -4602,30 +4567,13 @@
+ #
+ if test "$_freetype2" != "no"; then
+
+- # Look for the freetype-config script
+- find_freetypeconfig
++ FREETYPE2_LIBS=`pkg-config --libs freetype2`
++ FREETYPE2_CFLAGS=`pkg-config --cflags freetype2`
+
+- if test -z "$_freetypeconfig"; then
++ if test "$_freetype2" = "auto"; then
+ _freetype2=no
+- else
+- # Since 2.3.12, freetype-config prepends $SYSROOT to everything.
+- # This means we can't pass it a --prefix that includes $SYSROOT.
+- freetypeprefix="$_freetypepath"
+- if test -n "$SYSROOT" -a "$SYSROOT" != "/"; then
+- teststring=VeryImplausibleSysrootX1Y2Z3
+- if ( env SYSROOT=/$teststring "$_freetypeconfig"
--cflags | grep $teststring 2> /dev/null > /dev/null ); then
+- echo "Adapting FreeType prefix to SYSROOT" >>
"$TMPLOG"
+- freetypeprefix="${freetypeprefix##$SYSROOT}"
+- fi
+- fi
+-
+- FREETYPE2_LIBS=`$_freetypeconfig --prefix="$freetypeprefix"
--libs`
+- FREETYPE2_CFLAGS=`$_freetypeconfig --prefix="$freetypeprefix"
--cflags`
+-
+- if test "$_freetype2" = "auto"; then
+- _freetype2=no
+
+- cat > $TMPC << EOF
++ cat > $TMPC << EOF
+ #include
+ #include FT_FREETYPE_H
+
+@@ -4636,23 +4584,21 @@
+ }
+ EOF
+
+
[scummvm] 01/02: New upstream release
This is an automated email from the git hooks/post-receive script. skitt pushed a commit to branch master in repository scummvm. commit 277916b3ba344c557ed3e411495286f606e8ac0d Author: Stephen Kitt Date: Sat Mar 10 21:09:17 2018 +0100 New upstream release --- debian/changelog | 26 + debian/copyright | 101 +-- debian/patches/disable-arm-asm.patch | 32 --- debian/patches/series| 2 - debian/patches/wno-format.patch | 22 debian/scummvm.lintian-overrides | 2 + 6 files changed, 115 insertions(+), 70 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8d27a39..cca4b30 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +scummvm (2.0.0+dfsg-1) UNRELEASED; urgency=medium + + * Team upload. + * New upstream release, merging all patches. Closes: #886317. + + -- Stephen Kitt Sat, 10 Mar 2018 20:42:59 +0100 + scummvm (1.9.0+dfsg-2) unstable; urgency=medium * Team upload. @@ -155,7 +162,7 @@ scummvm (1.5.0+dfsg-1) unstable; urgency=low scummvm (1.4.1-1) unstable; urgency=low * New upstream release - * Install translations.dat into scummvm-data + * Install translations.dat into scummvm-data -- Moritz Muehlenhoff Sat, 14 Jan 2012 11:39:15 +0100 @@ -166,7 +173,7 @@ scummvm (1.4.0-1) unstable; urgency=low * Remove Build-Conflicts on liboss-salsa-dev and disable ALSA on kfreebsd (Closes: #647124) * Bump debhelper level to 9, which enables default build flags -and thus hardened compiler flags +and thus hardened compiler flags -- Moritz Muehlenhoff Sat, 05 Nov 2011 10:29:43 +0100 @@ -220,7 +227,7 @@ scummvm (1.2.0-1) unstable; urgency=low * Update to standards version 3.9.1: - Modify asound build dep to linux-any * Unversion several build deps even supported in oldstable - + -- Moritz Muehlenhoff Tue, 12 Oct 2010 21:49:29 +0200 scummvm (1.1.1-1) unstable; urgency=low @@ -228,7 +235,7 @@ scummvm (1.1.1-1) unstable; urgency=low * New upstream release * Switch to bz2 upstream tarball * Disable SCI engine as requested by upstream, it's not yet ready to -replace FreeSCI +replace FreeSCI -- Moritz Muehlenhoff Fri, 07 May 2010 18:57:09 +0200 @@ -280,14 +287,14 @@ scummvm (1.0.0~rc1-1-1) unstable; urgency=low * Remove dh_desktop * Version the dependency on debhelper * Bump Standards-Version to 3.8.1, no changes needed - * Update copyright file + * Update copyright file -- Moritz Muehlenhoff Tue, 01 Sep 2009 22:11:17 +0200 scummvm (0.13.1-1) unstable; urgency=low * New upstream release (Closes: #530863) - * Bump Standards-Version to 3.8.1, add Homepage field + * Bump Standards-Version to 3.8.1, add Homepage field * Bump debhelper level to 7 * Build-depend on ghostscript instead of gs-gpl * Build-depend on texlive-base instead of tetex-bin @@ -301,7 +308,7 @@ scummvm (0.13.0-1) unstable; urgency=low * Move maintainer to Debian Games Team, add myself and David as uploaders * Fix link to compability matrix in package description -(Closes: #508894) +(Closes: #508894) -- Moritz Muehlenhoff Sat, 07 Mar 2009 01:18:12 +0100 @@ -341,7 +348,7 @@ scummvm (0.9.1-1) unstable; urgency=low * New upstream release * debian/prepare: refer to me instead - * debian/copyright: add the date I adopted the package + * debian/copyright: add the date I adopted the package -- David Weinehall Mon, 30 Oct 2006 16:44:12 +0200 @@ -581,7 +588,7 @@ scummvm (0.5.0-1) unstable; urgency=low * Restructure 00buildopts somewhat, to ease future maintenance. * Standards-Version 3.6.0, no changes required. * Revised the description. - * Sponsored by Joey Hess. (Tore fed me all the beer I could take .. + * Sponsored by Joey Hess. (Tore fed me all the beer I could take .. and then asked me to do this. ;-) -- Tore Anderson Fri, 1 Aug 2003 21:45:06 +0200 @@ -702,4 +709,3 @@ scummvm (0.1.0b-1) unstable; urgency=low Ole ! -- Bastien Nocera Fri, 5 Apr 2002 16:37:09 +0100 - diff --git a/debian/copyright b/debian/copyright index bd2068a..38071b1 100644 --- a/debian/copyright +++ b/debian/copyright @@ -14,7 +14,7 @@ Files-Excluded: Files: * Copyright: -2001-2016 The ScummVM Project +2001-2017 The ScummVM Project The ScummVM Team 2002-2011 The DOSBox Team 1994-1998 Revolution Software Ltd. @@ -31,12 +31,79 @@ Comment: See list of copyright holders in "/usr/share/doc/scummvm/COPYRIGHT". See list of upstream authors in "/usr/share/doc/scummvm/AUTHORS". +Files: audio/mods/mod_xm_s3m.* audio/mods/module_mod_xm_s3m.* +Copyright: 2015 Martin Cameron +License: GPL-2+ +Comment: + This code is based on IBXM mod player + . + Copyright (c) 2015, Martin Cameron + All rights reserved. + . + Redistribution and use i
[rocksndiamonds] branch master updated (2564979 -> b64fc8e)
This is an automated email from the git hooks/post-receive script. skitt pushed a change to branch master in repository rocksndiamonds. from 2564979 New upstream release new 935dc9f Update the upstream md5 new b64fc8e Release The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 4 ++-- debian/postinst.in | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/rocksndiamonds.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[rocksndiamonds] 02/02: Release
This is an automated email from the git hooks/post-receive script. skitt pushed a commit to branch master in repository rocksndiamonds. commit b64fc8ed9cd8e2469551192773a60fa07cef4135 Author: Stephen Kitt Date: Sat Mar 3 23:11:30 2018 +0100 Release --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6fc9acc..1f2ef95 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -rocksndiamonds (4.0.1.3+dfsg-1) UNRELEASED; urgency=medium +rocksndiamonds (4.0.1.3+dfsg-1) unstable; urgency=medium * New upstream release. * Switch to debhelper compatibility level 11, with “simple dh” rules instead of cdbs. - -- Stephen Kitt Sat, 10 Feb 2018 22:50:45 +0100 + -- Stephen Kitt Sat, 03 Mar 2018 23:11:20 +0100 rocksndiamonds (4.0.1.0+dfsg-1) unstable; urgency=medium -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/rocksndiamonds.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[rocksndiamonds] annotated tag debian/4.0.1.3+dfsg-1 created (now b71c9f9)
This is an automated email from the git hooks/post-receive script. skitt pushed a change to annotated tag debian/4.0.1.3+dfsg-1 in repository rocksndiamonds. at b71c9f9 (tag) tagging b64fc8ed9cd8e2469551192773a60fa07cef4135 (commit) replaces debian/4.0.1.0+dfsg-1 tagged by Stephen Kitt on Sat Mar 3 23:11:34 2018 +0100 - Log - rocksndiamonds Debian release 4.0.1.3+dfsg-1 -BEGIN PGP SIGNATURE- iQIzBAABCgAdFiEEnPVX/hPLkMoq7x0ggNMC9Yhtg5wFAlqbHZYACgkQgNMC9Yht g5zA1A//UczPrHXDAGOd4qoJ8CGq70PAw3M7cVmRoo+pcCB18s2wWI+RLpWa1Aj8 UH1swLLtKltBtIGVNJShBEXMKNsBDJ0PyOQAP3I5Vc3TkSzPa9D30aaak13GkntX qmITwHGjAb1W5V+mFrsQO8HvBYqROSmq5nsonXQV0O0HC+ojTz1uhJECLL6MV8hI V8t/qyoK6eMnN8XbQqILNZwcq+r090ler2gD8fJfYa+6G9EY1UVkdxNdG82HvY4T fixfJXo1WHnc1+zNYAxqrZd3+F+NXXXWByRWE1IRs7rB55Qz8mgsC4e8nr0WrU1s OfHqzgXUyXlssqQAMTnybCd1eCgUDMPjOAHpq/dMYFEvdolK3YSsVb5da+UuBABQ BCIlNK7pwfr1XM3wrYGL++2NmLpBfw8cJUbc+EPff6YYZqtMmxk29gl6n5ofsKYE F6HO8SgJ3UYHoVEFR5dVLIjWeu1weNkjmFagwA4Zix2JEeZn1PhVIE5o1j4oEhCr SpDXIxzcWPg96eDJ8WQ2FMHQqO6rtpo+t6Q0205LDQ5FZJ3DdNKxBHL+MuxHNr/+ sbu9NHLPXl3GUF5GEo7NO38FzOJ9OeQKuBM5iIMKamC6Mnxup0OoYKs1iueniLh4 BKRmjGQWk+AFWHxqpEhQmFvE5SM0WQZlJERzNDXUB46XfcnxXYg= =iwQY -END PGP SIGNATURE- Stephen Kitt (9): Switch to simple dh rules, compatibility level 11 New upstream version 4.0.1.1+dfsg Merge tag 'upstream/4.0.1.1+dfsg' New upstream release New upstream version 4.0.1.3+dfsg Merge tag 'upstream/4.0.1.3+dfsg' New upstream release Update the upstream md5 Release --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/rocksndiamonds.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[rocksndiamonds] 01/02: Update the upstream md5
This is an automated email from the git hooks/post-receive script.
skitt pushed a commit to branch master
in repository rocksndiamonds.
commit 935dc9fa2fc1962eb9b5f5f556e83ab00b51df89
Author: Stephen Kitt
Date: Sat Mar 3 23:11:00 2018 +0100
Update the upstream md5
---
debian/postinst.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/debian/postinst.in b/debian/postinst.in
index a60b7a7..6ad9017 100644
--- a/debian/postinst.in
+++ b/debian/postinst.in
@@ -18,8 +18,8 @@ our %info=
{
url =>
'http://www.artsoft.org/RELEASES/unix/rocksndiamonds/rocksndiamonds-#VERSION#.tar.gz',
-# Valid for 4.0.1.1
-md5 => '4faf81052a72be616f365fa192dd92c2',
+# Valid for 4.0.1.3
+md5 => '854fa61049215e111d0593b5db5a6176',
topdir => 'rocksndiamonds-#VERSION#',
},
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/collab-maint/rocksndiamonds.git
___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[rocksndiamonds] 01/01: pristine-tar data for rocksndiamonds_4.0.1.3+dfsg.orig.tar.gz
This is an automated email from the git hooks/post-receive script. skitt pushed a commit to branch pristine-tar in repository rocksndiamonds. commit 4bf10671616f2c285ede4f8d33947b69c783848a Author: Stephen Kitt Date: Sat Mar 3 20:37:12 2018 +0100 pristine-tar data for rocksndiamonds_4.0.1.3+dfsg.orig.tar.gz --- rocksndiamonds_4.0.1.3+dfsg.orig.tar.gz.delta | Bin 0 -> 708011 bytes rocksndiamonds_4.0.1.3+dfsg.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/rocksndiamonds_4.0.1.3+dfsg.orig.tar.gz.delta b/rocksndiamonds_4.0.1.3+dfsg.orig.tar.gz.delta new file mode 100644 index 000..08c7c6e Binary files /dev/null and b/rocksndiamonds_4.0.1.3+dfsg.orig.tar.gz.delta differ diff --git a/rocksndiamonds_4.0.1.3+dfsg.orig.tar.gz.id b/rocksndiamonds_4.0.1.3+dfsg.orig.tar.gz.id new file mode 100644 index 000..207b878 --- /dev/null +++ b/rocksndiamonds_4.0.1.3+dfsg.orig.tar.gz.id @@ -0,0 +1 @@ +dd2a3ba62a7e753d4744e4cc7ef5bc8e69f2f0ab -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/rocksndiamonds.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[rocksndiamonds] annotated tag upstream/4.0.1.3+dfsg created (now 038ef18)
This is an automated email from the git hooks/post-receive script. skitt pushed a change to annotated tag upstream/4.0.1.3+dfsg in repository rocksndiamonds. at 038ef18 (tag) tagging c54d805b9acc93225b3080785ebdc97d9d210516 (commit) replaces upstream/4.0.1.1+dfsg tagged by Stephen Kitt on Sat Mar 3 20:37:12 2018 +0100 - Log - Upstream version 4.0.1.3+dfsg Stephen Kitt (1): New upstream version 4.0.1.3+dfsg --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/rocksndiamonds.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[rocksndiamonds] branch upstream updated (0573579 -> c54d805)
This is an automated email from the git hooks/post-receive script. skitt pushed a change to branch upstream in repository rocksndiamonds. from 0573579 New upstream version 4.0.1.1+dfsg new c54d805 New upstream version 4.0.1.3+dfsg The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: src/conftime.h | 2 +- src/files.c | 28 src/game.c | 7 +++ src/game_em/convert.c | 8 ++-- src/game_em/export.h| 1 + src/game_em/graphics.c | 4 src/game_em/input.c | 4 src/game_em/synchro_3.c | 2 +- src/game_sp/main.c | 4 src/init.c | 13 +++-- src/libgame/system.c| 11 +++ src/libgame/system.h| 1 + src/libgame/text.c | 33 + src/main.h | 4 ++-- src/tape.c | 10 +- src/tools.c | 7 --- src/tools.h | 1 - 17 files changed, 103 insertions(+), 37 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/rocksndiamonds.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[rocksndiamonds] 03/03: New upstream release
This is an automated email from the git hooks/post-receive script. skitt pushed a commit to branch master in repository rocksndiamonds. commit 2564979499547871074eb23e95bcd3da82a33d8c Author: Stephen Kitt Date: Sat Mar 3 20:39:33 2018 +0100 New upstream release --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 8b38f89..6fc9acc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -rocksndiamonds (4.0.1.1+dfsg-1) UNRELEASED; urgency=medium +rocksndiamonds (4.0.1.3+dfsg-1) UNRELEASED; urgency=medium * New upstream release. * Switch to debhelper compatibility level 11, with “simple dh” rules -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/rocksndiamonds.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[rocksndiamonds] branch pristine-tar updated (e078042 -> 4bf1067)
This is an automated email from the git hooks/post-receive script. skitt pushed a change to branch pristine-tar in repository rocksndiamonds. from e078042 pristine-tar data for rocksndiamonds_4.0.1.1+dfsg.orig.tar.gz new 4bf1067 pristine-tar data for rocksndiamonds_4.0.1.3+dfsg.orig.tar.gz The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: rocksndiamonds_4.0.1.3+dfsg.orig.tar.gz.delta | Bin 0 -> 708011 bytes rocksndiamonds_4.0.1.3+dfsg.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) create mode 100644 rocksndiamonds_4.0.1.3+dfsg.orig.tar.gz.delta create mode 100644 rocksndiamonds_4.0.1.3+dfsg.orig.tar.gz.id -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/rocksndiamonds.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[rocksndiamonds] branch master updated (c3b0ccf -> 2564979)
This is an automated email from the git hooks/post-receive script. skitt pushed a change to branch master in repository rocksndiamonds. from c3b0ccf New upstream release new c54d805 New upstream version 4.0.1.3+dfsg new b3572b1 Merge tag 'upstream/4.0.1.3+dfsg' new 2564979 New upstream release The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog| 2 +- src/conftime.h | 2 +- src/files.c | 28 src/game.c | 7 +++ src/game_em/convert.c | 8 ++-- src/game_em/export.h| 1 + src/game_em/graphics.c | 4 src/game_em/input.c | 4 src/game_em/synchro_3.c | 2 +- src/game_sp/main.c | 4 src/init.c | 13 +++-- src/libgame/system.c| 11 +++ src/libgame/system.h| 1 + src/libgame/text.c | 33 + src/main.h | 4 ++-- src/tape.c | 10 +- src/tools.c | 7 --- src/tools.h | 1 - 18 files changed, 104 insertions(+), 38 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/rocksndiamonds.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[rocksndiamonds] 02/03: Merge tag 'upstream/4.0.1.3+dfsg'
This is an automated email from the git hooks/post-receive script. skitt pushed a commit to branch master in repository rocksndiamonds. commit b3572b19e6aaeb41171d1913b1fe2df44673c0db Merge: c3b0ccf c54d805 Author: Stephen Kitt Date: Sat Mar 3 20:37:13 2018 +0100 Merge tag 'upstream/4.0.1.3+dfsg' Upstream version 4.0.1.3+dfsg src/conftime.h | 2 +- src/files.c | 28 src/game.c | 7 +++ src/game_em/convert.c | 8 ++-- src/game_em/export.h| 1 + src/game_em/graphics.c | 4 src/game_em/input.c | 4 src/game_em/synchro_3.c | 2 +- src/game_sp/main.c | 4 src/init.c | 13 +++-- src/libgame/system.c| 11 +++ src/libgame/system.h| 1 + src/libgame/text.c | 33 + src/main.h | 4 ++-- src/tape.c | 10 +- src/tools.c | 7 --- src/tools.h | 1 - 17 files changed, 103 insertions(+), 37 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/rocksndiamonds.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[rocksndiamonds] 01/03: New upstream version 4.0.1.3+dfsg
This is an automated email from the git hooks/post-receive script.
skitt pushed a commit to branch master
in repository rocksndiamonds.
commit c54d805b9acc93225b3080785ebdc97d9d210516
Author: Stephen Kitt
Date: Sat Mar 3 20:37:10 2018 +0100
New upstream version 4.0.1.3+dfsg
---
src/conftime.h | 2 +-
src/files.c | 28
src/game.c | 7 +++
src/game_em/convert.c | 8 ++--
src/game_em/export.h| 1 +
src/game_em/graphics.c | 4
src/game_em/input.c | 4
src/game_em/synchro_3.c | 2 +-
src/game_sp/main.c | 4
src/init.c | 13 +++--
src/libgame/system.c| 11 +++
src/libgame/system.h| 1 +
src/libgame/text.c | 33 +
src/main.h | 4 ++--
src/tape.c | 10 +-
src/tools.c | 7 ---
src/tools.h | 1 -
17 files changed, 103 insertions(+), 37 deletions(-)
diff --git a/src/conftime.h b/src/conftime.h
index a4bd598..d8c5a5e 100644
--- a/src/conftime.h
+++ b/src/conftime.h
@@ -1 +1 @@
-#define SOURCE_DATE_STRING "2018-02-03 00:17"
+#define SOURCE_DATE_STRING "2018-02-25 10:16"
diff --git a/src/files.c b/src/files.c
index 6c150ea..85d1712 100644
--- a/src/files.c
+++ b/src/files.c
@@ -3664,7 +3664,8 @@ void CopyNativeLevel_SP_to_RND(struct LevelInfo *level)
{
struct LevelInfo_SP *level_sp = level->native_sp_level;
LevelInfoType *header = &level_sp->header;
- int i, x, y;
+ boolean num_invalid_elements = 0;
+ int i, j, x, y;
level->fieldx = level_sp->width;
level->fieldy = level_sp->height;
@@ -3677,20 +3678,39 @@ void CopyNativeLevel_SP_to_RND(struct LevelInfo *level)
int element_new = getMappedElement(map_element_SP_to_RND(element_old));
if (element_new == EL_UNKNOWN)
- Error(ERR_WARN, "invalid element %d at position %d, %d",
+ {
+ num_invalid_elements++;
+
+ Error(ERR_DEBUG, "invalid element %d at position %d, %d",
element_old, x, y);
+ }
level->field[x][y] = element_new;
}
}
+ if (num_invalid_elements > 0)
+Error(ERR_WARN, "found %d invalid elements%s", num_invalid_elements,
+ (!options.debug ? " (use '--debug' for more details)" : ""));
+
for (i = 0; i < MAX_PLAYERS; i++)
level->initial_player_gravity[i] =
(header->InitialGravity == 1 ? TRUE : FALSE);
+ /* skip leading spaces */
for (i = 0; i < SP_LEVEL_NAME_LEN; i++)
-level->name[i] = header->LevelTitle[i];
- level->name[SP_LEVEL_NAME_LEN] = '\0';
+if (header->LevelTitle[i] != ' ')
+ break;
+
+ /* copy level title */
+ for (j = 0; i < SP_LEVEL_NAME_LEN; i++, j++)
+level->name[j] = header->LevelTitle[i];
+ level->name[j] = '\0';
+
+ /* cut trailing spaces */
+ for (; j > 0; j--)
+if (level->name[j - 1] == ' ' && level->name[j] == '\0')
+ level->name[j - 1] = '\0';
level->gems_needed = header->InfotronsNeeded;
diff --git a/src/game.c b/src/game.c
index a3ad6f1..e159b96 100644
--- a/src/game.c
+++ b/src/game.c
@@ -2702,6 +2702,9 @@ static void InitGameEngine()
game_em.use_single_button =
(game.engine_version > VERSION_IDENT(4,0,0,2));
+ game_em.use_snap_key_bug =
+(game.engine_version < VERSION_IDENT(4,0,1,0));
+
/* -- */
/* set maximal allowed number of custom element changes per game frame */
@@ -4596,6 +4599,10 @@ void InitPlayerGfxAnimation(struct PlayerInfo *player,
int action, int dir)
static void ResetGfxFrame(int x, int y)
{
+ // profiling showed that "autotest" spends 10~20% of its time in this
function
+ if (DrawingDeactivatedField())
+return;
+
int element = Feld[x][y];
int graphic = el_act_dir2img(element, GfxAction[x][y], GfxDir[x][y]);
diff --git a/src/game_em/convert.c b/src/game_em/convert.c
index 086bc7a..cbc7187 100644
--- a/src/game_em/convert.c
+++ b/src/game_em/convert.c
@@ -1107,11 +1107,15 @@ void prepare_em_level(void)
ply[i].joy_stick = ply[i].joy_spin = 0;
}
+ // the following engine variables are initialized to version-specific values
+ // in function InitGameEngine() (src/game.c):
+ //
+ // - game_em.use_single_button (default: TRUE)
+ // - game_em.use_snap_key_bug (default: FALSE)
+
game_em.any_player_moving = FALSE;
game_em.any_player_snapping = FALSE;
- game_em.use_single_button = TRUE;
-
game_em.last_moving_player = 0; /* default: first player */
for (i = 0; i < MAX_PLAYERS; i++)
diff --git a/src/game_em/export.h b/src/game_em/export.h
index 365cafe..69c92d8 100644
--- a/src/game_em/export.h
+++ b/src/game_em/export.h
@@ -
[stella] annotated tag debian/5.1.1-1 created (now 7cfce52)
This is an automated email from the git hooks/post-receive script. skitt pushed a change to annotated tag debian/5.1.1-1 in repository stella. at 7cfce52 (tag) tagging e083046bba6fc9368234c6e1371477e3ec49d9ee (commit) replaces debian/5.1-1 tagged by Stephen Kitt on Fri Feb 23 20:51:52 2018 +0100 - Log - stella Debian release 5.1.1-1 -BEGIN PGP SIGNATURE- iQIzBAABCgAdFiEEnPVX/hPLkMoq7x0ggNMC9Yhtg5wFAlqQcNgACgkQgNMC9Yht g5yr8w//U2H6XbEkjbDgUFt2Q3H7eIsaas4jteFSQaZuJiS5E3fTYlDswFrQ9lWZ facLRLL9DifjGV5nlkTPKFRrD2IAFzQdOHiPDCDt3E17v3mNKcBj+zcB6aZ1lExu dzCXYtTyght7lmdYktfJY96eb1NQPPPUzI+lh+he+M+rSwQAHGeYPVld/73iyKs7 U/7BCWbHcEOEBjCZEaCAZKSZfAcjJRcSu8/+3Yct9e4qDFwhcmN6uhY+LAdyWFxz Xwy7C4l7GHLzoKNEzUvzaD7JTNWfmrPZdBwKwkhhvwagygzNtyvb1pdxQ/DthAUp UuOQjmwuEwoosklQnMIdWhrkg75O7AiVxWA5Di3kQJ36kk66XQo2DFKh8SzW/SSX MuycITUNmFgb2UYvt4Q1yEkfOL5Zmagdf1p5tjYY8ZbX98yINEubV2LN/NcAL0uT eViPQ6cO93qcQChLyUaZVJI1uQZCARYOotBUUjMtPa7wvTRyPNFL6eyfZLmx9eDc tKu1SstNxVBAP4GQV3/agRvlxG93rBm3geiC4qp+v9UWudvygLhlgRcLsFKtxGdh l1IAYzJHtCTCrHv7Xmrny+TpympGmD6uhEb9IGjUQQ/lA4+wI9VCfacQHqTtVi7s asLznzN4nSMDEQhqEuZ5ggZH9D5koLb0aBcUC2l2erVKr7jqiyI= =7Qul -END PGP SIGNATURE- Stephen Kitt (3): New upstream version 5.1.1 Merge tag 'upstream/5.1.1' New upstream release --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/stella.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[stella] 03/03: New upstream release
This is an automated email from the git hooks/post-receive script. skitt pushed a commit to branch master in repository stella. commit e083046bba6fc9368234c6e1371477e3ec49d9ee Author: Stephen Kitt Date: Fri Feb 23 20:50:36 2018 +0100 New upstream release --- debian/changelog | 6 ++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 57ab33c..948d478 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +stella (5.1.1-1) unstable; urgency=medium + + * New upstream release. + + -- Stephen Kitt Fri, 23 Feb 2018 20:50:30 +0100 + stella (5.1-1) unstable; urgency=medium * New upstream release, merging spelling-fixes.patch. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/stella.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[stella] branch master updated (0e150db -> e083046)
This is an automated email from the git hooks/post-receive script. skitt pushed a change to branch master in repository stella. from 0e150db Release new 9655a59 New upstream version 5.1.1 new ba77828 Merge tag 'upstream/5.1.1' new e083046 New upstream release The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: Announce.txt | 22 +++--- Changes.txt | 23 +-- debian/changelog | 6 ++ docs/debugger.html| 2 +- docs/index.html | 2 +- src/common/Version.hxx| 4 ++-- src/debugger/Debugger.cxx | 48 --- src/debugger/Debugger.hxx | 9 - src/unix/stella.spec | 5 - src/windows/stella.rc | 8 10 files changed, 79 insertions(+), 50 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/stella.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[stella] 01/01: pristine-tar data for stella_5.1.1.orig.tar.gz
This is an automated email from the git hooks/post-receive script. skitt pushed a commit to branch pristine-tar in repository stella. commit b709162e7b454f6e8f80549529314a3f2395a175 Author: Stephen Kitt Date: Fri Feb 23 20:44:05 2018 +0100 pristine-tar data for stella_5.1.1.orig.tar.gz --- stella_5.1.1.orig.tar.gz.delta | Bin 0 -> 24936 bytes stella_5.1.1.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/stella_5.1.1.orig.tar.gz.delta b/stella_5.1.1.orig.tar.gz.delta new file mode 100644 index 000..5519cf9 Binary files /dev/null and b/stella_5.1.1.orig.tar.gz.delta differ diff --git a/stella_5.1.1.orig.tar.gz.id b/stella_5.1.1.orig.tar.gz.id new file mode 100644 index 000..342896f --- /dev/null +++ b/stella_5.1.1.orig.tar.gz.id @@ -0,0 +1 @@ +220e74cd9571163134a35f57ff2266c288f82618 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/stella.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[stella] branch pristine-tar updated (a1bf4bb -> b709162)
This is an automated email from the git hooks/post-receive script. skitt pushed a change to branch pristine-tar in repository stella. from a1bf4bb pristine-tar data for stella_5.1.orig.tar.gz new b709162 pristine-tar data for stella_5.1.1.orig.tar.gz The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: stella_5.1.1.orig.tar.gz.delta | Bin 0 -> 24936 bytes stella_5.1.1.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) create mode 100644 stella_5.1.1.orig.tar.gz.delta create mode 100644 stella_5.1.1.orig.tar.gz.id -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/stella.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[stella] annotated tag upstream/5.1.1 created (now 108fa78)
This is an automated email from the git hooks/post-receive script. skitt pushed a change to annotated tag upstream/5.1.1 in repository stella. at 108fa78 (tag) tagging 9655a590ec6530bdb9f9f71e0405fc42846637a1 (commit) replaces upstream/5.1 tagged by Stephen Kitt on Fri Feb 23 20:44:05 2018 +0100 - Log - Upstream version 5.1.1 Stephen Kitt (1): New upstream version 5.1.1 --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/stella.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[stella] branch upstream updated (1ede285 -> 9655a59)
This is an automated email from the git hooks/post-receive script. skitt pushed a change to branch upstream in repository stella. from 1ede285 New upstream version 5.1 new 9655a59 New upstream version 5.1.1 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: Announce.txt | 22 +++--- Changes.txt | 23 +-- debian/changelog | 7 +++ docs/debugger.html| 2 +- docs/index.html | 2 +- src/common/Version.hxx| 4 ++-- src/debugger/Debugger.cxx | 48 --- src/debugger/Debugger.hxx | 9 - src/unix/stella.spec | 5 - src/windows/stella.rc | 8 10 files changed, 80 insertions(+), 50 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/stella.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[stella] 01/03: New upstream version 5.1.1
This is an automated email from the git hooks/post-receive script. skitt pushed a commit to branch master in repository stella. commit 9655a590ec6530bdb9f9f71e0405fc42846637a1 Author: Stephen Kitt Date: Fri Feb 23 20:44:03 2018 +0100 New upstream version 5.1.1 --- Announce.txt | 22 +++--- Changes.txt | 23 +-- debian/changelog | 7 +++ docs/debugger.html| 2 +- docs/index.html | 2 +- src/common/Version.hxx| 4 ++-- src/debugger/Debugger.cxx | 48 --- src/debugger/Debugger.hxx | 9 - src/unix/stella.spec | 5 - src/windows/stella.rc | 8 10 files changed, 80 insertions(+), 50 deletions(-) diff --git a/Announce.txt b/Announce.txt index 0e6c7b8..191408b 100644 --- a/Announce.txt +++ b/Announce.txt @@ -9,7 +9,7 @@ ttt e a === -Release 5.1 for Linux, MacOSX and Windows +Release 5.1.1 for Linux, MacOSX and Windows === The Atari 2600 Video Computer System (VCS), introduced in 1977, was the @@ -21,30 +21,30 @@ all of your favourite Atari 2600 games again! Stella was originally developed for Linux by Bradford W. Mott, however, it has been ported to a number of other platforms and is currently maintained by Stephen Anthony. -This is the 5.1 release of Stella for Linux, Mac OSX and Windows. The +This is the 5.1.1 release of Stella for Linux, Mac OSX and Windows. The distributions currently available are: * Binaries for Windows XP_SP3(*)/Vista/7/8/10 : - Stella-5.1-win32.exe (32-bit EXE installer) - Stella-5.1-x64.exe (64-bit EXE installer) - Stella-5.1-windows.zip (32/64 bit versions) + Stella-5.1.1-win32.exe (32-bit EXE installer) + Stella-5.1.1-x64.exe (64-bit EXE installer) + Stella-5.1.1-windows.zip (32/64 bit versions) (*) Note: Support for Windows XP is problematic on some systems, and will probably be discontinued in a future release. * Binary distribution for MacOS X 10.7 and above : - Stella-5.1-macosx.dmg (64-bit Intel) + Stella-5.1.1-macosx.dmg (64-bit Intel) * Binary distribution in 32-bit & 64-bit Ubuntu DEB format : - stella_5.1-1_i386.deb - stella_5.1-1_amd64.deb + stella_5.1.1-1_i386.deb + stella_5.1.1-1_amd64.deb * Binary distribution in 32-bit & 64-bit RPM format : - stella-5.1-2.i386.rpm - stella-5.1-2.x86_64.rpm + stella-5.1.1-2.i386.rpm + stella-5.1.1-2.x86_64.rpm * Source code distribution for all platforms : - stella-5.1-src.tar.xz + stella-5.1.1-src.tar.xz Distribution Site diff --git a/Changes.txt b/Changes.txt index b38b325..360ac06 100644 --- a/Changes.txt +++ b/Changes.txt @@ -1,3 +1,24 @@ +=== + + tt lll lll +SS SS tt ll ll +SS tt ll ll + tt ee ee ll ll aa +SS tt ee ll ll a -- "An Atari 2600 VCS Emulator" +SS SS tt ee ll ll aa aa + ttt e a + +=== + Release History +=== + +5.1 to 5.1.1: (February 21, 2018) + + * Fixed bug in Stargunner ROM starting with a blank screen. + +-Have fun! + + 5.0.2 to 5.1: (February 4, 2018) * Added "Time Machine" mode, which automatically creates save states @@ -135,8 +156,6 @@ * Updated included PNG library to latest stable version. --Have fun! - 5.0.1 to 5.0.2: (August 20, 2017) diff --git a/debian/changelog b/debian/changelog index 250f3a1..c270555 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +stella (5.1.1-1) stable; urgency=high + + * Version 5.1.1 release + + -- Stephen Anthony Wed, 21 Feb 2018 17:09:59 -0230 + + stella (5.1-1) stable; urgency=high * Version 5.1 release diff --git a/docs/debugger.html b/docs/debugger.html index 6af0123..9fb87cf 100644 --- a/docs/debugger.html +++ b/docs/debugger.html @@ -6,7 +6,7 @@ Stella - Release 5.1 + Release 5.1.1 Integrated Debugger (a work in progress) diff --git a/docs/index.html b/docs/index.html index 8050fca..fbb4834 100644 --- a/docs/index.html +++ b/docs/index.html @@ -10,7 +10,7 @@ A multi-platform Atari 2600 VCS emulator - Release 5.1 + Release 5.1.1 User's Guide diff --git a/src/common/Version.hxx b/src/common/Version.hxx index 6a7e3ac..95c17ca 100644 --- a/src/common/Version.hxx +++ b/src/
[stella] 02/03: Merge tag 'upstream/5.1.1'
This is an automated email from the git hooks/post-receive script. skitt pushed a commit to branch master in repository stella. commit ba778283c8168276e8276f12baf8f29dd294090d Merge: 0e150db 9655a59 Author: Stephen Kitt Date: Fri Feb 23 20:44:35 2018 +0100 Merge tag 'upstream/5.1.1' Upstream version 5.1.1 Announce.txt | 22 +++--- Changes.txt | 23 +-- docs/debugger.html| 2 +- docs/index.html | 2 +- src/common/Version.hxx| 4 ++-- src/debugger/Debugger.cxx | 48 --- src/debugger/Debugger.hxx | 9 - src/unix/stella.spec | 5 - src/windows/stella.rc | 8 9 files changed, 73 insertions(+), 50 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/stella.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[rocksndiamonds] 03/04: Merge tag 'upstream/4.0.1.1+dfsg'
This is an automated email from the git hooks/post-receive script. skitt pushed a commit to branch master in repository rocksndiamonds. commit 0bc2de7e45a0ca571f59c5ae2f0a3e638851e71f Merge: cabc4e0 0573579 Author: Stephen Kitt Date: Sat Feb 10 22:46:13 2018 +0100 Merge tag 'upstream/4.0.1.1+dfsg' Upstream version 4.0.1.1+dfsg src/anim.c | 43 +++--- src/config.c | 26 -- src/config.h | 1 + src/conftime.h | 2 +- src/editor.c | 2 + src/events.c | 47 ++- src/files.c | 178 +-- src/files.h | 2 + src/game.c | 51 ++-- src/game_sp/export.h | 4 + src/game_sp/file.c | 10 ++- src/init.c | 9 +- src/libgame/misc.c | 6 ++ src/libgame/sdl.c| 2 +- src/libgame/sdl.h| 8 +- src/libgame/sound.c | 79 +- src/libgame/sound.h | 1 + src/libgame/system.c | 35 ++-- src/libgame/system.h | 11 ++- src/main.c | 29 +-- src/main.h | 4 +- src/screens.c| 230 ++- src/tape.c | 82 +++--- src/tape.h | 1 + src/tools.c | 63 ++ 25 files changed, 560 insertions(+), 366 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/rocksndiamonds.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[rocksndiamonds] 01/01: pristine-tar data for rocksndiamonds_4.0.1.1+dfsg.orig.tar.gz
This is an automated email from the git hooks/post-receive script. skitt pushed a commit to branch pristine-tar in repository rocksndiamonds. commit e078042ac31d0c3df9b3d6fb346667d233689550 Author: Stephen Kitt Date: Sat Feb 10 22:46:13 2018 +0100 pristine-tar data for rocksndiamonds_4.0.1.1+dfsg.orig.tar.gz --- rocksndiamonds_4.0.1.1+dfsg.orig.tar.gz.delta | Bin 0 -> 710076 bytes rocksndiamonds_4.0.1.1+dfsg.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/rocksndiamonds_4.0.1.1+dfsg.orig.tar.gz.delta b/rocksndiamonds_4.0.1.1+dfsg.orig.tar.gz.delta new file mode 100644 index 000..284746b Binary files /dev/null and b/rocksndiamonds_4.0.1.1+dfsg.orig.tar.gz.delta differ diff --git a/rocksndiamonds_4.0.1.1+dfsg.orig.tar.gz.id b/rocksndiamonds_4.0.1.1+dfsg.orig.tar.gz.id new file mode 100644 index 000..c17366d --- /dev/null +++ b/rocksndiamonds_4.0.1.1+dfsg.orig.tar.gz.id @@ -0,0 +1 @@ +b6d68df7a17544db8b72d1a5076c339d1c4752f1 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/rocksndiamonds.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[rocksndiamonds] branch pristine-tar updated (3ef5c4f -> e078042)
This is an automated email from the git hooks/post-receive script. skitt pushed a change to branch pristine-tar in repository rocksndiamonds. from 3ef5c4f pristine-tar data for rocksndiamonds_4.0.1.0+dfsg.orig.tar.gz new e078042 pristine-tar data for rocksndiamonds_4.0.1.1+dfsg.orig.tar.gz The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: rocksndiamonds_4.0.1.1+dfsg.orig.tar.gz.delta | Bin 0 -> 710076 bytes rocksndiamonds_4.0.1.1+dfsg.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) create mode 100644 rocksndiamonds_4.0.1.1+dfsg.orig.tar.gz.delta create mode 100644 rocksndiamonds_4.0.1.1+dfsg.orig.tar.gz.id -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/rocksndiamonds.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[rocksndiamonds] branch upstream updated (92f36cc -> 0573579)
This is an automated email from the git hooks/post-receive script. skitt pushed a change to branch upstream in repository rocksndiamonds. from 92f36cc New upstream version 4.0.1.0+dfsg new 0573579 New upstream version 4.0.1.1+dfsg The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: src/anim.c | 43 +++--- src/config.c | 26 -- src/config.h | 1 + src/conftime.h | 2 +- src/editor.c | 2 + src/events.c | 47 ++- src/files.c | 178 +-- src/files.h | 2 + src/game.c | 51 ++-- src/game_sp/export.h | 4 + src/game_sp/file.c | 10 ++- src/init.c | 9 +- src/libgame/misc.c | 6 ++ src/libgame/sdl.c| 2 +- src/libgame/sdl.h| 8 +- src/libgame/sound.c | 79 +- src/libgame/sound.h | 1 + src/libgame/system.c | 35 ++-- src/libgame/system.h | 11 ++- src/main.c | 29 +-- src/main.h | 4 +- src/screens.c| 230 ++- src/tape.c | 82 +++--- src/tape.h | 1 + src/tools.c | 63 ++ 25 files changed, 560 insertions(+), 366 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/rocksndiamonds.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[rocksndiamonds] annotated tag upstream/4.0.1.1+dfsg created (now 7e4cdbc)
This is an automated email from the git hooks/post-receive script. skitt pushed a change to annotated tag upstream/4.0.1.1+dfsg in repository rocksndiamonds. at 7e4cdbc (tag) tagging 0573579071444f3af95b18a53a6b58eba1821138 (commit) replaces upstream/4.0.1.0+dfsg tagged by Stephen Kitt on Sat Feb 10 22:46:13 2018 +0100 - Log - Upstream version 4.0.1.1+dfsg Stephen Kitt (1): New upstream version 4.0.1.1+dfsg --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/rocksndiamonds.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[rocksndiamonds] 02/04: New upstream version 4.0.1.1+dfsg
This is an automated email from the git hooks/post-receive script.
skitt pushed a commit to branch master
in repository rocksndiamonds.
commit 0573579071444f3af95b18a53a6b58eba1821138
Author: Stephen Kitt
Date: Sat Feb 10 22:46:11 2018 +0100
New upstream version 4.0.1.1+dfsg
---
src/anim.c | 43 +++---
src/config.c | 26 --
src/config.h | 1 +
src/conftime.h | 2 +-
src/editor.c | 2 +
src/events.c | 47 ++-
src/files.c | 178 +--
src/files.h | 2 +
src/game.c | 51 ++--
src/game_sp/export.h | 4 +
src/game_sp/file.c | 10 ++-
src/init.c | 9 +-
src/libgame/misc.c | 6 ++
src/libgame/sdl.c| 2 +-
src/libgame/sdl.h| 8 +-
src/libgame/sound.c | 79 +-
src/libgame/sound.h | 1 +
src/libgame/system.c | 35 ++--
src/libgame/system.h | 11 ++-
src/main.c | 29 +--
src/main.h | 4 +-
src/screens.c| 230 ++-
src/tape.c | 82 +++---
src/tape.h | 1 +
src/tools.c | 63 ++
25 files changed, 560 insertions(+), 366 deletions(-)
diff --git a/src/anim.c b/src/anim.c
index 37c7193..7060016 100644
--- a/src/anim.c
+++ b/src/anim.c
@@ -206,6 +206,7 @@ static unsigned int anim_sync_frame = 0;
static int game_mode_anim_classes[NUM_GAME_MODES];
static int anim_class_game_modes[NUM_ANIM_CLASSES];
+static int anim_status_last_before_fading = GAME_MODE_DEFAULT;
static int anim_status_last = GAME_MODE_DEFAULT;
static int anim_classes_last = ANIM_CLASS_NONE;
@@ -560,6 +561,7 @@ void InitGlobalAnimControls()
anim_class_game_modes[anim_class_game_modes_list[i].class_bit] =
anim_class_game_modes_list[i].game_mode;
+ anim_status_last_before_fading = GAME_MODE_LOADING;
anim_status_last = GAME_MODE_LOADING;
anim_classes_last = ANIM_CLASS_NONE;
}
@@ -598,15 +600,23 @@ void DrawGlobalAnimationsExt(int drawing_target, int
drawing_stage)
if (drawing_target == DRAW_TO_FADE_TARGET)
after_fading = TRUE;
+// special case: changing from/to this screen is done without fading
+if (global.anim_status == GAME_MODE_PSEUDO_TYPENAME ||
+ anim_status_last == GAME_MODE_PSEUDO_TYPENAME)
+ after_fading = TRUE;
+
// -- part 1 --
// start or stop global animations by change of game mode
// (special handling of animations for "current screen" and "all screens")
-// stop animations for last screen
-game_mode_anim_action[anim_status_last] = ANIM_STOP;
+if (global.anim_status_next != anim_status_last_before_fading)
+{
+ // stop animations for last screen before fading to new screen
+ game_mode_anim_action[anim_status_last] = ANIM_STOP;
-// start animations for current screen
-game_mode_anim_action[global.anim_status] = ANIM_START;
+ // start animations for current screen after fading to new screen
+ game_mode_anim_action[global.anim_status] = ANIM_START;
+}
// start animations for all screens after loading new artwork set
if (anim_status_last == GAME_MODE_LOADING)
@@ -635,7 +645,10 @@ void DrawGlobalAnimationsExt(int drawing_target, int
drawing_stage)
if (drawing_target == DRAW_TO_SCREEN)
{
if (after_fading)
+ {
anim_classes_last = anim_classes_next;
+ anim_status_last_before_fading = global.anim_status;
+ }
anim_status_last = global.anim_status;
@@ -1452,6 +1465,7 @@ static void InitGlobalAnim_Clickable()
static boolean InitGlobalAnim_Clicked(int mx, int my, boolean clicked)
{
+ boolean anything_clicked = FALSE;
boolean any_part_clicked = FALSE;
int mode_nr;
@@ -1460,12 +1474,14 @@ static boolean InitGlobalAnim_Clicked(int mx, int my,
boolean clicked)
struct GlobalAnimControlInfo *ctrl = &global_anim_ctrl[mode_nr];
int anim_nr;
-for (anim_nr = 0; anim_nr < ctrl->num_anims; anim_nr++)
+// check animations in reverse draw order (to stop when clicked)
+for (anim_nr = ctrl->num_anims - 1; anim_nr >= 0; anim_nr--)
{
struct GlobalAnimMainControlInfo *anim = &ctrl->anim[anim_nr];
int part_nr;
- for (part_nr = 0; part_nr < anim->num_parts_all; part_nr++)
+ // check animation parts in reverse draw order (to stop when clicked)
+ for (part_nr = anim->num_parts_all - 1; part_nr >= 0; part_nr--)
{
struct GlobalAnimPartControlInfo *part = &anim->part[part_nr];
@@ -1479,8 +1495,13 @@ static boolean InitGlobalAnim_Clicked(int mx, int my,
boolean clicked)
if (!part->clickable)
continue;
+ // always handle "any" click events (clicking anywhere on screen) ...
if (isClickablePa
[rocksndiamonds] branch master updated (da993e6 -> c3b0ccf)
This is an automated email from the git hooks/post-receive script. skitt pushed a change to branch master in repository rocksndiamonds. from da993e6 Release new cabc4e0 Switch to simple dh rules, compatibility level 11 new 0573579 New upstream version 4.0.1.1+dfsg new 0bc2de7 Merge tag 'upstream/4.0.1.1+dfsg' new c3b0ccf New upstream release The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 14 +++- debian/compat| 2 +- debian/control | 3 +- debian/docs | 1 + debian/postinst.in | 4 +- debian/rules | 12 +-- src/anim.c | 43 +++--- src/config.c | 26 -- src/config.h | 1 + src/conftime.h | 2 +- src/editor.c | 2 + src/events.c | 47 ++- src/files.c | 178 +-- src/files.h | 2 + src/game.c | 51 ++-- src/game_sp/export.h | 4 + src/game_sp/file.c | 10 ++- src/init.c | 9 +- src/libgame/misc.c | 6 ++ src/libgame/sdl.c| 2 +- src/libgame/sdl.h| 8 +- src/libgame/sound.c | 79 +- src/libgame/sound.h | 1 + src/libgame/system.c | 35 ++-- src/libgame/system.h | 11 ++- src/main.c | 29 +-- src/main.h | 4 +- src/screens.c| 230 ++- src/tape.c | 82 +++--- src/tape.h | 1 + src/tools.c | 63 ++ 31 files changed, 583 insertions(+), 379 deletions(-) create mode 100644 debian/docs -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/rocksndiamonds.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[rocksndiamonds] 04/04: New upstream release
This is an automated email from the git hooks/post-receive script.
skitt pushed a commit to branch master
in repository rocksndiamonds.
commit c3b0ccf5aa58102a08885e3f774a0f138f273095
Author: Stephen Kitt
Date: Sat Feb 10 22:55:50 2018 +0100
New upstream release
---
debian/changelog | 5 +++--
debian/postinst.in | 4 ++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 1623263..8b38f89 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
-rocksndiamonds (4.0.1.0+dfsg-2) UNRELEASED; urgency=medium
+rocksndiamonds (4.0.1.1+dfsg-1) UNRELEASED; urgency=medium
+ * New upstream release.
* Switch to debhelper compatibility level 11, with “simple dh” rules
instead of cdbs.
- -- Stephen Kitt Mon, 15 Jan 2018 08:46:17 +0100
+ -- Stephen Kitt Sat, 10 Feb 2018 22:50:45 +0100
rocksndiamonds (4.0.1.0+dfsg-1) unstable; urgency=medium
diff --git a/debian/postinst.in b/debian/postinst.in
index cc0138d..a60b7a7 100644
--- a/debian/postinst.in
+++ b/debian/postinst.in
@@ -18,8 +18,8 @@ our %info=
{
url =>
'http://www.artsoft.org/RELEASES/unix/rocksndiamonds/rocksndiamonds-#VERSION#.tar.gz',
-# Valid for 4.0.1.0
-md5 => '30bf2a4edc30dace56997221a84d7097',
+# Valid for 4.0.1.1
+md5 => '4faf81052a72be616f365fa192dd92c2',
topdir => 'rocksndiamonds-#VERSION#',
},
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/collab-maint/rocksndiamonds.git
___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[rocksndiamonds] 01/04: Switch to simple dh rules, compatibility level 11
This is an automated email from the git hooks/post-receive script. skitt pushed a commit to branch master in repository rocksndiamonds. commit cabc4e09cc9cb5174daae631d2f9cfb8cbf47ed4 Author: Stephen Kitt Date: Sat Feb 10 22:45:19 2018 +0100 Switch to simple dh rules, compatibility level 11 --- debian/changelog | 13 ++--- debian/compat| 2 +- debian/control | 3 +-- debian/docs | 1 + debian/rules | 12 +++- 5 files changed, 20 insertions(+), 11 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9250455..1623263 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +rocksndiamonds (4.0.1.0+dfsg-2) UNRELEASED; urgency=medium + + * Switch to debhelper compatibility level 11, with “simple dh” rules +instead of cdbs. + + -- Stephen Kitt Mon, 15 Jan 2018 08:46:17 +0100 + rocksndiamonds (4.0.1.0+dfsg-1) unstable; urgency=medium * New upstream release. @@ -267,7 +274,7 @@ rocksndiamonds (3.2.4+dfsg-1) unstable; urgency=low rocksndiamonds (3.2.3-4) unstable; urgency=low - * Added Portuguese translation for debconf messages, thanks + * Added Portuguese translation for debconf messages, thanks Américo Monteiro , closes: #437285. * Added debian/watch file. @@ -282,7 +289,7 @@ rocksndiamonds (3.2.3-3) unstable; urgency=low rocksndiamonds (3.2.3-2) unstable; urgency=low - * Added Spanish language (closes: #419240), thanks + * Added Spanish language (closes: #419240), thanks '"Enrique Matías Sánchez (Quique)" '. -- Dmitry E. Oboukhov Sat, 14 Apr 2007 20:30:10 +0400 @@ -309,7 +316,7 @@ rocksndiamonds (3.2.2-12) unstable; urgency=low * Fix conflict with rocks-n-diamonds (closes: #405909); * Fix debconf-template (closes: #405889); - * Added Swedish language for debconf dialogs, + * Added Swedish language for debconf dialogs, thanks 'Daniel Nylander '; * Added Czech language for debconf dialogs, thanks 'Miroslav Kure ' (closes: #405939). diff --git a/debian/compat b/debian/compat index f599e28..b4de394 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -10 +11 diff --git a/debian/control b/debian/control index 958fd53..3b02025 100644 --- a/debian/control +++ b/debian/control @@ -3,8 +3,7 @@ Maintainer: Debian Games Team Uploaders: Dmitry E. Oboukhov , Stephen Kitt Section: contrib/games Priority: optional -Build-Depends: debhelper (>= 10), - cdbs, +Build-Depends: debhelper (>= 11~), po-debconf, libsdl2-dev, libsdl2-image-dev, diff --git a/debian/docs b/debian/docs new file mode 100644 index 000..168e5d2 --- /dev/null +++ b/debian/docs @@ -0,0 +1 @@ +CREDITS diff --git a/debian/rules b/debian/rules index a600b34..9b94ea7 100755 --- a/debian/rules +++ b/debian/rules @@ -3,17 +3,19 @@ DPKG_EXPORT_BUILDFLAGS = 1 export DEB_BUILD_MAINT_OPTIONS=harderning=+all -include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/dpkg/pkg-info.mk include /usr/share/dpkg/buildflags.mk UPSTREAM_VERSION := $(shell echo $(DEB_VERSION_UPSTREAM) | sed 's/+.*//') LEVEL_DIR := /usr/share/games/rocksndiamonds -build/rocksndiamonds:: - make RO_GAME_DIR=$(LEVEL_DIR) sdl2 +%: + dh $@ -install/rocksndiamonds:: +override_dh_auto_build: + dh_auto_build -- RO_GAME_DIR=$(LEVEL_DIR) sdl2 + +override_dh_auto_install: set -e; \ for file in postinst preinst prerm; do \ cp debian/$$file.in debian/$$file; \ @@ -23,7 +25,7 @@ install/rocksndiamonds:: mv rocksndiamonds rocksndiamonds-bin install -m 0755 debian/start_binary.sh rocksndiamonds -clean:: +override_dh_auto_clean: make clean rm -fr src/conftime.h rocksndiamonds-bin \ debian/postinst debian/preinst debian/prerm -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/rocksndiamonds.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[gweled] branch debian/sid created (now 48d2911)
This is an automated email from the git hooks/post-receive script. skitt pushed a change to branch debian/sid in repository gweled. at 48d2911 Release No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/gweled.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[gweled] 07/07: Release
This is an automated email from the git hooks/post-receive script. skitt pushed a commit to branch debian-sid in repository gweled. commit 48d2911adf669a34bc5d8e3d372adece2f88c6c5 Author: Stephen Kitt Date: Fri Feb 9 09:43:45 2018 +0100 Release --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index b06acf9..d65f10e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -gweled (0.9.1-5) UNRELEASED; urgency=medium +gweled (0.9.1-5) unstable; urgency=medium * Cope with librsvg’s new behaviour by always using URIs instead of paths. (Closes: #889688.) @@ -10,7 +10,7 @@ gweled (0.9.1-5) UNRELEASED; urgency=medium instead of using dpkg-statoverride. * Standards-Version 4.1.3, no further change required. - -- Stephen Kitt Fri, 09 Feb 2018 09:02:48 +0100 + -- Stephen Kitt Fri, 09 Feb 2018 09:43:43 +0100 gweled (0.9.1-4) unstable; urgency=medium -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/gweled.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[gweled] 02/07: Add a missing function declaration
This is an automated email from the git hooks/post-receive script.
skitt pushed a commit to branch debian-sid
in repository gweled.
commit ebbba797a5d88a3ee30cef949b411a34f0f15f0c
Author: Stephen Kitt
Date: Fri Feb 9 09:06:48 2018 +0100
Add a missing function declaration
---
debian/changelog | 1 +
debian/patches/008-board-engine-declaration.patch | 14 ++
debian/patches/series | 1 +
3 files changed, 16 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 37926b6..93c52b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ gweled (0.9.1-5) UNRELEASED; urgency=medium
* Cope with librsvg’s new behaviour by always using URIs instead of
paths. (Closes: #889688.)
+ * Add a missing function declaration.
-- Stephen Kitt Fri, 09 Feb 2018 09:02:48 +0100
diff --git a/debian/patches/008-board-engine-declaration.patch
b/debian/patches/008-board-engine-declaration.patch
new file mode 100644
index 000..14119cf
--- /dev/null
+++ b/debian/patches/008-board-engine-declaration.patch
@@ -0,0 +1,14 @@
+Description: Add missing init_pref_window declaration
+Author: Stephen Kitt
+
+--- a/src/board_engine.c
b/src/board_engine.c
+@@ -979,6 +979,8 @@
+ return game;
+ }
+
++extern void init_pref_window(void);
++
+ void gweled_set_previous_game(GweledGameState game)
+ {
+ gchar *text_buffer;
diff --git a/debian/patches/series b/debian/patches/series
index d8c19d8..4a320c4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
005-continue-endless-timed-modes.patch
006-spelling-fixes.patch
007-rsvg-uri.patch
+008-board-engine-declaration.patch
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/gweled.git
___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[gweled] 06/07: Standards-Version 4.1.3
This is an automated email from the git hooks/post-receive script. skitt pushed a commit to branch debian-sid in repository gweled. commit ce2cd68c7f4bda397e1fd9e88f11d639206bce1d Author: Stephen Kitt Date: Fri Feb 9 09:40:05 2018 +0100 Standards-Version 4.1.3 --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index ee9bde2..b06acf9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ gweled (0.9.1-5) UNRELEASED; urgency=medium package can build multiple times in a row. * Ship /usr/games/gweled with the desired ownership and permissions, instead of using dpkg-statoverride. + * Standards-Version 4.1.3, no further change required. -- Stephen Kitt Fri, 09 Feb 2018 09:02:48 +0100 diff --git a/debian/control b/debian/control index da9f4cc..54ad2d1 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,7 @@ Build-Depends: debhelper (>= 11~), libgtk2.0-dev, libmikmod-dev, librsvg2-dev, -Standards-Version: 3.9.8 +Standards-Version: 4.1.3 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-games/gweled.git Vcs-Git: https://anonscm.debian.org/git/pkg-games/gweled.git Homepage: http://gweled.org/ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/gweled.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[gweled] 05/07: Ship /usr/games/gweled with the desired ownership and permissions
This is an automated email from the git hooks/post-receive script.
skitt pushed a commit to branch debian-sid
in repository gweled.
commit d4c057aaff94104cb059bba7ef341ef71f4f47d4
Author: Stephen Kitt
Date: Fri Feb 9 09:39:29 2018 +0100
Ship /usr/games/gweled with the desired ownership and permissions
---
debian/changelog | 2 ++
debian/control | 2 ++
debian/postinst | 6 --
debian/rules | 5 +
4 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index afdd6a5..ee9bde2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ gweled (0.9.1-5) UNRELEASED; urgency=medium
* Document old patches.
* Switch to debhelper compatibility 11, and adjust patches so the
package can build multiple times in a row.
+ * Ship /usr/games/gweled with the desired ownership and permissions,
+instead of using dpkg-statoverride.
-- Stephen Kitt Fri, 09 Feb 2018 09:02:48 +0100
diff --git a/debian/control b/debian/control
index 7932bfe..da9f4cc 100644
--- a/debian/control
+++ b/debian/control
@@ -3,6 +3,8 @@ Maintainer: Debian Games Team
Uploaders: Stephen Kitt
Section: games
Priority: optional
+# We need root for dh_fixperms
+Rules-Requires-Root: binary-targets
Build-Depends: debhelper (>= 11~),
intltool,
libgtk2.0-dev,
diff --git a/debian/postinst b/debian/postinst
index 55f25af..b28e237 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -32,8 +32,10 @@ case "$1" in
chmod 664 /var/games/gweled.${scorefile}.scores;
done
- dpkg-statoverride --remove /usr/games/gweled >/dev/null 2>&1 || true
- dpkg-statoverride --update --add root games 02755 /usr/games/gweled
+ # The package used to install an override
+ if [ "$(sudo dpkg-statoverride --list /usr/games/gweled)" = "root games
2755 /usr/games/gweled" ]; then
+ dpkg-statoverride --remove /usr/games/gweled
+ fi
;;
abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/debian/rules b/debian/rules
index 0923d8b..d9a0e51 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,3 +16,8 @@ override_dh_auto_configure:
override_dh_auto_install:
dh_auto_install
rm -rf $(CURDIR)/debian/gweled/var/games/*
+
+override_dh_fixperms:
+ dh_fixperms
+ chown root:games debian/gweled/usr/games/gweled
+ chmod 02755 debian/gweled/usr/games/gweled
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/gweled.git
___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[gweled] 04/07: Switch to debhelper compatibility level 11
This is an automated email from the git hooks/post-receive script.
skitt pushed a commit to branch debian-sid
in repository gweled.
commit 7c14fcdada89b6d7ebf83d3bbc7536f9566a601a
Author: Stephen Kitt
Date: Fri Feb 9 09:23:41 2018 +0100
Switch to debhelper compatibility level 11
---
debian/changelog | 2 ++
debian/compat | 2 +-
debian/control | 3 +-
debian/patches/004-use-pkg-config-for-mikmod.patch | 13 ---
.../patches/005-continue-endless-timed-modes.patch | 41 --
debian/rules | 2 +-
6 files changed, 5 insertions(+), 58 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 12a4021..afdd6a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ gweled (0.9.1-5) UNRELEASED; urgency=medium
paths. (Closes: #889688.)
* Add a missing function declaration.
* Document old patches.
+ * Switch to debhelper compatibility 11, and adjust patches so the
+package can build multiple times in a row.
-- Stephen Kitt Fri, 09 Feb 2018 09:02:48 +0100
diff --git a/debian/compat b/debian/compat
index ec63514..b4de394 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+11
diff --git a/debian/control b/debian/control
index 1da716a..7932bfe 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,7 @@ Maintainer: Debian Games Team
Uploaders: Stephen Kitt
Section: games
Priority: optional
-Build-Depends: debhelper (>= 9),
- dh-autoreconf,
+Build-Depends: debhelper (>= 11~),
intltool,
libgtk2.0-dev,
libmikmod-dev,
diff --git a/debian/patches/004-use-pkg-config-for-mikmod.patch
b/debian/patches/004-use-pkg-config-for-mikmod.patch
index 92a95b2..b872625 100644
--- a/debian/patches/004-use-pkg-config-for-mikmod.patch
+++ b/debian/patches/004-use-pkg-config-for-mikmod.patch
@@ -19,19 +19,6 @@ Author: Stephen Kitt
AC_CHECK_HEADER(pthread.h, [],
AC_MSG_ERROR([*** Cannot find pthread.h header]))
a/Makefile.in
-+++ b/Makefile.in
-@@ -176,8 +176,8 @@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
--MIKMOD_CFLAGS = @MIKMOD_CFLAGS@
--MIKMOD_LIBS = @MIKMOD_LIBS@
-+MIKMOD_CFLAGS = @libmikmod_CFLAGS@
-+MIKMOD_LIBS = @libmikmod_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- MSGFMT = @MSGFMT@
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,7 +9,7 @@
diff --git a/debian/patches/005-continue-endless-timed-modes.patch
b/debian/patches/005-continue-endless-timed-modes.patch
index 1e8943c..f3ab8a3 100644
--- a/debian/patches/005-continue-endless-timed-modes.patch
+++ b/debian/patches/005-continue-endless-timed-modes.patch
@@ -4,47 +4,6 @@ Origin:
http://bazaar.launchpad.net/~dnax88/gweled/trunk/revision/86
Origin: http://bazaar.launchpad.net/~dnax88/gweled/trunk/revision/87
Origin: http://bazaar.launchpad.net/~dnax88/gweled/trunk/revision/88
a/po/gweled.pot
-+++ b/po/gweled.pot
-@@ -8,7 +8,7 @@
- msgstr ""
- "Project-Id-Version: PACKAGE VERSION\n"
- "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2011-03-31 00:33+0200\n"
-+"POT-Creation-Date: 2011-10-31 11:05+0100\n"
- "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
- "Last-Translator: FULL NAME \n"
- "Language-Team: LANGUAGE \n"
-@@ -60,15 +60,15 @@
- msgstr ""
-
- #: ../src/main.c:397
--msgid "Get as many point as you can. The game ends if you out of moves."
-+msgid "Get as many points as you can. The game ends if you run out of moves."
- msgstr ""
-
- #: ../src/main.c:399
--msgid "Get as many points as you can, but you are limited on time."
-+msgid "Get as many points as you can. The game ends if you run out of time."
- msgstr ""
-
- #: ../src/main.c:401
--msgid "Game will never end. Your scores will not be registered."
-+msgid "The game never ends, but your score will not be saved."
- msgstr ""
-
- #: ../src/main.c:461
-@@ -103,8 +103,8 @@
- msgid "_Pause"
- msgstr ""
-
--#: ../src/board_engine.c:829 ../src/board_engine.c:902
--#: ../src/board_engine.c:1004
-+#: ../src/board_engine.c:830 ../src/board_engine.c:903
-+#: ../src/board_engine.c:1005
- #, c-format
- msgid "Level %d"
- msgstr ""
--- a/src/board_engine.c
+++ b/src/board_engine.c
@@ -764,7 +764,7 @@
diff --git a/debian/rules b/debian/rules
index 3a37c22..0923d8b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,7 @@ export DH_OPTIONS
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
%:
- dh $@ --with autoreconf
+ dh $@
override_dh_auto_configure:
dh_auto_configure -- --bindir=\$${prefix}/games --localstatedir=/var
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/gweled.git
___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[gweled] annotated tag debian/0.9.1-5 created (now 2b4b462)
This is an automated email from the git hooks/post-receive script. skitt pushed a change to annotated tag debian/0.9.1-5 in repository gweled. at 2b4b462 (tag) tagging 48d2911adf669a34bc5d8e3d372adece2f88c6c5 (commit) replaces debian/0.9.1-4 tagged by Stephen Kitt on Fri Feb 9 09:43:50 2018 +0100 - Log - gweled Debian release 0.9.1-5 -BEGIN PGP SIGNATURE- iQIzBAABCgAdFiEEnPVX/hPLkMoq7x0ggNMC9Yhtg5wFAlp9X0YACgkQgNMC9Yht g5yr2g/+KtYgLlMgOADJ/GvQSFi2b3/4hZZxH3D8OyqOpoigzSVk7a2xHLyUwFso PnAjps2hs0/zPLz956u9hjCW5uTGNbFZDEPoBV1EjVMUm5N1zbZpCgh4R87JlTee tUJnWPR/WkCRzW4zreltS87rsnOH4an3Am5C9tDC8X7+jIK6en8kkAokGoAw39f6 UDxjGoA9YNX2AhtgROtvqfj/+PGkignvI2oFLCKRhmjYWccSn0WBbRhcLntIUWDR U5Nh/LG3jEGcQMHDXVLbUKMkjDte4qT0rwearVWTqSrX8WjpSA/hudNQ32qq3oAn Esj+9YWZSLXxtKgedfOMiWtMSa18exR1k8ssKzyzy8QunN0ddHujhsqX8BbImrx7 1tPQ3QEukdgh0DzspCgJpeYxpCG+Ca9UKMEIJEQhstQzFruZMcP7d/gKauSBNUVz uzyLJJYTjRWcTJReJraZnDfUobIuwixqIXUAXRnivGnbao3uHlyXuK+/suICoDCt L7zhBVX9Yn3LtXiS2tq+sXHev+BYiwOrUCz7bjP/uAZNKI2n059xivvAz361dhY1 AvdRhUze4qcu4zIGTC3R3OpNc2RXYux3REoMwW78da98qr9hFXC6IBJKui7CEfVc QaHcdnGvItwajyWyNqVHaEMEYQ1YcEXoRugPGwijVyoEh2QbX98= =7nDo -END PGP SIGNATURE- Stephen Kitt (7): Cope with librsvg’s new behaviour wrt. paths v. URIs Add a missing function declaration Document old patches Switch to debhelper compatibility level 11 Ship /usr/games/gweled with the desired ownership and permissions Standards-Version 4.1.3 Release --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/gweled.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[gweled] 03/07: Document old patches
This is an automated email from the git hooks/post-receive script. skitt pushed a commit to branch debian-sid in repository gweled. commit 8b6aa995b4b4a29804a4ef527761838a29e2e1ab Author: Stephen Kitt Date: Fri Feb 9 09:07:55 2018 +0100 Document old patches --- debian/changelog | 1 + debian/patches/001-potfiles.patch | 3 +++ debian/patches/003-intools-update_ignore_quilt_directory.patch | 3 +++ 3 files changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 93c52b5..12a4021 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ gweled (0.9.1-5) UNRELEASED; urgency=medium * Cope with librsvg’s new behaviour by always using URIs instead of paths. (Closes: #889688.) * Add a missing function declaration. + * Document old patches. -- Stephen Kitt Fri, 09 Feb 2018 09:02:48 +0100 diff --git a/debian/patches/001-potfiles.patch b/debian/patches/001-potfiles.patch index 6648a8e..fe0f42f 100644 --- a/debian/patches/001-potfiles.patch +++ b/debian/patches/001-potfiles.patch @@ -1,3 +1,6 @@ +Description: add game scores to POTFILES +Author: Ondřej Surý + --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -6,3 +6,4 @@ src/board_engine.c diff --git a/debian/patches/003-intools-update_ignore_quilt_directory.patch b/debian/patches/003-intools-update_ignore_quilt_directory.patch index 2a593bb..8cc2f80 100644 --- a/debian/patches/003-intools-update_ignore_quilt_directory.patch +++ b/debian/patches/003-intools-update_ignore_quilt_directory.patch @@ -1,3 +1,6 @@ +Description: ignore .pc in po file processing +Author: Ondřej Surý + --- /dev/null +++ b/po/POTFILES.skip @@ -0,0 +1 @@ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/gweled.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[gweled] 01/07: Cope with librsvg’s new behaviour wrt. paths v. URIs
This is an automated email from the git hooks/post-receive script.
skitt pushed a commit to branch debian-sid
in repository gweled.
commit f285a69b7687ca6fcf4af28674d4ba01223c6cdc
Author: Stephen Kitt
Date: Fri Feb 9 09:05:33 2018 +0100
Cope with librsvg’s new behaviour wrt. paths v. URIs
---
debian/changelog | 7 +++
debian/patches/007-rsvg-uri.patch | 42 +++
debian/patches/series | 1 +
3 files changed, 50 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index e55d032..37926b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gweled (0.9.1-5) UNRELEASED; urgency=medium
+
+ * Cope with librsvg’s new behaviour by always using URIs instead of
+paths. (Closes: #889688.)
+
+ -- Stephen Kitt Fri, 09 Feb 2018 09:02:48 +0100
+
gweled (0.9.1-4) unstable; urgency=medium
* Adopt the package for the Debian Games Team, thanks Ondřej Surý for
diff --git a/debian/patches/007-rsvg-uri.patch
b/debian/patches/007-rsvg-uri.patch
new file mode 100644
index 000..7662e3c
--- /dev/null
+++ b/debian/patches/007-rsvg-uri.patch
@@ -0,0 +1,42 @@
+Description: Use a URI for RSVG calls
+Author: Stephen Kitt
+Bug-Debian: https://bugs.debian.org/886833
+
+Recent librsvg ends up expecting a URI rather than a filename for
+calls to rsvg_pixbuf_from_file_at_size(). Older versions of librsvg
+work fine with URIs too, so unconditionally prepend "file://".
+
+Initialise error to avoid GError warnings. Free the error properly.
+
+--- a/src/sge_utils.c
b/src/sge_utils.c
+@@ -29,20 +29,18 @@
+ {
+ gchar *full_pathname;
+ GdkPixbuf *pixbuf = NULL;
+- GError *error;
++ GError *error = NULL;
+
+- full_pathname = g_strconcat(DATADIR "/pixmaps/",
++ full_pathname = g_strconcat("file://", DATADIR "/pixmaps/",
+ filename,
+ NULL );
+- if (g_file_test(full_pathname, G_FILE_TEST_IS_REGULAR)) {
+- pixbuf = rsvg_pixbuf_from_file_at_size (full_pathname, width,
+- height, &error);
+- g_free (full_pathname);
+- if (pixbuf == NULL)
+- g_free (error);
+-
+- } else
+- g_warning ("%s not found", filename);
++ pixbuf = rsvg_pixbuf_from_file_at_size (full_pathname, width,
++ height, &error);
++ if (pixbuf == NULL) {
++ g_warning("Unable to load %s: %s", full_pathname,
error->message);
++ g_error_free(error);
++ }
++ g_free (full_pathname);
+
+ return pixbuf;
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 80d8f6d..d8c19d8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
004-use-pkg-config-for-mikmod.patch
005-continue-endless-timed-modes.patch
006-spelling-fixes.patch
+007-rsvg-uri.patch
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/gweled.git
___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[gweled] branch debian-sid updated (6c9a06b -> 48d2911)
This is an automated email from the git hooks/post-receive script. skitt pushed a change to branch debian-sid in repository gweled. from 6c9a06b Release. new f285a69 Cope with librsvg’s new behaviour wrt. paths v. URIs new ebbba79 Add a missing function declaration new 8b6aa99 Document old patches new 7c14fcd Switch to debhelper compatibility level 11 new d4c057a Ship /usr/games/gweled with the desired ownership and permissions new ce2cd68 Standards-Version 4.1.3 new 48d2911 Release The 7 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 14 debian/compat | 2 +- debian/control | 7 ++-- debian/patches/001-potfiles.patch | 3 ++ ...003-intools-update_ignore_quilt_directory.patch | 3 ++ debian/patches/004-use-pkg-config-for-mikmod.patch | 13 --- .../patches/005-continue-endless-timed-modes.patch | 41 - debian/patches/007-rsvg-uri.patch | 42 ++ debian/patches/008-board-engine-declaration.patch | 14 debian/patches/series | 2 ++ debian/postinst| 6 ++-- debian/rules | 7 +++- 12 files changed, 93 insertions(+), 61 deletions(-) create mode 100644 debian/patches/007-rsvg-uri.patch create mode 100644 debian/patches/008-board-engine-declaration.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/gweled.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[stella] 04/06: Switch to debhelper compatibility level 11
This is an automated email from the git hooks/post-receive script. skitt pushed a commit to branch master in repository stella. commit 0ca04c377e3acb0072c307de248d6d9de345c091 Author: Stephen Kitt Date: Mon Feb 5 22:24:10 2018 +0100 Switch to debhelper compatibility level 11 --- debian/changelog | 1 + debian/compat| 2 +- debian/control | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index e01c7ab..dbd9c72 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ stella (5.1-1) UNRELEASED; urgency=medium * New upstream release, merging spelling-fixes.patch. + * Switch to debhelper compatibility level 11. -- Stephen Kitt Mon, 05 Feb 2018 21:56:25 +0100 diff --git a/debian/compat b/debian/compat index f599e28..b4de394 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -10 +11 diff --git a/debian/control b/debian/control index 37976fc..dc5c6c5 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Maintainer: Debian Games Team Uploaders: Stephen Kitt Section: otherosfs Priority: optional -Build-Depends: debhelper (>= 10), +Build-Depends: debhelper (>= 11~), g++ (>= 4:4.9), libpng-dev, libsdl2-dev, -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/stella.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[stella] 02/06: Merge tag 'upstream/5.1'
This is an automated email from the git hooks/post-receive script. skitt pushed a commit to branch master in repository stella. commit 45467b9f94d51a83deb527a2fb9514b9b7b90ecc Merge: c59a9f2 1ede285 Author: Stephen Kitt Date: Mon Feb 5 21:56:12 2018 +0100 Merge tag 'upstream/5.1' Upstream version 5.1 .gitignore |2 + .vscode/settings.json | 50 +- Announce.txt | 22 +- Changes.txt| 152 +- Copyright.txt |2 +- Makefile | 12 +- config.guess | 104 +- config.sub | 46 +- configure | 88 +- docs/debugger.html | 1024 +++ docs/graphics/cheat.png| Bin 4140 -> 3639 bytes docs/graphics/commandmenu.png | Bin 3974 -> 3380 bytes docs/graphics/console.png | Bin 62525 -> 61839 bytes docs/graphics/debugger_audiotab.png| Bin 0 -> 2394 bytes docs/graphics/debugger_bankcomplex.png | Bin 11186 -> 10569 bytes docs/graphics/debugger_banksimple.png | Bin 3753 -> 3770 bytes docs/graphics/debugger_bpstatus.png| Bin 469 -> 334 bytes docs/graphics/debugger_cpuregs.png | Bin 2577 -> 2045 bytes docs/graphics/debugger_dataops.png | Bin 783 -> 509 bytes docs/graphics/debugger_globalbuttons.png | Bin 1153 -> 1402 bytes docs/graphics/debugger_iotab.png | Bin 11947 -> 10011 bytes docs/graphics/debugger_main.png| Bin 55479 -> 86508 bytes docs/graphics/debugger_options.png | Bin 0 -> 407 bytes docs/graphics/debugger_ram-dpc.png | Bin 15976 -> 14221 bytes docs/graphics/debugger_ram-f8sc.png| Bin 8635 -> 6860 bytes docs/graphics/debugger_ram.png | Bin 7498 -> 7579 bytes docs/graphics/debugger_ramsearch.png | Bin 6248 -> 6094 bytes docs/graphics/debugger_rom.png | Bin 13292 -> 14986 bytes docs/graphics/debugger_romcmenu.png| Bin 14228 -> 10879 bytes docs/graphics/debugger_tiainfo.png | Bin 2114 -> 1732 bytes docs/graphics/debugger_tiaoutcmenu.png | Bin 2874 -> 2905 bytes docs/graphics/debugger_tiatab.png | Bin 14655 -> 12035 bytes docs/graphics/debugger_tiazoomcmenu.png| Bin 1954 -> 1485 bytes docs/graphics/developer_stats.png | Bin 3609 -> 3292 bytes docs/graphics/eventmapping.png | Bin 8495 -> 7185 bytes docs/graphics/eventmapping_combo.png | Bin 3445 -> 2655 bytes docs/graphics/eventmapping_devsports.png | Bin 8996 -> 8072 bytes docs/graphics/eventmapping_remap.png | Bin 7995 -> 6913 bytes docs/graphics/jr_pacman.png| Bin 3146 -> 2812 bytes docs/graphics/launcher.png | Bin 28818 -> 24309 bytes docs/graphics/launcher_filter.png | Bin 2029 -> 1660 bytes docs/graphics/launcher_options_files.png | Bin 5921 -> 5907 bytes docs/graphics/launcher_options_snapshots.png | Bin 5988 -> 4680 bytes docs/graphics/launcher_override.png| Bin 8152 -> 6859 bytes docs/graphics/logs.png | Bin 10758 -> 8759 bytes docs/graphics/options.png | Bin 4267 -> 4344 bytes docs/graphics/options_audio.png| Bin 3163 -> 2557 bytes docs/graphics/options_debugger.png | Bin 4853 -> 0 bytes docs/graphics/options_developer.png| Bin 0 -> 6607 bytes docs/graphics/options_developer_debugger.png | Bin 0 -> 5260 bytes docs/graphics/options_developer_emulation.png | Bin 0 -> 7240 bytes docs/graphics/options_developer_timemachine.png| Bin 0 -> 4895 bytes docs/graphics/options_developer_video.png | Bin 0 -> 6726 bytes docs/graphics/options_gameinfo.png | Bin 6561 -> 6004 bytes docs/graphics/options_gameinfo_console.png | Bin 0 -> 4275 bytes docs/graphics/options_gameinfo_controller.png | Bin 0 -> 6277 bytes docs/graphics/options_gameinfo_display.png | Bin 0 -> 4431 bytes docs/graphics/options_misc.png | Bin 3992 -> 3776 bytes docs/graphics/options_misc_classic.png | Bin 0 -> 3755 bytes docs/graphics/options_misc_light.png | Bin 0 -> 3741 bytes docs/grap
[stella] branch pristine-tar updated (7a3c72d -> a1bf4bb)
This is an automated email from the git hooks/post-receive script. skitt pushed a change to branch pristine-tar in repository stella. from 7a3c72d pristine-tar data for stella_5.0.2.orig.tar.gz new a1bf4bb pristine-tar data for stella_5.1.orig.tar.gz The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: stella_5.1.orig.tar.gz.delta | Bin 0 -> 25016 bytes stella_5.1.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) create mode 100644 stella_5.1.orig.tar.gz.delta create mode 100644 stella_5.1.orig.tar.gz.id -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/stella.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[stella] 03/06: New upstream release
This is an automated email from the git hooks/post-receive script.
skitt pushed a commit to branch master
in repository stella.
commit 288bf3aad5d9c409c2a91dec583e990013cec6ab
Author: Stephen Kitt
Date: Mon Feb 5 22:22:44 2018 +0100
New upstream release
---
debian/changelog| 8 -
debian/patches/series | 1 -
debian/patches/spelling-fixes.patch | 64 -
3 files changed, 7 insertions(+), 66 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index c7f23f6..e01c7ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+stella (5.1-1) UNRELEASED; urgency=medium
+
+ * New upstream release, merging spelling-fixes.patch.
+
+ -- Stephen Kitt Mon, 05 Feb 2018 21:56:25 +0100
+
stella (5.0.2-1) unstable; urgency=medium
* New upstream release.
@@ -387,7 +393,7 @@ stella (2.2-1) unstable; urgency=low
stella (1.4.1-1) unstable; urgency=low
- * Added debian-menus script to create menu files based on rom images.
+ * Added debian-menus script to create menu files based on rom images.
* New upstream release.
* This Release and 1.2-1.2 NMU (Closes: #174998, #190958, #262493, #263406)
diff --git a/debian/patches/series b/debian/patches/series
index 5259d5d..d938fff 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-spelling-fixes.patch
evdev-joystick-flags.patch
diff --git a/debian/patches/spelling-fixes.patch
b/debian/patches/spelling-fixes.patch
deleted file mode 100644
index 2b38a88..000
--- a/debian/patches/spelling-fixes.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-Description: Spelling fixes
-Author: Stephen Kitt
-
a/src/emucore/Settings.cxx
-+++ b/src/emucore/Settings.cxx
-@@ -530,7 +530,7 @@
- << "; Format MUST be as follows:" << endl
- << ";command = value" << endl
- << ";" << endl
-- << "; Commmands are the same as those specified on the commandline,"
<< endl
-+ << "; Commands are the same as those specified on the commandline," <<
endl
- << "; without the '-' character." << endl
- << ";" << endl
- << "; Values are the same as those allowed on the commandline." << endl
a/docs/debugger.html
-+++ b/docs/debugger.html
-@@ -939,7 +939,7 @@
-
- The 'Compare' button is used to compare the given value using all
- addresses currently highlighted. This may be an absolute number (such as 2),
--or a comparitive number (such as -1). Using a '+' or '-' operator
-+or a comparative number (such as -1). Using a '+' or '-' operator
- means 'search addresses for values that have changed by that amount'.
- The 'Reset' button resets the entire operation; it clears the highlighted
- addresses and allows another search.
a/src/debugger/gui/RamWidget.cxx
-+++ b/src/debugger/gui/RamWidget.cxx
-@@ -385,11 +385,11 @@
- // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- string RamWidget::doCompare(const string& str)
- {
-- bool comparitiveSearch = false;
-+ bool comparativeSearch = false;
- int searchVal = 0, offset = 0;
-
- if(str.length() == 0)
--return "Enter an absolute or comparitive value";
-+return "Enter an absolute or comparative value";
-
- // Do some pre-processing on the string
- string::size_type pos = str.find_first_of("+-", 0);
-@@ -399,11 +399,11 @@
- return "Input must be [+|-]NUM";
- }
-
-- // A comparitive search searches memory for locations that have changed by
-+ // A comparative search searches memory for locations that have changed by
- // the specified amount, vs. for exact values
- if(str[0] == '+' || str[0] == '-')
- {
--comparitiveSearch = true;
-+comparativeSearch = true;
- bool negative = false;
- if(str[0] == '-')
- negative = true;
-@@ -427,7 +427,7 @@
-
- for(uInt32 i = 0; i < mySearchAddr.size(); ++i)
- {
--if(comparitiveSearch)
-+if(comparativeSearch)
- {
- searchVal = mySearchValue[i] + offset;
- if(searchVal < 0 || searchVal > 255)
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/stella.git
___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[stella] annotated tag debian/5.1-1 created (now e4b483b)
This is an automated email from the git hooks/post-receive script. skitt pushed a change to annotated tag debian/5.1-1 in repository stella. at e4b483b (tag) tagging 0e150dba3e140d6aa2595a50851065a650dc7efc (commit) replaces debian/5.0.2-1 tagged by Stephen Kitt on Mon Feb 5 22:34:48 2018 +0100 - Log - stella Debian release 5.1-1 -BEGIN PGP SIGNATURE- iQIzBAABCgAdFiEEnPVX/hPLkMoq7x0ggNMC9Yhtg5wFAlp4zfgACgkQgNMC9Yht g5xN9Q//eSXwzVvL7Qf6Z5ywP2VdXmYm1HCiyrENtOwpnoRfyN2MwQ31qoyGa39n R+68MH2pIfDeaOlbYz3f4cF6lTkM9e1NHT/989l+zYsvnd/xeXUHKSWC60MglNhH cizylv5+VQY0RrdWLHFaRTQIVnXSeD9hYdvKFcQjBDPULTdG4LpdhC1Cw7ln+G1M 6c+hQmOc1M59jLBj2xFaE/Gjn8Z1flrvYDj4hi1QdXSPuO3VNs3G5rYyQzB1pp7a VGeJXV3kYl+6rr3yDt8EJWNGtS8h4d1xAfz4I3mlNioIBxioLHxOkF3EYvis9Uvp JfDZYnRtMcXr8BSlRWyxWX17WIlfXw/5kObCx8AO418p23kjHlX188kARrc4OwRj hYLHsOFagwQrbtyOv4a8QNSAs0EIaokRi+v1sdK+IlUTXLqvajsk+z0JezQhYyGp YTpFs1zphTC30mvFNnhemHxm2bFIouU+pnSC2lwH4oaUpiC5icTwlRrK1tAXH6Qx 6GhA+VIe0TzbxG4N1fTnLCN+nMm7POu1ftzh0AKKSqlxSdFZaljPoQ+QRhZivhsL zdI0AtU8Fq+3kN//2PcSA1NRgSR6Q2dokWpmlkgFRdeOlcQK/BIqBUujX4foqz4D 3YADmDR0DuehVSVEWJ89q3KCu3pn1r5/poUMEKGsOfLSBwD2NQQ= =nRG/ -END PGP SIGNATURE- Stephen Kitt (6): New upstream version 5.1 Merge tag 'upstream/5.1' New upstream release Switch to debhelper compatibility level 11 Standards-Version 4.1.3 Release --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/stella.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[stella] 05/06: Standards-Version 4.1.3
This is an automated email from the git hooks/post-receive script. skitt pushed a commit to branch master in repository stella. commit f55408fde644a6a4380fbd89dd7920007c6588e1 Author: Stephen Kitt Date: Mon Feb 5 22:24:44 2018 +0100 Standards-Version 4.1.3 --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index dbd9c72..03b4d78 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ stella (5.1-1) UNRELEASED; urgency=medium * New upstream release, merging spelling-fixes.patch. * Switch to debhelper compatibility level 11. + * Standards-Version 4.1.3, no further change required. -- Stephen Kitt Mon, 05 Feb 2018 21:56:25 +0100 diff --git a/debian/control b/debian/control index dc5c6c5..587583d 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 11~), libpng-dev, libsdl2-dev, zlib1g-dev -Standards-Version: 4.0.0 +Standards-Version: 4.1.3 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-games/stella.git Vcs-Git: https://anonscm.debian.org/git/pkg-games/stella.git Homepage: https://stella-emu.github.io -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/stella.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[stella] annotated tag upstream/5.1 created (now 3596397)
This is an automated email from the git hooks/post-receive script. skitt pushed a change to annotated tag upstream/5.1 in repository stella. at 3596397 (tag) tagging 1ede285c50aff3ccc85673159fd9e900784847dd (commit) replaces upstream/5.0.2 tagged by Stephen Kitt on Mon Feb 5 21:55:25 2018 +0100 - Log - Upstream version 5.1 Stephen Kitt (1): New upstream version 5.1 --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/stella.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[uqm] annotated tag debian/0.6.2.dfsg-9.5 created (now 77ee692)
This is an automated email from the git hooks/post-receive script. skitt pushed a change to annotated tag debian/0.6.2.dfsg-9.5 in repository uqm. at 77ee692 (tag) tagging b9980acb2e3e73194fbb1e7f67f7b369e64b2e72 (commit) replaces debian/0.6.2.dfsg-9.4 tagged by Stephen Kitt on Thu Jan 25 19:46:27 2018 +0100 - Log - uqm Debian release 0.6.2.dfsg-9.5 -BEGIN PGP SIGNATURE- iQIzBAABCgAdFiEEnPVX/hPLkMoq7x0ggNMC9Yhtg5wFAlpqJgMACgkQgNMC9Yht g5ykWw/6AkdA64Ih5swr0Q1H/fGIpT9UCF+kh58gQbGpDCxH5ZQLyK0A6MTQCnSA 0GdJpEIoSxNjkfMWrP8QtNW/ZZlVMbuG9pDCUQnB9U7AxU4/NuRP5F3Q2V3XgGcO 66jlN4Z3XJxlb2Fc51cRJve2CrU83Yf4svYPJja7Z0en7d9wbY5kuBdSLK9nly1J 7LKtE5IUTOxfQqRFoo+tq/kBMelo+Z2iGDuFx/q5/fwiOjUt9ZwSrCENhCMGwi/H mIrHuBCDu0b/8O/ejSaDURLk+IptyskKe/RA6TNOyUzFYOZ8/N31PBSpAGQHMkf7 KhJ1N504N454F8o1oGLjKOg9RItgx8QBnM9SLK/WjPUoyKRNVLmwtu7cUS4a4hAa 1R2OYJMrQrAbYNIR6EoqhSb7wTemHjGjePPvyUg5BUPIDnjXd6CvP059vLdRbI7x VsNf4sKVx7+7uM6lplDwhjyDZV29aJR+2zyAdYGHw8MgCrmdwgzudOOx7UCvkZrC tixtJq5cdxP4Xd2euDSFc8WROsbO6gSi/f04WhkeBbplwEa9P/6mppvX1AvU4/yA 8AjfDYDZYzGuTI0rn9xBI3/GQI4ZQeqiZr02pv8c7QQ0XEJkzoy/lfP71Cotqp+u WfH0IBEh6xCvdsxEgOQpAczeuQt1EOpSpwAVaJAYTK5TiWAwT3I= =mOJl -END PGP SIGNATURE- Stephen Kitt (1): Move all strings.h headers to ustrings.h --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/uqm.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[uqm] branch master updated (d6e994a -> b9980ac)
This is an automated email from the git hooks/post-receive script. skitt pushed a change to branch master in repository uqm. from d6e994a Release new b9980ac Move all strings.h headers to ustrings.h The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog |8 + debian/patches/series|1 + debian/patches/strings.patch | 8765 ++ 3 files changed, 8774 insertions(+) create mode 100644 debian/patches/strings.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/uqm.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[scummvm-tools] annotated tag upstream/2.0.0 created (now b14b311)
This is an automated email from the git hooks/post-receive script. skitt pushed a change to annotated tag upstream/2.0.0 in repository scummvm-tools. at b14b311 (tag) tagging 7463ccedc67e04c0391acc0cbca2515a708cb6ea (commit) replaces upstream/1.9.0 tagged by Stephen Kitt on Sat Dec 9 13:30:29 2017 +0100 - Log - Upstream version 2.0.0 Stephen Kitt (1): New upstream version 2.0.0 --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/scummvm-tools.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[scummvm-tools] branch upstream updated (0ceda23 -> 7463cce)
This is an automated email from the git hooks/post-receive script. skitt pushed a change to branch upstream in repository scummvm-tools. from 0ceda23 New upstream version 1.9.0 new 7463cce New upstream version 2.0.0 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: COPYRIGHT | 2 +- NEWS | 7 + README | 169 -- convert_dxa.bat| 2 +- convert_dxa.sh | 2 +- dists/macosx/Info.plist| 8 +- dists/macosx/Info.plist.in | 4 +- dists/scummvmtools.rc | 10 +- dists/scummvmtools.rc.in | 2 +- dists/win32/ScummVM Tools.iss | 2 +- dists/win32/scummvm-tools.nsi | 6 +- dists/win32/scummvm-tools.nsi.in | 2 +- engines/cine/extract_cine.cpp | 11 +- engines/prince/extract_prince.cpp | 463 + engines/prince/extract_prince.h| 1 + engines/prince/pack_prince.cpp | 75 +++--- engines/touche/compress_touche.cpp | 5 +- gui/main.cpp | 2 +- internal_version.h | 2 +- 19 files changed, 448 insertions(+), 327 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/scummvm-tools.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[scummvm-tools] branch pristine-tar updated (d95223b -> 78101ba)
This is an automated email from the git hooks/post-receive script. skitt pushed a change to branch pristine-tar in repository scummvm-tools. from d95223b pristine-tar data for scummvm-tools_1.9.0.orig.tar.xz new 78101ba pristine-tar data for scummvm-tools_2.0.0.orig.tar.xz The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: scummvm-tools_2.0.0.orig.tar.xz.delta | Bin 0 -> 15194 bytes scummvm-tools_2.0.0.orig.tar.xz.id| 1 + 2 files changed, 1 insertion(+) create mode 100644 scummvm-tools_2.0.0.orig.tar.xz.delta create mode 100644 scummvm-tools_2.0.0.orig.tar.xz.id -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/scummvm-tools.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[scummvm-tools] 07/08: Standards-Version 4.1.3
This is an automated email from the git hooks/post-receive script. skitt pushed a commit to branch master in repository scummvm-tools. commit 7215a3807a4af42642fd833d9b9bb13668a00701 Author: Stephen Kitt Date: Tue Jan 9 23:10:11 2018 +0100 Standards-Version 4.1.3 --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index e72c735..ed66d5d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ scummvm-tools (2.0.0-1) UNRELEASED; urgency=medium * Switch to debhelper compatibility level 11. * Use a secure upstream URL in debian/watch. * Add manpages for most of the smaller tools. + * Standards-Version 4.1.3, no further change required. -- Stephen Kitt Sat, 09 Dec 2017 13:37:29 +0100 diff --git a/debian/control b/debian/control index 77ea024..7ef467f 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,7 @@ Build-Depends: debhelper (>= 11~), libwxgtk3.0-dev, python, zlib1g-dev -Standards-Version: 4.0.0 +Standards-Version: 4.1.3 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-games/scummvm-tools.git Vcs-Git: https://anonscm.debian.org/git/pkg-games/scummvm-tools.git Homepage: http://wiki.scummvm.org/index.php/User_Manual/Appendix:_Tools -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/scummvm-tools.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[scummvm-tools] 01/08: New upstream version 2.0.0
This is an automated email from the git hooks/post-receive script. skitt pushed a commit to branch master in repository scummvm-tools. commit 7463ccedc67e04c0391acc0cbca2515a708cb6ea Author: Stephen Kitt Date: Sat Dec 9 13:30:28 2017 +0100 New upstream version 2.0.0 --- COPYRIGHT | 2 +- NEWS | 7 + README | 169 -- convert_dxa.bat| 2 +- convert_dxa.sh | 2 +- dists/macosx/Info.plist| 8 +- dists/macosx/Info.plist.in | 4 +- dists/scummvmtools.rc | 10 +- dists/scummvmtools.rc.in | 2 +- dists/win32/ScummVM Tools.iss | 2 +- dists/win32/scummvm-tools.nsi | 6 +- dists/win32/scummvm-tools.nsi.in | 2 +- engines/cine/extract_cine.cpp | 11 +- engines/prince/extract_prince.cpp | 463 + engines/prince/extract_prince.h| 1 + engines/prince/pack_prince.cpp | 75 +++--- engines/touche/compress_touche.cpp | 5 +- gui/main.cpp | 2 +- internal_version.h | 2 +- 19 files changed, 448 insertions(+), 327 deletions(-) diff --git a/COPYRIGHT b/COPYRIGHT index ebeb385..d1a86ee 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,5 +1,5 @@ ScummVM Tools -Copyright (C) 2001-2016 by the following: +Copyright (C) 2001-2017 by the following: If you have contributed to this project then you deserve to be on this list. Contact us and we'll add you. diff --git a/NEWS b/NEWS index fa56aa6..565ca60 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,13 @@ For a more comprehensive changelog of the latest experimental code, see: https://github.com/scummvm/scummvm-tools/commits/ +2.0.0 (2017-12-17) + - Fix handling of output path for the compress_touche tool. + - Fix handling of input path for the extract_cine tool. It was only working + when run from the directory that contains the game data. + - Fix memory corruption that could cause random errors during extraction when + using the extract_cine tool. + 1.9.0 (2016-10-27) - Fix random crashes in the tool to convert Broken Sword 1 speech files. diff --git a/README b/README index 70822e3..aee6634 100644 --- a/README +++ b/README @@ -33,7 +33,7 @@ You can get a list of the supported tools using --list: scummvm-tools-cli --list -[audio params] is used for compression tools to defined which audio format to +[audio params] is used for compression tools to define which audio format to compress to. Use --mp3, --flac or --vorbis first to select a special format, default is MP3. Then you can give additional information such as the bit rate you want to use. Use --help to get the list of all the options you can use: @@ -53,27 +53,40 @@ Extraction Tools: ./scummvm-tools-cli --tool extract_agos ... extract_cge -Unpack Soltys and Sfinx game data files. +Unpacks Soltys and Sfinx game data files. + Example of usage: ./scummvm-tools-cli --tool extract_cge [-o outputdir] pack_cge - Pack Soltys and Sfinx game data files. + Packs Soltys and Sfinx game data files. + Example of usage: ./scummvm-tools-cli --tool pack_cge [-o outputdir] extract_cine Unpacks Delphine's Cinematique engine's archive files. + Should work at least with Future Wars and Operation Stealth. -Supports using Operation Stealth's 'vol.cnf' file as input -in which case it will try to unpack all the archive files -listed in 'vol.cnf'. Accepts only one input file. +It seems to work also with Cruise for a Corpse. It accepts only +one input file. This may be either one of the archive file, in +which case only this file is unpacked, or the 'vol.cnf' file, +in which case all archive files listed in the 'vol.cnf' file are +unpacked. Example of usage: -./scummvm-tools-cli --tool extract_cine +./scummvm-tools-cli --tool extract_cine [-o outputdir] + +extract_cruise_pc +Unpack the E1, E4 and E5 files found in some versions of +Cruise for a Corpse. To extract the D1 to D5 files, use the +extract_cine tool instead. + +Example of usage: +./scummvm-tools-cli --tool extract_cruise_pc [-o outputdir] extract_gob_stk -Extracts data files from STK/ITK files of Coktel Vision +Extracts data files from STK/ITK files from Coktel Vision games. Example of usage: @
[scummvm-tools] 05/08: Use a secure upstream URL in debian/watch
This is an automated email from the git hooks/post-receive script. skitt pushed a commit to branch master in repository scummvm-tools. commit 8e3946cbd942e0847747f0ab63f70d74f6fb2624 Author: Stephen Kitt Date: Tue Jan 9 23:08:33 2018 +0100 Use a secure upstream URL in debian/watch --- debian/changelog | 1 + debian/watch | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 82b4413..32b8ae8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ scummvm-tools (2.0.0-1) UNRELEASED; urgency=medium * New upstream release. * Switch to debhelper compatibility level 11. + * Use a secure upstream URL in debian/watch. -- Stephen Kitt Sat, 09 Dec 2017 13:37:29 +0100 diff --git a/debian/watch b/debian/watch index e9ba3cf..9a0b639 100644 --- a/debian/watch +++ b/debian/watch @@ -2,5 +2,5 @@ version=4 # s/-/~/ excludes e.g. -win32.zip opts="dirversionmangle=s/rc/~rc/;s/b/~b/, \ uversionmangle=s/rc/~rc/;s/b/~b/;s/-/~/" \ - http://www.scummvm.org/frs/scummvm-tools/(\d[\-+\.:\~\da-zA-Z]*)/ \ + https://www.scummvm.org/frs/scummvm-tools/(\d[\-+\.:\~\da-zA-Z]*)/ \ @PACKAGE@@ANY_VERSION@@ARCHIVE_EXT@ debian uupdate -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/scummvm-tools.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[scummvm-tools] 04/08: Switch to debhelper compatibility level 11
This is an automated email from the git hooks/post-receive script. skitt pushed a commit to branch master in repository scummvm-tools. commit ace072b3bc5897f91422c9c819d8e028abf15b4f Author: Stephen Kitt Date: Tue Jan 9 23:07:42 2018 +0100 Switch to debhelper compatibility level 11 --- debian/changelog | 1 + debian/compat| 2 +- debian/control | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 72bd34a..82b4413 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ scummvm-tools (2.0.0-1) UNRELEASED; urgency=medium * New upstream release. + * Switch to debhelper compatibility level 11. -- Stephen Kitt Sat, 09 Dec 2017 13:37:29 +0100 diff --git a/debian/compat b/debian/compat index f599e28..b4de394 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -10 +11 diff --git a/debian/control b/debian/control index 9791334..77ea024 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Maintainer: Debian Games Team Uploaders: Stephen Kitt Section: games Priority: optional -Build-Depends: debhelper (>= 10), +Build-Depends: debhelper (>= 11~), libboost-program-options-dev, libflac-dev, libfreetype6-dev, -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/scummvm-tools.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[scummvm-tools] 06/08: Add manpages for most of the smaller tools
This is an automated email from the git hooks/post-receive script. skitt pushed a commit to branch master in repository scummvm-tools. commit c94b7af7dc5c6ce35089c52dee4ac274c5771487 Author: Stephen Kitt Date: Tue Jan 9 23:09:17 2018 +0100 Add manpages for most of the smaller tools --- debian/changelog | 1 + debian/construct_mohawk.6 | 24 ++ debian/decine.6 | 34 + debian/decompile.6| 118 ++ debian/degob.6| 68 ++ debian/dekyra.6 | 33 + debian/deriven.6 | 22 + debian/descumm.6 | 78 ++ debian/desword2.6 | 14 ++ debian/extract_mohawk.6 | 47 ++ debian/gob_loadcalc.6 | 18 +++ debian/manpages | 10 12 files changed, 467 insertions(+) diff --git a/debian/changelog b/debian/changelog index 32b8ae8..e72c735 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ scummvm-tools (2.0.0-1) UNRELEASED; urgency=medium * New upstream release. * Switch to debhelper compatibility level 11. * Use a secure upstream URL in debian/watch. + * Add manpages for most of the smaller tools. -- Stephen Kitt Sat, 09 Dec 2017 13:37:29 +0100 diff --git a/debian/construct_mohawk.6 b/debian/construct_mohawk.6 new file mode 100644 index 000..53086f0 --- /dev/null +++ b/debian/construct_mohawk.6 @@ -0,0 +1,24 @@ +.TH construct_mohawk 6 "December 9, 2017" scummvm-tools +.SH NAME +construct_mohawk \- Mohawk archive construction tool +.SH SYNOPSIS +.B construct_mohawk +.RI < "mohawk archive" > +.RI < "binary resource file" > +.RI [< "binary resource file" ">] ..." +.SH DESCRIPTION +.B construct_mohawk +builds a Mohawk archive containing the given resource files. (Mohawk +archives are used by the Brøderbund Mohawk engine, in games such as +Myst, Riven, the Living Books series, the Carmen Sandiego series...) +.PP +.SH OPTIONS +.B construct_mohawk +accepts no options. +.SH SEE ALSO +.BR extract_mohawk (6) +.SH AUTHORS +This manual page was adapted from the program usage information by +Stephen Kitt , for the Debian GNU/Linux system (but +may be used by others). It was last modified for \fBscummvm-tools\fP +version 2.0. diff --git a/debian/decine.6 b/debian/decine.6 new file mode 100644 index 000..af23651 --- /dev/null +++ b/debian/decine.6 @@ -0,0 +1,34 @@ +.TH decine 6 "December 9, 2017" scummvm-tools +.SH NAME +decine \- Delphine Cinematique engine script decompiler +.SH SYNOPSIS +.B decine +.RI < type > +.RI < version > +.RI < filename "> ..." +.SH DESCRIPTION +.B decine +decompiles scripts for Delphine's Cinematique engine. It supports at +least Future Wars and Operation Stealth. +.PP +.I type +is +.B \-prc +for prc files, +.B \-rel +for rel files. +.PP +.I version +is +.B \-v1 +for Future Wars, +.B \-v2 +for Operation Stealth. +.PP +.I filename +is the name of the script file to decode. +.SH AUTHORS +This manual page was adapted from the program usage information by +Stephen Kitt , for the Debian GNU/Linux system (but +may be used by others). It was last modified for \fBscummvm-tools\fP +version 2.0. diff --git a/debian/decompile.6 b/debian/decompile.6 new file mode 100644 index 000..e5f0f87 --- /dev/null +++ b/debian/decompile.6 @@ -0,0 +1,118 @@ +.TH decompile 6 "December 9, 2017" scummvm-tools +.SH NAME +decompile \- Engine script decompiler +.SH SYNOPSIS +.B decompile \-h +.br +.B decompile \-l +.br +.B decompile \-h \-e +.RI < engine > +.br +.B decompile +.RB [ \-e +.RI < engine >] +.RB [ \-d +.RI < file >] +.RB [ \-g +.RI < file >] +.RB [ \-D ] +.RB [ \-G ] +.RB [ \-u ] +.RB [ \-v +.RI < variant >] +.RB [ \-s ] +.RI < file > +.SH DESCRIPTION +.B decompile +decompiles scripts for a number of game engines. +.PP +.B decompile \-h +or +.B decompile \-\-help +displays a short help summary. +.PP +.B decompile \-l +or +.B decompile \-\-list +lists the supported game engines. +.PP +.B decompile \-h \-e +or +.B decompile \-\-help \-\-engine +.RI < engine > +lists the variants available for the given \fIengine\fP. +.PP +Other forms of the command decompile the given \fIfile\fP, using the +game engine specified using the +.B \-e +or +.B \-\-engine +option: +.TP +.B groovie +Groovie, as used by The 7th Guest and The 11th Hour; +.TP +.B kyra2 +Legend of Kyrandia: Hand of Fate; +.TP +.B scummv6 +SCUMM v6. +.PP +Variants are specified using the +.B \-v +or +.B \-\-variant +option: +.TP +.B t7g +The 7th Guest (for the +.B groovie +engine); +.TP +.B v2 +version 2, from The 11th Hour onwards (for the +.B groovie +engine); +.TP +.B kyra2 +Legend of Kyrandia: Hand of Fate, floppy-disk version; +.TP +.B kyra2-talkie +Legend of Kyrandia: Hand of Fate, CD-ROM (talk
[scummvm-tools] 08/08: Release
This is an automated email from the git hooks/post-receive script. skitt pushed a commit to branch master in repository scummvm-tools. commit ca72a7f60d6ca6a6a43f44b3f2fbc600e4426111 Author: Stephen Kitt Date: Tue Jan 9 23:15:05 2018 +0100 Release --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index ed66d5d..1822615 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -scummvm-tools (2.0.0-1) UNRELEASED; urgency=medium +scummvm-tools (2.0.0-1) unstable; urgency=medium * New upstream release. * Switch to debhelper compatibility level 11. @@ -6,7 +6,7 @@ scummvm-tools (2.0.0-1) UNRELEASED; urgency=medium * Add manpages for most of the smaller tools. * Standards-Version 4.1.3, no further change required. - -- Stephen Kitt Sat, 09 Dec 2017 13:37:29 +0100 + -- Stephen Kitt Tue, 09 Jan 2018 23:15:00 +0100 scummvm-tools (1.9.0-2) unstable; urgency=medium -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/scummvm-tools.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[scummvm-tools] 01/01: pristine-tar data for scummvm-tools_2.0.0.orig.tar.xz
This is an automated email from the git hooks/post-receive script. skitt pushed a commit to branch pristine-tar in repository scummvm-tools. commit 78101ba7aba299d826c73dc47761befb29e1ea4f Author: Stephen Kitt Date: Sat Dec 9 13:30:29 2017 +0100 pristine-tar data for scummvm-tools_2.0.0.orig.tar.xz --- scummvm-tools_2.0.0.orig.tar.xz.delta | Bin 0 -> 15194 bytes scummvm-tools_2.0.0.orig.tar.xz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/scummvm-tools_2.0.0.orig.tar.xz.delta b/scummvm-tools_2.0.0.orig.tar.xz.delta new file mode 100644 index 000..17502b6 Binary files /dev/null and b/scummvm-tools_2.0.0.orig.tar.xz.delta differ diff --git a/scummvm-tools_2.0.0.orig.tar.xz.id b/scummvm-tools_2.0.0.orig.tar.xz.id new file mode 100644 index 000..ebaaba4 --- /dev/null +++ b/scummvm-tools_2.0.0.orig.tar.xz.id @@ -0,0 +1 @@ +95a91abd9464db8362b7270fb6d16904ac90509b -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/scummvm-tools.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[scummvm-tools] annotated tag debian/2.0.0-1 created (now c6c5cc2)
This is an automated email from the git hooks/post-receive script. skitt pushed a change to annotated tag debian/2.0.0-1 in repository scummvm-tools. at c6c5cc2 (tag) tagging ca72a7f60d6ca6a6a43f44b3f2fbc600e4426111 (commit) replaces debian/1.9.0-2 tagged by Stephen Kitt on Tue Jan 9 23:15:13 2018 +0100 - Log - scummvm-tools Debian release 2.0.0-1 -BEGIN PGP SIGNATURE- iQIzBAABCgAdFiEEnPVX/hPLkMoq7x0ggNMC9Yhtg5wFAlpVPvEACgkQgNMC9Yht g5wLnA//fTdTYm18+UM8DGLWu9P8DJX4cBtcDHBy89hF1ZwTFf7sadA+h7p4yA4d QJmgfX5gxZ+v5J2dkMVDcYP9N0RyFf1cn2ip81Vrptp38qGMezxWTZYrkHnOBvHj CLw43NQBMNkrFtqGvWzJQMCEjRgjRobJZ21MqjuDrXyeDz1l0vIYp0vaZ/0qWTdQ 7ZSdQwMXeET46poQT4IH6hOHMaHtAK7Zn6kQMjF5khIMmuJ7LxiKeuaLZaUkr45S OxUNC0rXfcTuc5TZRTs0+zkMITP3FxzE1BI0sjwDczSnRQcxBisDpkqu8TkyxOgU dcR7Gk3kmj3MRnLJSZFgOIW19hpgK2ScUzKoX7UYnPu29AuEjBpAoTaz8hM4g94J c5Y5htgAu+4EO6zpuBx69A1VbPgHLuqm8b4KLeNIjywgivjEC+gnM2zYVgYknA6d 8wfK+OraheVX4BU0cHqwriAQVePPfGvqXf0BZsNawpFWGacilE9dyVtldYOhLVR1 H0IJnio2RCuLzRc6xZMuNtPmH5Pqzz/MvdRfkdww5RVrFes7eeIjj4jSzQLgigiQ OSFKraO6OUZXZBWm7a2WZPXEdQraLdzixmnPsHMqALaEyX7pKwKR1PrXr4qWUJ7S oZhtk/HB2OmpfXZybUZXgs6Ktku+ZaoPCZH+Vy2BlosPTppWuAM= =Xgk0 -END PGP SIGNATURE- Stephen Kitt (8): New upstream version 2.0.0 Merge tag 'upstream/2.0.0' New upstream release Switch to debhelper compatibility level 11 Use a secure upstream URL in debian/watch Add manpages for most of the smaller tools Standards-Version 4.1.3 Release --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/scummvm-tools.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[scummvm-tools] 02/08: Merge tag 'upstream/2.0.0'
This is an automated email from the git hooks/post-receive script. skitt pushed a commit to branch master in repository scummvm-tools. commit 1ea5b6150b5a86a35b129df9bf86dd805e3e38e4 Merge: c47a5c6 7463cce Author: Stephen Kitt Date: Sat Dec 9 13:30:29 2017 +0100 Merge tag 'upstream/2.0.0' Upstream version 2.0.0 COPYRIGHT | 2 +- NEWS | 7 + README | 169 -- convert_dxa.bat| 2 +- convert_dxa.sh | 2 +- dists/macosx/Info.plist| 8 +- dists/macosx/Info.plist.in | 4 +- dists/scummvmtools.rc | 10 +- dists/scummvmtools.rc.in | 2 +- dists/win32/ScummVM Tools.iss | 2 +- dists/win32/scummvm-tools.nsi | 6 +- dists/win32/scummvm-tools.nsi.in | 2 +- engines/cine/extract_cine.cpp | 11 +- engines/prince/extract_prince.cpp | 463 + engines/prince/extract_prince.h| 1 + engines/prince/pack_prince.cpp | 75 +++--- engines/touche/compress_touche.cpp | 5 +- gui/main.cpp | 2 +- internal_version.h | 2 +- 19 files changed, 448 insertions(+), 327 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/scummvm-tools.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[scummvm-tools] 03/08: New upstream release
This is an automated email from the git hooks/post-receive script. skitt pushed a commit to branch master in repository scummvm-tools. commit a64dd5bfdb8f3c65bda743a33d7b77d8a4a6137a Author: Stephen Kitt Date: Sat Dec 9 15:54:23 2017 +0100 New upstream release --- debian/changelog | 6 ++ debian/copyright | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 13d65f1..72bd34a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +scummvm-tools (2.0.0-1) UNRELEASED; urgency=medium + + * New upstream release. + + -- Stephen Kitt Sat, 09 Dec 2017 13:37:29 +0100 + scummvm-tools (1.9.0-2) unstable; urgency=medium * Avoid disabling -Wformat, which causes a build failure with GCC 7. diff --git a/debian/copyright b/debian/copyright index d71930f..288a354 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,7 +3,7 @@ Upstream-Name: scummvm-tools Source: http://www.scummvm.org Files: * -Copyright: 2001-2014 ScummVM Team +Copyright: 2001-2017 ScummVM Team License: GPL-2.0+ Files: @@ -15,13 +15,13 @@ License: permissive Files: convert_dxa.bat Copyright: 2006 oduverne - 2006-2012 ScummVM Team + 2006-2017 ScummVM Team 2008 NoiZe License: GPL-2.0+ Files: convert_dxa.sh Copyright: 2006 crowley - 2006-2012 ScummVM Team + 2006-2017 ScummVM Team License: GPL-2.0+ Files: -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/scummvm-tools.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[scummvm-tools] branch master updated (c47a5c6 -> ca72a7f)
This is an automated email from the git hooks/post-receive script. skitt pushed a change to branch master in repository scummvm-tools. from c47a5c6 Release new 7463cce New upstream version 2.0.0 new 1ea5b61 Merge tag 'upstream/2.0.0' new a64dd5b New upstream release new ace072b Switch to debhelper compatibility level 11 new 8e3946c Use a secure upstream URL in debian/watch new c94b7af Add manpages for most of the smaller tools new 7215a38 Standards-Version 4.1.3 new ca72a7f Release The 8 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: COPYRIGHT | 2 +- NEWS | 7 + README | 169 -- convert_dxa.bat| 2 +- convert_dxa.sh | 2 +- debian/changelog | 10 + debian/compat | 2 +- debian/construct_mohawk.6 | 24 ++ debian/control | 4 +- debian/copyright | 6 +- debian/decine.6| 34 +++ debian/decompile.6 | 118 ++ debian/degob.6 | 68 ++ debian/dekyra.6| 33 +++ debian/deriven.6 | 22 ++ debian/descumm.6 | 78 +++ debian/desword2.6 | 14 ++ debian/extract_mohawk.6| 47 debian/gob_loadcalc.6 | 18 ++ debian/manpages| 10 + debian/watch | 2 +- dists/macosx/Info.plist| 8 +- dists/macosx/Info.plist.in | 4 +- dists/scummvmtools.rc | 10 +- dists/scummvmtools.rc.in | 2 +- dists/win32/ScummVM Tools.iss | 2 +- dists/win32/scummvm-tools.nsi | 6 +- dists/win32/scummvm-tools.nsi.in | 2 +- engines/cine/extract_cine.cpp | 11 +- engines/prince/extract_prince.cpp | 463 + engines/prince/extract_prince.h| 1 + engines/prince/pack_prince.cpp | 75 +++--- engines/touche/compress_touche.cpp | 5 +- gui/main.cpp | 2 +- internal_version.h | 2 +- 35 files changed, 931 insertions(+), 334 deletions(-) create mode 100644 debian/construct_mohawk.6 create mode 100644 debian/decine.6 create mode 100644 debian/decompile.6 create mode 100644 debian/degob.6 create mode 100644 debian/dekyra.6 create mode 100644 debian/deriven.6 create mode 100644 debian/descumm.6 create mode 100644 debian/desword2.6 create mode 100644 debian/extract_mohawk.6 create mode 100644 debian/gob_loadcalc.6 create mode 100644 debian/manpages -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/scummvm-tools.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[quakespasm] 01/01: Release
This is an automated email from the git hooks/post-receive script. skitt pushed a commit to branch master in repository quakespasm. commit a490774835501bbfa2e5738a8e08266c7fd6fa14 Author: Stephen Kitt Date: Thu Nov 23 18:39:59 2017 +0100 Release --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index d6b2552..6607f59 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -quakespasm (0.93.0+dfsg-1) UNRELEASED; urgency=medium +quakespasm (0.93.0+dfsg-1) unstable; urgency=medium * New upstream release. - -- Stephen Kitt Thu, 23 Nov 2017 17:46:32 +0100 + -- Stephen Kitt Thu, 23 Nov 2017 18:39:53 +0100 quakespasm (0.92.1+dfsg-3) unstable; urgency=medium -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/quakespasm.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[quakespasm] branch master updated (62cc8b7 -> a490774)
This is an automated email from the git hooks/post-receive script. skitt pushed a change to branch master in repository quakespasm. from 62cc8b7 New upstream release new a490774 Release The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/quakespasm.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[quakespasm] annotated tag upstream/0.93.0+dfsg created (now 2860055)
This is an automated email from the git hooks/post-receive script. skitt pushed a change to annotated tag upstream/0.93.0+dfsg in repository quakespasm. at 2860055 (tag) tagging 9145c6da599416838cb4eb6235651af36fb67926 (commit) replaces upstream/0.92.1+dfsg tagged by Stephen Kitt on Thu Nov 23 17:41:26 2017 +0100 - Log - Upstream version 0.93.0+dfsg Stephen Kitt (1): New upstream version 0.93.0+dfsg --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/quakespasm.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[quakespasm] annotated tag debian/0.93.0+dfsg-1 created (now 52bf709)
This is an automated email from the git hooks/post-receive script. skitt pushed a change to annotated tag debian/0.93.0+dfsg-1 in repository quakespasm. at 52bf709 (tag) tagging a490774835501bbfa2e5738a8e08266c7fd6fa14 (commit) replaces debian/0.92.1+dfsg-3 tagged by Stephen Kitt on Thu Nov 23 18:40:46 2017 +0100 - Log - quakespasm Debian release 0.93.0+dfsg-1 -BEGIN PGP SIGNATURE- iQIzBAABCgAdFiEEednFjFDWtapl1TDBdZd4qaNrSU8FAloXCB4ACgkQdZd4qaNr SU8iCxAAjg/e+okbTg27P/aCRPoiIHeIDtftx+Yf++UVXD6ydSd/E78pkN2LnDUl CaiwaW/uxIrQ8GA+ZIfMGk5WhKmYws50QaFy9QVu8PfPnVH6skqZMldXfdXVoLYK aRurWykJMzKPNeHDV4XVwaqweS7SNCzvEuOPA9f929llZskzc5ay7KLHUj448t5i P4X0RK8QRSxPQMPR8tu2RxJvuIfpTvG3kACwfTvnQcRORqeRSRPhJ9nJfyvM/V4k g2crlTP48Sn3DWtxiKTWNBrx9pUATSTmv6D3rOdtVMYxsORe/zpKtp+BJs19/Wfw NPbe6beTSFzCu6TzG414oAsRmmOL5ocQe0VnPtwrbvzH7HW7NHN5XzXcJCLKMqSU rm198hEFK013FDyN1tGxKtKLGgCMQh+0cnA+p4eMZmnNSeujQsUlhg3f3n85WmV1 0B1PciczzPijYr7UZuJyoTpsnO8Q3+NCIRsTlSrdWNy6u8qmna2j71Lb3TbSVqsM FVeR7nTFqwQdI9AOaE/caO4phh1yAM0jmWBfjSVnH0i2c6Ij2ssBb7fo9+hMtX1D cO3GsdQwFvgWmPhXQWLhabkY+SPN6NiUl4fx3Cv4PiJabzHap4Do0q+9V3PtwV8j Tfv+DpJa05sCO/NLSASqoHGllprAjDCePNNtIpKDGrwCnueZDus= =tIhw -END PGP SIGNATURE- Stephen Kitt (4): New upstream version 0.93.0+dfsg Merge tag 'upstream/0.93.0+dfsg' New upstream release Release --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/quakespasm.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[quakespasm] 03/03: New upstream release
This is an automated email from the git hooks/post-receive script. skitt pushed a commit to branch master in repository quakespasm. commit 62cc8b7be7adec882ea40980f440f686de7bfc84 Author: Stephen Kitt Date: Thu Nov 23 17:58:00 2017 +0100 New upstream release --- debian/changelog| 8 +++- debian/copyright| 72 +++-- debian/patches/reproducible-build.patch | 8 ++-- debian/patches/spelling-fixes.patch | 42 +++ 4 files changed, 93 insertions(+), 37 deletions(-) diff --git a/debian/changelog b/debian/changelog index fb80353..d6b2552 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +quakespasm (0.93.0+dfsg-1) UNRELEASED; urgency=medium + + * New upstream release. + + -- Stephen Kitt Thu, 23 Nov 2017 17:46:32 +0100 + quakespasm (0.92.1+dfsg-3) unstable; urgency=medium * d/copyright: Use https Format URL @@ -152,7 +158,7 @@ quakespasm (0.85.6-1) unstable; urgency=low upstream-provided patch in Misc/homedir_0.patch. * Add the VCS URLs. * Add myself to uploaders. - + [ Simon McVittie ] * debian/patches/gnu.patch: add "gnu" as an OS type, so compilation can at least be attempted on Hurd and kFreeBSD diff --git a/debian/copyright b/debian/copyright index 4c6b886..95d88e6 100644 --- a/debian/copyright +++ b/debian/copyright @@ -7,7 +7,7 @@ Files: * Copyright: 1996-2005 Id Software, Inc. 2002-2009 John Fitzgibbons and others 2007-2008 Kistian Duske - 2007-2013 O. Sezer + 2007-2016 O. Sezer 2010-2014 QuakeSpasm developers License: GPL-2+ @@ -16,9 +16,13 @@ Copyright: 2014 Sander van Dijk License: ISC Files: Quake/filenames.h -Copyright: 2000, 2001, 2007 Free Software Foundation, Inc. +Copyright: 2000-2016 Free Software Foundation, Inc. License: GPL-2+ +Files: Quake/lodepng.* +Copyright: 2005-2017 Lode Vandevenne +License: zlib + Files: Quake/q_ctype.h Copyright: 1998 Red Hat Software, Inc. License: GPL-2+ @@ -48,14 +52,19 @@ Comment: Parts of this file are based on the decoder tutorial program madlld under the BSD-3-clause license. +Files: Quake/stb_image_write.h +Copyright: 2017 Sean Barrett +License: MIT or unlicense + Files: Quake/strlcat.c Quake/strlcpy.c Copyright: 1998 Todd C. Miller License: ISC Files: debian/* -Copyright: 2011 David Banks - 2015-2016 Stephen Kitt +Copyright: 2011-2013 David Banks + 2011-2013, 2016-2017 Simon McVittie + 2012, 2015-2017 Stephen Kitt License: GPL-2+ License: GPL-2+ @@ -112,3 +121,58 @@ License: BSD-3-clause OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +License: MIT + Permission is hereby granted, free of charge, to any person obtaining a copy of + this software and associated documentation files (the "Software"), to deal in + the Software without restriction, including without limitation the rights to + use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies + of the Software, and to permit persons to whom the Software is furnished to do + so, subject to the following conditions: + The above copyright notice and this permission notice shall be included in all + copies or substantial portions of the Software. + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. + +License: unlicense + This is free and unencumbered software released into the public domain. + Anyone is free to copy, modify, publish, use, compile, sell, or distribute this + software, either in source code form or as a compiled binary, for any purpose, + commercial or non-commercial, and by any means. + In jurisdictions that recognize copyright laws, the author or authors of this + software dedicate any and all copyright interest in the software to the public + domain. We make this dedication for the benefit of the public at large and to + the detriment of our heirs and successors. We intend this dedication to be an + overt act of relinquishment in perpetuity of all present and future rights to + this software under copyright law. + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS BE LIABLE F
[quakespasm] branch upstream updated (1444155 -> 9145c6d)
This is an automated email from the git hooks/post-receive script. skitt pushed a change to branch upstream in repository quakespasm. from 1444155 Imported Upstream version 0.92.1+dfsg new 9145c6d New upstream version 0.93.0+dfsg The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: Linux/CodeBlocks/QuakeSpasm-SDL2.cbp |8 +- Linux/CodeBlocks/QuakeSpasm.cbp |8 +- Linux/sgml/Quakespasm.sgml | 49 +- Misc/fs_search_order.patch |6 +- Misc/mk_header.c |1 + Misc/quake_retexturing_project.patch | 12 +- Quake/Makefile | 18 +- Quake/Makefile.darwin| 27 +- Quake/Makefile.w32 | 22 +- Quake/Makefile.w64 | 20 +- Quake/OWMakefile.win32 | 236 ++ Quake/arch_def.h | 14 +- Quake/bspfile.h |6 +- Quake/cl_input.c |7 +- Quake/cl_main.c | 37 +- Quake/cl_parse.c |6 +- Quake/client.h |8 +- Quake/cmd.c | 61 +- Quake/common.c | 111 +- Quake/common.h | 28 +- Quake/console.c | 20 +- Quake/console.h | 12 +- Quake/crc.c |2 +- Quake/crc.h |2 +- Quake/filenames.h| 15 +- Quake/gl_draw.c | 14 +- Quake/gl_model.c | 78 +- Quake/gl_model.h |2 + Quake/gl_refrag.c| 112 +- Quake/gl_rmain.c | 118 +- Quake/gl_rmisc.c |1 + Quake/gl_screen.c| 60 +- Quake/gl_texmgr.c|5 +- Quake/gl_vidsdl.c| 259 +- Quake/gl_warp.c |4 +- Quake/glquake.h |5 + Quake/host.c | 16 +- Quake/host_cmd.c | 174 +- Quake/image.c| 136 +- Quake/image.h|8 +- Quake/in_sdl.c | 39 +- Quake/lodepng.c | 6225 ++ Quake/lodepng.h | 1762 ++ Quake/main_sdl.c |5 +- Quake/mathlib.c | 15 +- Quake/menu.c | 49 +- Quake/net_defs.h |3 + Quake/net_dgrm.c |3 +- Quake/net_udp.c | 11 + Quake/net_wins.c |6 + Quake/pl_osx.m |2 +- Quake/pr_cmds.c | 30 +- Quake/pr_edict.c | 23 +- Quake/pr_exec.c |2 +- Quake/progs.h|7 +- Quake/q_stdinc.h | 56 +- Quake/quakedef.h | 39 +- Quake/r_alias.c | 45 +- Quake/r_brush.c |2 +- Quake/r_part.c |1 + Quake/r_world.c | 218 +- Quake/render.h |3 - Quake/sbar.c |6 +- Quake/server.h |4 +- Quake/snd_codec.c|8 +- Quake/snd_flac.c |6 +- Quake/snd_mix.c | 26 +- Quake/snd_modplug.c | 121 - Quake/snd_modplug.h | 12 - Quake/snd_sdl.c |2 +- Quake/snd_xmp.c | 168 + Quake/snd_xmp.h | 12 + Quake/stb_image_write.h | 684 Quake/sv_main.c | 23 +- Quake/sv_move.c |2 +- Quake/sys.h | 11 +- Quake/sys_sdl_win.c | 11 +- Quake/vid.h |1 + Quake/view.c | 33 + Quake/wad.c |6 +- Quake/world.c| 102 +- Quakespasm.html | 107 +- Quakespasm.txt | 193 +- 83 files changed, 10976 insertions(+), 836 deletions(-) create mode 100644 Quake/OWMakefile.win32 create mode 100644 Quake/lodepng.c create mode 100644 Quake/lodepng.h delete mode 100644 Quake/snd_modplug.c delete mode 100644 Quake/snd_modplug.h create mode 100644 Quake/snd_xmp.c create mode 100644 Quake/snd_xmp.h create mode 100644 Quake/stb_image_write.h -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/quakespasm.git __
[quakespasm] 01/01: pristine-tar data for quakespasm_0.93.0+dfsg.orig.tar.gz
This is an automated email from the git hooks/post-receive script. skitt pushed a commit to branch pristine-tar in repository quakespasm. commit 3282a0fb57131bbad92a2dfc773600f8e54e9f2e Author: Stephen Kitt Date: Thu Nov 23 17:41:26 2017 +0100 pristine-tar data for quakespasm_0.93.0+dfsg.orig.tar.gz --- quakespasm_0.93.0+dfsg.orig.tar.gz.delta | Bin 0 -> 753995 bytes quakespasm_0.93.0+dfsg.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/quakespasm_0.93.0+dfsg.orig.tar.gz.delta b/quakespasm_0.93.0+dfsg.orig.tar.gz.delta new file mode 100644 index 000..80bc642 Binary files /dev/null and b/quakespasm_0.93.0+dfsg.orig.tar.gz.delta differ diff --git a/quakespasm_0.93.0+dfsg.orig.tar.gz.id b/quakespasm_0.93.0+dfsg.orig.tar.gz.id new file mode 100644 index 000..4da2457 --- /dev/null +++ b/quakespasm_0.93.0+dfsg.orig.tar.gz.id @@ -0,0 +1 @@ +6db1df8f23ce08203b3f38740ae63fb6e4015d6d -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/quakespasm.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[quakespasm] 02/03: Merge tag 'upstream/0.93.0+dfsg'
This is an automated email from the git hooks/post-receive script. skitt pushed a commit to branch master in repository quakespasm. commit 1a2648f6ee831fc483ed7403ccbe2ae7d8287a4e Merge: d2fd764 9145c6d Author: Stephen Kitt Date: Thu Nov 23 17:41:27 2017 +0100 Merge tag 'upstream/0.93.0+dfsg' Upstream version 0.93.0+dfsg Linux/CodeBlocks/QuakeSpasm-SDL2.cbp |8 +- Linux/CodeBlocks/QuakeSpasm.cbp |8 +- Linux/sgml/Quakespasm.sgml | 49 +- Misc/fs_search_order.patch |6 +- Misc/mk_header.c |1 + Misc/quake_retexturing_project.patch | 12 +- Quake/Makefile | 18 +- Quake/Makefile.darwin| 27 +- Quake/Makefile.w32 | 22 +- Quake/Makefile.w64 | 20 +- Quake/OWMakefile.win32 | 236 ++ Quake/arch_def.h | 14 +- Quake/bspfile.h |6 +- Quake/cl_input.c |7 +- Quake/cl_main.c | 37 +- Quake/cl_parse.c |6 +- Quake/client.h |8 +- Quake/cmd.c | 61 +- Quake/common.c | 111 +- Quake/common.h | 28 +- Quake/console.c | 20 +- Quake/console.h | 12 +- Quake/crc.c |2 +- Quake/crc.h |2 +- Quake/filenames.h| 15 +- Quake/gl_draw.c | 14 +- Quake/gl_model.c | 78 +- Quake/gl_model.h |2 + Quake/gl_refrag.c| 112 +- Quake/gl_rmain.c | 118 +- Quake/gl_rmisc.c |1 + Quake/gl_screen.c| 60 +- Quake/gl_texmgr.c|5 +- Quake/gl_vidsdl.c| 259 +- Quake/gl_warp.c |4 +- Quake/glquake.h |5 + Quake/host.c | 16 +- Quake/host_cmd.c | 174 +- Quake/image.c| 136 +- Quake/image.h|8 +- Quake/in_sdl.c | 39 +- Quake/lodepng.c | 6225 ++ Quake/lodepng.h | 1762 ++ Quake/main_sdl.c |5 +- Quake/mathlib.c | 15 +- Quake/menu.c | 49 +- Quake/net_defs.h |3 + Quake/net_dgrm.c |3 +- Quake/net_udp.c | 11 + Quake/net_wins.c |6 + Quake/pl_osx.m |2 +- Quake/pr_cmds.c | 30 +- Quake/pr_edict.c | 23 +- Quake/pr_exec.c |2 +- Quake/progs.h|7 +- Quake/q_stdinc.h | 56 +- Quake/quakedef.h | 39 +- Quake/r_alias.c | 45 +- Quake/r_brush.c |2 +- Quake/r_part.c |1 + Quake/r_world.c | 218 +- Quake/render.h |3 - Quake/sbar.c |6 +- Quake/server.h |4 +- Quake/snd_codec.c|8 +- Quake/snd_flac.c |6 +- Quake/snd_mix.c | 26 +- Quake/snd_modplug.c | 121 - Quake/snd_modplug.h | 12 - Quake/snd_sdl.c |2 +- Quake/snd_xmp.c | 168 + Quake/snd_xmp.h | 12 + Quake/stb_image_write.h | 684 Quake/sv_main.c | 23 +- Quake/sv_move.c |2 +- Quake/sys.h | 11 +- Quake/sys_sdl_win.c | 11 +- Quake/vid.h |1 + Quake/view.c | 33 + Quake/wad.c |6 +- Quake/world.c| 102 +- Quakespasm.html | 107 +- Quakespasm.txt | 193 +- 83 files changed, 10976 insertions(+), 836 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/quakespasm.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[quakespasm] branch pristine-tar updated (c11750d -> 3282a0f)
This is an automated email from the git hooks/post-receive script. skitt pushed a change to branch pristine-tar in repository quakespasm. from c11750d pristine-tar data for quakespasm_0.92.1+dfsg.orig.tar.gz new 3282a0f pristine-tar data for quakespasm_0.93.0+dfsg.orig.tar.gz The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: quakespasm_0.93.0+dfsg.orig.tar.gz.delta | Bin 0 -> 753995 bytes quakespasm_0.93.0+dfsg.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) create mode 100644 quakespasm_0.93.0+dfsg.orig.tar.gz.delta create mode 100644 quakespasm_0.93.0+dfsg.orig.tar.gz.id -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/quakespasm.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[quakespasm] branch master updated (d2fd764 -> 62cc8b7)
This is an automated email from the git hooks/post-receive script. skitt pushed a change to branch master in repository quakespasm. from d2fd764 0.92.1+dfsg-3 new 9145c6d New upstream version 0.93.0+dfsg new 1a2648f Merge tag 'upstream/0.93.0+dfsg' new 62cc8b7 New upstream release The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: Linux/CodeBlocks/QuakeSpasm-SDL2.cbp|8 +- Linux/CodeBlocks/QuakeSpasm.cbp |8 +- Linux/sgml/Quakespasm.sgml | 49 +- Misc/fs_search_order.patch |6 +- Misc/mk_header.c|1 + Misc/quake_retexturing_project.patch| 12 +- Quake/Makefile | 18 +- Quake/Makefile.darwin | 27 +- Quake/Makefile.w32 | 22 +- Quake/Makefile.w64 | 20 +- Quake/OWMakefile.win32 | 236 ++ Quake/arch_def.h| 14 +- Quake/bspfile.h |6 +- Quake/cl_input.c|7 +- Quake/cl_main.c | 37 +- Quake/cl_parse.c|6 +- Quake/client.h |8 +- Quake/cmd.c | 61 +- Quake/common.c | 111 +- Quake/common.h | 28 +- Quake/console.c | 20 +- Quake/console.h | 12 +- Quake/crc.c |2 +- Quake/crc.h |2 +- Quake/filenames.h | 15 +- Quake/gl_draw.c | 14 +- Quake/gl_model.c| 78 +- Quake/gl_model.h|2 + Quake/gl_refrag.c | 112 +- Quake/gl_rmain.c| 118 +- Quake/gl_rmisc.c|1 + Quake/gl_screen.c | 60 +- Quake/gl_texmgr.c |5 +- Quake/gl_vidsdl.c | 259 +- Quake/gl_warp.c |4 +- Quake/glquake.h |5 + Quake/host.c| 16 +- Quake/host_cmd.c| 174 +- Quake/image.c | 136 +- Quake/image.h |8 +- Quake/in_sdl.c | 39 +- Quake/lodepng.c | 6225 +++ Quake/lodepng.h | 1762 + Quake/main_sdl.c|5 +- Quake/mathlib.c | 15 +- Quake/menu.c| 49 +- Quake/net_defs.h|3 + Quake/net_dgrm.c|3 +- Quake/net_udp.c | 11 + Quake/net_wins.c|6 + Quake/pl_osx.m |2 +- Quake/pr_cmds.c | 30 +- Quake/pr_edict.c| 23 +- Quake/pr_exec.c |2 +- Quake/progs.h |7 +- Quake/q_stdinc.h| 56 +- Quake/quakedef.h| 39 +- Quake/r_alias.c | 45 +- Quake/r_brush.c |2 +- Quake/r_part.c |1 + Quake/r_world.c | 218 +- Quake/render.h |3 - Quake/sbar.c|6 +- Quake/server.h |4 +- Quake/snd_codec.c |8 +- Quake/snd_flac.c|6 +- Quake/snd_mix.c | 26 +- Quake/snd_modplug.c | 121 - Quake/snd_modplug.h | 12 - Quake/snd_sdl.c |2 +- Quake/snd_xmp.c | 168 + Quake/snd_xmp.h | 12 + Quake/stb_image_write.h | 684 Quake/sv_main.c | 23 +- Quake/sv_move.c |2 +- Quake/sys.h | 11 +- Quake/sys_sdl_win.c | 11 +- Quake/vid.h |1 + Quake/view.c| 33 + Quake/wad.c |6 +- Quake/world.c | 102 +- Quakespasm.html | 107 +- Quakespasm.txt | 193 +- debian/changelog|8 +- debian/copyright| 72 +- debian/patches/reproducible-build.patch |8 +- debian/patch
[lgogdownloader] branch upstream updated (845e5b0 -> f75ae64)
This is an automated email from the git hooks/post-receive script. skitt pushed a change to branch upstream in repository lgogdownloader. from 845e5b0 New upstream version 3.2 new f75ae64 New upstream version 3.3 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: CMakeLists.txt| 2 +- include/config.h | 15 +- include/downloader.h | 4 +- include/galaxyapi.h | 8 + include/gamefile.h| 1 + include/globalconstants.h | 18 +- include/util.h| 3 +- main.cpp | 34 +- man/CMakeLists.txt| 4 +- man/lgogdownloader.supplemental.groff | 2 - src/api.cpp | 21 +- src/downloader.cpp| 936 -- src/galaxyapi.cpp | 206 +++- src/gamedetails.cpp | 6 + src/gamefile.cpp | 1 + src/util.cpp | 27 +- src/website.cpp | 20 +- 17 files changed, 779 insertions(+), 529 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/lgogdownloader.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[lgogdownloader] annotated tag upstream/3.3 created (now b341a7b)
This is an automated email from the git hooks/post-receive script. skitt pushed a change to annotated tag upstream/3.3 in repository lgogdownloader. at b341a7b (tag) tagging f75ae64344dd2e65c71fd9ab1e6a20f8250ec6c8 (commit) replaces upstream/3.2 tagged by Stephen Kitt on Tue Nov 7 20:24:03 2017 +0100 - Log - Upstream version 3.3 Stephen Kitt (1): New upstream version 3.3 --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/lgogdownloader.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[lgogdownloader] annotated tag debian/3.3-1 created (now f361b73)
This is an automated email from the git hooks/post-receive script. skitt pushed a change to annotated tag debian/3.3-1 in repository lgogdownloader. at f361b73 (tag) tagging e7c1c02b69cc18f53023f33da05bd07654937567 (commit) replaces debian/3.2-1 tagged by Stephen Kitt on Tue Nov 7 23:05:32 2017 +0100 - Log - lgogdownloader Debian release 3.3-1 -BEGIN PGP SIGNATURE- iQIzBAABCgAdFiEEednFjFDWtapl1TDBdZd4qaNrSU8FAloCLiwACgkQdZd4qaNr SU8Z/w/9E3fJrOWuTLJnHP/NbxPUfnfQ7jYlXe2a12izDKtF8+cfDUjnhD6r2Foh Tl/16ChoZ+S5PseI9u0TwN8l1W3Da9bIpj24bfaga8MT9wgbPUG5ELQN5RcM+h9P oF0wXniRgQW+Q8vlYkDz/NhCa/UsLbhFGFeXmb0w6MX7XGkvhcUOjQJa0Ew5JUkY 5u6TjzeofPhQa9v1922rl0ZXPIiO9O2gtqVqfKCtH/cNdX65FLMSOFEcy1c7bRI3 RNqtffOXlTytakGlw7QqjGiIHHLLrKEU8SSskXjxFh24ebewA4eubTyqoCTGV2qY TtHkmj1jl8HUgjU0+6BmfuL6KgP7E7gPiw93KUHarbo25/hEt3T++on+Cc8TH70Z 3XHP3mY5cbJbjRkzKUtT1SYLejJlOr5YwzK/bpoJhJeFMvbgUY4yNazOOP+RVWDq NVo8Fu9SM04Q1usuMTip0LZRHWz6AeOzVLafs2zSbuvMZCalT70zvUXJtj3ZAYc3 ZCAldMThw+hPqQt5TQuXxH6l0UPGdp0+qAN8vbE3O6oglpwkQ59JNOyYUqne3j9M xOwlLi6Kc+X6hbA2fShqj0Nec4CZVQxR73iv+fls35+VL6pHdigtmfaX9OE8Exa4 tp5bLc6lOs9wotfbGHA4iR6u5/vm6RcaEzOkP7rrWfOmbG4arK4= =1/ti -END PGP SIGNATURE- Stephen Kitt (8): New upstream version 3.3 Merge tag 'upstream/3.3' New upstream release Clean up whitespace in debian/rules Update debian/copyright Standards-Version 4.1.1 Enable building without fakeroot Release --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/lgogdownloader.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[lgogdownloader] branch pristine-tar updated (9c5d8a3 -> 5f8ee3d)
This is an automated email from the git hooks/post-receive script. skitt pushed a change to branch pristine-tar in repository lgogdownloader. from 9c5d8a3 pristine-tar data for lgogdownloader_3.2.orig.tar.gz new 5f8ee3d pristine-tar data for lgogdownloader_3.3.orig.tar.gz The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: lgogdownloader_3.3.orig.tar.gz.delta | Bin 0 -> 2046 bytes lgogdownloader_3.3.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) create mode 100644 lgogdownloader_3.3.orig.tar.gz.delta create mode 100644 lgogdownloader_3.3.orig.tar.gz.id -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/lgogdownloader.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[lgogdownloader] 01/01: pristine-tar data for lgogdownloader_3.3.orig.tar.gz
This is an automated email from the git hooks/post-receive script. skitt pushed a commit to branch pristine-tar in repository lgogdownloader. commit 5f8ee3d7a98d50ce2f68215b0b3df8ce2cecc19b Author: Stephen Kitt Date: Tue Nov 7 20:24:03 2017 +0100 pristine-tar data for lgogdownloader_3.3.orig.tar.gz --- lgogdownloader_3.3.orig.tar.gz.delta | Bin 0 -> 2046 bytes lgogdownloader_3.3.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/lgogdownloader_3.3.orig.tar.gz.delta b/lgogdownloader_3.3.orig.tar.gz.delta new file mode 100644 index 000..1ae2c6a Binary files /dev/null and b/lgogdownloader_3.3.orig.tar.gz.delta differ diff --git a/lgogdownloader_3.3.orig.tar.gz.id b/lgogdownloader_3.3.orig.tar.gz.id new file mode 100644 index 000..8a2d209 --- /dev/null +++ b/lgogdownloader_3.3.orig.tar.gz.id @@ -0,0 +1 @@ +a3b830ec3ef4a500c38b72d63f3fc7de6a7afcc0 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/lgogdownloader.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[lgogdownloader] 01/08: New upstream version 3.3
This is an automated email from the git hooks/post-receive script.
skitt pushed a commit to branch master
in repository lgogdownloader.
commit f75ae64344dd2e65c71fd9ab1e6a20f8250ec6c8
Author: Stephen Kitt
Date: Tue Nov 7 20:24:03 2017 +0100
New upstream version 3.3
---
CMakeLists.txt| 2 +-
include/config.h | 15 +-
include/downloader.h | 4 +-
include/galaxyapi.h | 8 +
include/gamefile.h| 1 +
include/globalconstants.h | 18 +-
include/util.h| 3 +-
main.cpp | 34 +-
man/CMakeLists.txt| 4 +-
man/lgogdownloader.supplemental.groff | 2 -
src/api.cpp | 21 +-
src/downloader.cpp| 936 --
src/galaxyapi.cpp | 206 +++-
src/gamedetails.cpp | 6 +
src/gamefile.cpp | 1 +
src/util.cpp | 27 +-
src/website.cpp | 20 +-
17 files changed, 779 insertions(+), 529 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7614b6f..147dd8b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.0.0 FATAL_ERROR)
-project (lgogdownloader LANGUAGES C CXX VERSION 3.2)
+project (lgogdownloader LANGUAGES C CXX VERSION 3.3)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/")
set(LINK_LIBCRYPTO 0)
diff --git a/include/config.h b/include/config.h
index 5f00b5b..2dbcc21 100644
--- a/include/config.h
+++ b/include/config.h
@@ -36,6 +36,7 @@ struct DownloadConfig
unsigned int iInclude;
unsigned int iGalaxyPlatform;
unsigned int iGalaxyLanguage;
+unsigned int iGalaxyArch;
bool bRemoteXML;
bool bCover;
@@ -65,7 +66,7 @@ class GalaxyConfig
bool isExpired()
{
std::unique_lock lock(m);
-bool bExpired = false;
+bool bExpired = true; // assume that token is expired
intmax_t time_now = time(NULL);
if (this->token_json.isMember("expires_at"))
bExpired = (time_now >
this->token_json["expires_at"].asLargestInt());
@@ -74,14 +75,20 @@ class GalaxyConfig
std::string getAccessToken()
{
+std:: string access_token;
std::unique_lock lock(m);
-return this->token_json["access_token"].asString();
+if (this->token_json.isMember("access_token"))
+access_token = this->token_json["access_token"].asString();
+return access_token;
}
std::string getRefreshToken()
{
+std::string refresh_token;
std::unique_lock lock(m);
-return this->token_json["refresh_token"].asString();
+if (this->token_json.isMember("refresh_token"))
+refresh_token = this->token_json["refresh_token"].asString();
+return refresh_token;
}
Json::Value getJSON()
@@ -180,6 +187,7 @@ struct CurlConfig
bool bVerbose;
std::string sCACertPath;
std::string sCookiePath;
+std::string sUserAgent;
long int iTimeout;
curl_off_t iDownloadRate;
};
@@ -276,6 +284,7 @@ class Config
unsigned int iThreads;
int iWait;
size_t iChunkSize;
+int iProgressInterval;
};
#endif // CONFIG_H__
diff --git a/include/downloader.h b/include/downloader.h
index 3d91a5c..f760bec 100644
--- a/include/downloader.h
+++ b/include/downloader.h
@@ -90,7 +90,7 @@ class Downloader
std::deque< std::pair > TimeAndSize;
void saveGalaxyJSON();
-void galaxyInstallGame(const std::string& product_id, int build_index
= -1);
+void galaxyInstallGame(const std::string& product_id, int build_index
= -1, const unsigned int& iGalaxyArch = GlobalConstants::ARCH_X64);
void galaxyShowBuilds(const std::string& product_id, int build_index =
-1);
protected:
private:
@@ -122,6 +122,8 @@ class Downloader
static size_t writeData(void *ptr, size_t size, size_t nmemb, FILE
*stream);
static size_t readData(void *ptr, size_t size, size_t nmemb, FILE
*stream);
+std::vector galaxyGetOrphanedFiles(const
std::vector& items, const std::string& install_path);
+
Website *gogWebsite;
API *gogAPI;
galaxyAPI *gogGalaxy;
diff --git a/include/galaxyapi.h b/include/galaxyapi.h
index 50260e6..465039e 100644
--- a/include/galaxyapi.h
+++ b/include/galaxyapi.h
@@ -11,6 +11,7 @@
#include "globals.h"
#include "config.h"
#include "util.h"
+#include "gamedetails.h"
#include
#include
[lgogdownloader] 05/08: Update debian/copyright
This is an automated email from the git hooks/post-receive script. skitt pushed a commit to branch master in repository lgogdownloader. commit 63b5582432b950f8db43135aa04cf8d28ee4e2c8 Author: Stephen Kitt Date: Tue Nov 7 20:38:43 2017 +0100 Update debian/copyright --- debian/changelog | 1 + debian/copyright | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index a0c28b2..3b86706 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ lgogdownloader (3.3-1) UNRELEASED; urgency=medium * New upstream release. * Clean up whitespace in debian/rules. + * Update debian/copyright. -- Stephen Kitt Tue, 07 Nov 2017 20:25:45 +0100 diff --git a/debian/copyright b/debian/copyright index 28919ec..fff2156 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: lgogdownloader Source: https://sites.google.com/site/gogdownloader/ @@ -7,7 +7,7 @@ Copyright: none declared License: WTFPL-2 Files: debian/* -Copyright: 2014 Stephen Kitt +Copyright: 2014-2017 Stephen Kitt License: WTFPL-2 License: WTFPL-2 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/lgogdownloader.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[lgogdownloader] branch master updated (9a47330 -> e7c1c02)
This is an automated email from the git hooks/post-receive script. skitt pushed a change to branch master in repository lgogdownloader. from 9a47330 Release new f75ae64 New upstream version 3.3 new a938972 Merge tag 'upstream/3.3' new 752c575 New upstream release new 8e5715c Clean up whitespace in debian/rules new 63b5582 Update debian/copyright new c0adf89 Standards-Version 4.1.1 new 5a77fa8 Enable building without fakeroot new e7c1c02 Release The 8 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: CMakeLists.txt| 2 +- debian/changelog | 10 + debian/control| 3 +- debian/copyright | 4 +- debian/rules | 6 +- include/config.h | 15 +- include/downloader.h | 4 +- include/galaxyapi.h | 8 + include/gamefile.h| 1 + include/globalconstants.h | 18 +- include/util.h| 3 +- main.cpp | 34 +- man/CMakeLists.txt| 4 +- man/lgogdownloader.supplemental.groff | 2 - src/api.cpp | 21 +- src/downloader.cpp| 936 -- src/galaxyapi.cpp | 206 +++- src/gamedetails.cpp | 6 + src/gamefile.cpp | 1 + src/util.cpp | 27 +- src/website.cpp | 20 +- 21 files changed, 794 insertions(+), 537 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/lgogdownloader.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[lgogdownloader] 08/08: Release
This is an automated email from the git hooks/post-receive script. skitt pushed a commit to branch master in repository lgogdownloader. commit e7c1c02b69cc18f53023f33da05bd07654937567 Author: Stephen Kitt Date: Tue Nov 7 23:05:27 2017 +0100 Release --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index bf7a2b0..74b5dd0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -lgogdownloader (3.3-1) UNRELEASED; urgency=medium +lgogdownloader (3.3-1) unstable; urgency=medium * New upstream release. * Clean up whitespace in debian/rules. @@ -6,7 +6,7 @@ lgogdownloader (3.3-1) UNRELEASED; urgency=medium * Standards-Version 4.1.1, no further change required. * Enable building without fakeroot. - -- Stephen Kitt Tue, 07 Nov 2017 20:25:45 +0100 + -- Stephen Kitt Tue, 07 Nov 2017 23:05:20 +0100 lgogdownloader (3.2-1) unstable; urgency=medium -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/lgogdownloader.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[lgogdownloader] 04/08: Clean up whitespace in debian/rules
This is an automated email from the git hooks/post-receive script. skitt pushed a commit to branch master in repository lgogdownloader. commit 8e5715c1e28a80047089cb89847252162a6861f2 Author: Stephen Kitt Date: Tue Nov 7 20:37:56 2017 +0100 Clean up whitespace in debian/rules --- debian/changelog | 1 + debian/rules | 6 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9435d97..a0c28b2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ lgogdownloader (3.3-1) UNRELEASED; urgency=medium * New upstream release. + * Clean up whitespace in debian/rules. -- Stephen Kitt Tue, 07 Nov 2017 20:25:45 +0100 diff --git a/debian/rules b/debian/rules index 700cb18..83afd54 100755 --- a/debian/rules +++ b/debian/rules @@ -4,8 +4,4 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all %: - dh $@ - - - - + dh $@ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/lgogdownloader.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[lgogdownloader] 06/08: Standards-Version 4.1.1
This is an automated email from the git hooks/post-receive script. skitt pushed a commit to branch master in repository lgogdownloader. commit c0adf89c4342f2158bc1f571de085c938e64c135 Author: Stephen Kitt Date: Tue Nov 7 20:43:33 2017 +0100 Standards-Version 4.1.1 --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 3b86706..d1c79db 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ lgogdownloader (3.3-1) UNRELEASED; urgency=medium * New upstream release. * Clean up whitespace in debian/rules. * Update debian/copyright. + * Standards-Version 4.1.1, no further change required. -- Stephen Kitt Tue, 07 Nov 2017 20:25:45 +0100 diff --git a/debian/control b/debian/control index 8047759..2ecb6c7 100644 --- a/debian/control +++ b/debian/control @@ -19,7 +19,7 @@ Build-Depends: cmake, libssl-dev, libtinyxml2-dev, pkg-config -Standards-Version: 3.9.8 +Standards-Version: 4.1.1 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-games/lgogdownloader.git Vcs-Git: https://anonscm.debian.org/git/pkg-games/lgogdownloader.git Homepage: https://sites.google.com/site/gogdownloader/ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/lgogdownloader.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[lgogdownloader] 03/08: New upstream release
This is an automated email from the git hooks/post-receive script. skitt pushed a commit to branch master in repository lgogdownloader. commit 752c575bbaac5d3c92ebdeb26800ec3311ba5ff7 Author: Stephen Kitt Date: Tue Nov 7 20:37:29 2017 +0100 New upstream release --- debian/changelog | 6 ++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 7371b43..9435d97 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +lgogdownloader (3.3-1) UNRELEASED; urgency=medium + + * New upstream release. + + -- Stephen Kitt Tue, 07 Nov 2017 20:25:45 +0100 + lgogdownloader (3.2-1) unstable; urgency=medium * New upstream release. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/lgogdownloader.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[lgogdownloader] 02/08: Merge tag 'upstream/3.3'
This is an automated email from the git hooks/post-receive script. skitt pushed a commit to branch master in repository lgogdownloader. commit a9389726173b17d1822b5014235c47fbcf9da1a9 Merge: 9a47330 f75ae64 Author: Stephen Kitt Date: Tue Nov 7 20:24:03 2017 +0100 Merge tag 'upstream/3.3' Upstream version 3.3 CMakeLists.txt| 2 +- include/config.h | 15 +- include/downloader.h | 4 +- include/galaxyapi.h | 8 + include/gamefile.h| 1 + include/globalconstants.h | 18 +- include/util.h| 3 +- main.cpp | 34 +- man/CMakeLists.txt| 4 +- man/lgogdownloader.supplemental.groff | 2 - src/api.cpp | 21 +- src/downloader.cpp| 936 -- src/galaxyapi.cpp | 206 +++- src/gamedetails.cpp | 6 + src/gamefile.cpp | 1 + src/util.cpp | 27 +- src/website.cpp | 20 +- 17 files changed, 779 insertions(+), 529 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/lgogdownloader.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[lgogdownloader] 07/08: Enable building without fakeroot
This is an automated email from the git hooks/post-receive script. skitt pushed a commit to branch master in repository lgogdownloader. commit 5a77fa86968b29ac131b847e66e7c97bfab8c7bf Author: Stephen Kitt Date: Tue Nov 7 23:05:08 2017 +0100 Enable building without fakeroot --- debian/changelog | 1 + debian/control | 1 + 2 files changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index d1c79db..bf7a2b0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ lgogdownloader (3.3-1) UNRELEASED; urgency=medium * Clean up whitespace in debian/rules. * Update debian/copyright. * Standards-Version 4.1.1, no further change required. + * Enable building without fakeroot. -- Stephen Kitt Tue, 07 Nov 2017 20:25:45 +0100 diff --git a/debian/control b/debian/control index 2ecb6c7..c9cb564 100644 --- a/debian/control +++ b/debian/control @@ -20,6 +20,7 @@ Build-Depends: cmake, libtinyxml2-dev, pkg-config Standards-Version: 4.1.1 +Rules-Requires-Root: no Vcs-Browser: https://anonscm.debian.org/cgit/pkg-games/lgogdownloader.git Vcs-Git: https://anonscm.debian.org/git/pkg-games/lgogdownloader.git Homepage: https://sites.google.com/site/gogdownloader/ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/lgogdownloader.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[rocksndiamonds] annotated tag debian/4.0.1.0+dfsg-1 created (now e697461)
This is an automated email from the git hooks/post-receive script. skitt pushed a change to annotated tag debian/4.0.1.0+dfsg-1 in repository rocksndiamonds. at e697461 (tag) tagging da993e6409b877713e81412d631cb789a577e061 (commit) replaces debian/4.0.0.2+dfsg-2 tagged by Stephen Kitt on Sat Oct 21 23:16:29 2017 +0200 - Log - rocksndiamonds Debian release 4.0.1.0+dfsg-1 -BEGIN PGP SIGNATURE- iQIzBAABCgAdFiEEednFjFDWtapl1TDBdZd4qaNrSU8FAlnruS0ACgkQdZd4qaNr SU9AJBAAnc3Gwg/ke8uLpDUPTyqfeL7+bZ93GJKIy2+01HBfM8+yc1qsNs7GaVeN euBSvx0iPax0m9gVAjVipEFgvOythxekj5znz1jwI9PB24YzX2rQX0BYOASLCm4I 4+uYuzsflnju7LcqSFHDjDAO/XqLMPPqy3jNazWFcHmxEnInsMz13mfJi4jjoMg+ rKLIaBNXKJGMKo+aN7k0zmtkFGWgkBg8Ne+PCJDd2QBScoDd5LxNThiYyTRa9MFL M7ns/ty+lPCWXA5qfvDhUGHZZMBIipWFgbr6tyQoh2Aqy1/wKpT/z4J6Pc+5p7VX lO+nDurgjBuU8pcs34LjJosv4kiw0y7yuAJvzGlBr3YEp7Ph3Nb+LIsAVeCYKg6p ze4SN3orI0KwafURLKjPnf29lPpy4912QWmF58me1exl+P8urZJMnjVFm8ZmSgtl m2IeKTG5d3EMswQ7yGUL0/DZB8X00YLn3utFghs/icxC18Mw1NFxirZPCvzlXpET FE5QlHI16yZkXwLZz3/2LOrtD7yDcfKs1DyesW6uyY/ebB3jQMbjF7ib3aJqUKxL oRq57Q7LNq3nlhnuMYAFth38DGfELN9K/RmVI4DYL7D99jwI0ZU5hBnG53i+9Y0Z iH2IUxy7ZBmYjWpL+CavsZJgNLyfoBFUy17jQ6jl+5L8/IgUoY0= =0rVG -END PGP SIGNATURE- Stephen Kitt (9): New upstream version 4.0.1.0+dfsg Merge tag 'upstream/4.0.1.0+dfsg' New upstream release Switch to secured upstream URL in debian/watch Change priority to “optional” Fix a couple of spelling mistakes Enable hardening build flags Standards-Version 4.1.1 Release --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/rocksndiamonds.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[rocksndiamonds] annotated tag upstream/4.0.1.0+dfsg created (now 262f0df)
This is an automated email from the git hooks/post-receive script. skitt pushed a change to annotated tag upstream/4.0.1.0+dfsg in repository rocksndiamonds. at 262f0df (tag) tagging 92f36cc62d865d2dd98cc08d944acbe4e1cc2cfe (commit) replaces upstream/4.0.0.2+dfsg tagged by Stephen Kitt on Fri Oct 20 21:55:13 2017 +0200 - Log - Upstream version 4.0.1.0+dfsg Stephen Kitt (1): New upstream version 4.0.1.0+dfsg --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/rocksndiamonds.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
