[scummvm] 01/03: New upstream release [1.9.0]
Dmitry Smirnov
onlyjob at moszumanska.debian.org
Fri Nov 11 12:52:31 UTC 2016
This is an automated email from the git hooks/post-receive script.
onlyjob pushed a commit to branch master
in repository scummvm.
commit 8730ca0
Author: Dmitry Smirnov <onlyjob at member.fsf.org>
Date: Fri Nov 11 12:21:41 2016
New upstream release [1.9.0]
---
debian/changelog | 7 +++
debian/copyright | 82 ++++++++++++++++++++++++++----------
debian/patches/disable-arm-asm.patch | 2 +-
debian/patches/libsdl2.patch | 18 --------
debian/patches/series | 1 -
5 files changed, 68 insertions(+), 42 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 7ac83dc..a244947 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+scummvm (1.9.0+dfsg-1) unstable; urgency=medium
+
+ * New upstream release [October 2016].
+ * Removed obsolete "libsdl2.patch".
+
+ -- Dmitry Smirnov <onlyjob at debian.org> Fri, 11 Nov 2016 23:17:07 +1100
+
scummvm (1.8.1+dfsg-1) unstable; urgency=medium
* New upstream release [May 2016].
diff --git a/debian/copyright b/debian/copyright
index 0091f40..bd2068a 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: ScummVM
Source: http://www.scummvm.org/
Comment:
@@ -121,27 +121,6 @@ Comment:
Files: engines/sword25/util/lua/*
Copyright: 1994-2008 Lua.org, PUC-Rio.
License: Expat
- 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.
-Comment:
- This license also known as "MIT/X11 (BSD like)" or "MIT" however FSF
- consider "MIT" labelling ambiguous and copyright-format specification
- recommend to label such license as "Expat".
Files: engines/wintermute/utils/convert_utf.*
Copyright: 2001-2004 Unicode, Inc.
@@ -170,6 +149,42 @@ License: public-domain-crc
notice must not be changed or removed and no warranty is either
expressed or implied by its publication or distribution.
+Files:
+ engines/wage/combat.cpp
+ engines/wage/design.cpp
+ engines/wage/design.h
+ engines/wage/dialog.cpp
+ 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
+ engines/wage/randomhat.h
+ engines/wage/saveload.cpp
+ engines/wage/script.cpp
+ engines/wage/script.h
+ engines/wage/sound.cpp
+ engines/wage/sound.h
+ engines/wage/util.cpp
+ engines/wage/wage.cpp
+ engines/wage/wage.h
+ engines/wage/world.cpp
+ engines/wage/world.h
+Copyright:
+ 2001-2016 The ScummVM Project
+ 2009 Alexei Svitkine, Eugene Sandulenko
+License: GPL-2+ and Expat
+
+Files:
+ graphics/nine_patch.cpp
+ graphics/nine_patch.h
+Copyright:
+ 2001-2016 The ScummVM Project
+ 2011 Matthew Leverton
+License: GPL-2+ and Expat
+
Files: gui/themes/fonts/Free*.ttf
gui/themes/scummmodern/Free*.ttf
Copyright: 2002-2009 Free Software Foundation.
@@ -333,3 +348,26 @@ License: LGPL-2.1+
.
On Debian systems, the complete text of the GNU Library General Public License
can be found in the file `/usr/share/common-licenses/LGPL-2.1'.
+
+License: Expat
+ 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.
+Comment:
+ This license also known as "MIT/X11 (BSD like)" or "MIT" however FSF
+ consider "MIT" labelling ambiguous and copyright-format specification
+ recommend to label such license as "Expat".
diff --git a/debian/patches/disable-arm-asm.patch b/debian/patches/disable-arm-asm.patch
index 2c545b5..59e6a0d 100644
--- a/debian/patches/disable-arm-asm.patch
+++ b/debian/patches/disable-arm-asm.patch
@@ -8,7 +8,7 @@ Description: disable arm asm
--- a/configure
+++ b/configure
-@@ -2126,17 +2126,17 @@
+@@ -2196,17 +2196,17 @@
arm-apple-darwin11)
;;
diff --git a/debian/patches/libsdl2.patch b/debian/patches/libsdl2.patch
deleted file mode 100644
index 8e8ae31..0000000
--- a/debian/patches/libsdl2.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Last-Update: 2016-06-06
-Forwarded: https://github.com/scummvm/scummvm/pull/707
-Author: Dmitry Smirnov <onlyjob at member.fsf.org>
-Description: search for "sdl2-config"
-
---- a/configure
-+++ b/configure
-@@ -184,9 +184,9 @@
- _amigaospath="Games:ScummVM"
- _staticlibpath=
- _xcodetoolspath=
- _sparklepath=
--_sdlconfig=sdl-config
-+_sdlconfig=sdl2-config
- _freetypeconfig=freetype-config
- _sdlpath="$PATH"
- _freetypepath="$PATH"
- _nasmpath="$PATH"
diff --git a/debian/patches/series b/debian/patches/series
index 855d5fa..221a637 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
disable-arm-asm.patch
-libsdl2.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/scummvm.git
More information about the Pkg-games-commits
mailing list