[residualvm] 04/04: New upstream release [0.2.0] + cleanup + changelog summary

Dmitry Smirnov onlyjob at moszumanska.debian.org
Sun Jan 4 03:25:00 UTC 2015 

This is an automated email from the git hooks/post-receive script.

onlyjob pushed a commit to branch master
in repository residualvm.

commit 8932ee7 (HEAD, master)
Author: Dmitry Smirnov <onlyjob at member.fsf.org>
Date:   Sat Jan 3 23:34:12 2015

    New upstream release [0.2.0] + cleanup + changelog summary
---
 debian/changelog               |  12 ++++
 debian/control                 |   3 +
 debian/copyright               | 121 +++++++++++++++++++++++----------
 debian/patches/series          |   1 -
 debian/patches/spelling.patch  | 147 -----------------------------------------
 debian/residualvm-data.install |   5 +-
 debian/residualvm.docs         |   2 +-
 debian/rules                   |  21 +-----
 8 files changed, 106 insertions(+), 206 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2b85ec9..c3dc4d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+residualvm (0.2.0+dfsg-1) experimental; urgency=low
+
+  * New upstream release [December 2014].
+  * Added "Myst III" to long package description.
+  * Added "debian/gbp.conf".
+  * Standards-Version: 3.9.6.
+  * Copyright: added "Files-Excluded" section; minor updates.
+  * Build with all hardening.
+  * Minor clean-up; dropped obsolete "spelling.patch".
+
+ -- Dmitry Smirnov <onlyjob at debian.org>  Sun, 04 Jan 2015 10:38:37 +1100
+
 residualvm (0.1.1+dfsg-3) unstable; urgency=medium
 
   * Added "pre-clean.patch" to fix `make clean` before 'configure'
diff --git a/debian/control b/debian/control
index c930c8b..fa84742 100644
--- a/debian/control
+++ b/debian/control
@@ -36,6 +36,7 @@ Description: interpreter to play LucasArts' Lua-based 3D adventures
  their data files):
  .
   * Grim Fandango
+  * Myst III
   * Escape from Monkey Island (not working yet)
  .
  ResidualVM utilizes OpenGL for 3D graphics hardware acceleration.
@@ -52,6 +53,7 @@ Description: interpreter to play LucasArts' Lua-based 3D adventures (data files)
  their data files):
  .
   * Grim Fandango
+  * Myst III
   * Escape from Monkey Island (not working yet)
  .
  ResidualVM utilizes OpenGL for 3D graphics hardware acceleration.
@@ -70,6 +72,7 @@ Description: interpreter to play LucasArts' Lua-based 3D adventures (data files)
 # their data files):
 # .
 #  * Grim Fandango
+#  * Myst III
 #  * Escape from Monkey Island (not working yet)
 # .
 # ResidualVM utilizes OpenGL for 3D graphics hardware acceleration.
diff --git a/debian/copyright b/debian/copyright
index 31debb8..04e27d4 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,56 +1,59 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: ResidualVM
 Source: http://residualvm.org/
+Files-Excluded:
+    gui/themes/fonts/topaz
+    gui/themes/fonts/Arial*
+    dists/android/libs/ouya-sdk.jar
 
 Files: *
-Copyright: 2001-2013 ResidualVM team
+Copyright: 2001-2014 ResidualVM team
            2002-2011 The DOSBox Team
-           2011-2012 The ScummVM Project
+           2011-2014 The ScummVM Project
                      and others listed in COPYRIGHT file
 License: GPL-2+
 Comment:
  See list of copyright holders in "/usr/share/doc/residualvm/COPYRIGHT".
  See list of upstream authors in "/usr/share/doc/residualvm/AUTHORS".
+ .
+ Portions of the following files are Expat licensed:
+  * engines/grim/gfx_base.cpp
+  * engines/grim/gfx_opengl_shaders.cpp
+  * engines/myst3/gfx_opengl_shaders.cpp
 
-Files: audio/softsynth/mt32/.*
-Copyright: 2003-2006,2008,2009,2011 Dean Beeler
-           2003-2006,2008,2009,2011 Jerome Fisher
-           2011                     Sergey V. Mikayev
+Files: audio/softsynth/mt32/*
+Copyright: 2003-2006,2008-2009,2011-2014 Dean Beeler
+           2003-2006,2008,2009,2011-2014 Jerome Fisher
+           2011-2014                     Sergey V. Mikayev
 License: LGPL-2.1+
 
-Files: audio/softsynth/mt32/freeverb.*
+Files: math/quat.cpp
+       math/matrix4.cpp
+Copyright: 2013-2014 ResidualVM team
+           1999      Kevin B. Thompson <kevinbthompson at yahoo.com>
+           2000-2001 Brett Porter <brettporter at yahoo.com>
+License: GPL-2+
+Comment:
+ Based on LGPL-2.1 code from Portalib3d which no longer is available on the
+ net, but was used in the iconoclast-project:
+ http://code.google.com/p/iconoclast/
+
+Files: gui/themes/fonts/fixed5x8*
+       graphics/fonts/consolefont.cpp
 Copyright: not-applicable
 License: Public-Domain
- This code is public domain
+ Public domain font. Share and enjoy.
 
 Files: engines/grim/lua/*
 Copyright: 1994-2011 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.
+License: Lua or Expat
 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".
- .
  According to "http://www.lua.org/license.html", before Lua 5.0, Lua
  used its own license but now all previous versions were re-licensed
  under above terms.
+ .
+ Upstream still uses LUA license due to concerns that modifications
+ may not be automatically re-licensed.
 
 Files: gui/themes/fonts/Free*.ttf
        gui/themes/modern/Free*.ttf
@@ -71,7 +74,7 @@ License: GPL-3+
 
 Files: gui/themes/fonts/clR6x12*.bdf
 Copyright: 1989 Dale Schumacher <dal at syntel.mn.org>
-License:
+License: BSD-like
  Permission to use, copy, modify, and distribute this software and
  its documentation for any purpose and without fee is hereby
  granted, provided that the above copyright notice appear in all
@@ -91,7 +94,7 @@ License: public-domain
 Files: gui/themes/fonts/helv*.bdf
 Copyright: 1984-1989,1994 Adobe Systems Incorporated.
            1988,1994      Digital Equipment Corporation.
-License:
+License: Adobe-BSD-like
  Adobe is a trademark of Adobe Systems Incorporated which may be
  registered in certain jurisdictions.
  Permission to use these trademarks is hereby granted only in
@@ -130,7 +133,6 @@ License: Zlib
 
 Files: graphics/yuv_to_rgb.cpp
        graphics/yuva_to_rgba.cpp
-       video/mpeg_player.cpp
 Copyright: 2001-2012 The ScummVM Project
 License: GPL-2+
 Comment: portions copyright as below
@@ -217,7 +219,7 @@ Copyright: 2008 Sandia Corporation
 License: LGPL-2.1+
 
 Files: debian/*
-Copyright: 2013-2014 Dmitry Smirnov <onlyjob at debian.org>
+Copyright: 2013-2015 Dmitry Smirnov <onlyjob at debian.org>
 License: GPL-2+
 
 License: GPL-2+
@@ -247,3 +249,54 @@ 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".
+
+License: Lua
+ Copyright (c) 1994-1998 TeCGraf, PUC-Rio.  All rights reserved.
+ .
+ Permission is hereby granted, without written agreement and without license
+ or royalty fees, to use, copy, modify, and distribute this software and its
+ documentation for any purpose, including commercial applications, subject to
+ the following conditions:
+ .
+  - The above copyright notice and this permission notice shall appear in all
+    copies or substantial portions of this software.
+ .
+  - The origin of this software must not be misrepresented; you must not
+    claim that you wrote the original software. If you use this software in a
+    product, an acknowledgment in the product documentation would be greatly
+    appreciated (but it is not required).
+ .
+  - Altered source versions must be plainly marked as such, and must not be
+    misrepresented as being the original software.
+ .
+ The authors specifically disclaim any warranties, including, but not limited
+ to, the implied warranties of merchantability and fitness for a particular
+ purpose.  The software provided hereunder is on an "as is" basis, and the
+ authors have no obligation to provide maintenance, support, updates,
+ enhancements, or modifications.  In no event shall TeCGraf, PUC-Rio, or the
+ authors be held liable to any party for direct, indirect, special,
+ incidental, or consequential damages arising out of the use of this software
+ and its documentation.
diff --git a/debian/patches/series b/debian/patches/series
index 7c8fb04..eb71c72 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 pre-clean.patch
-spelling.patch
diff --git a/debian/patches/spelling.patch b/debian/patches/spelling.patch
deleted file mode 100644
index 4c7fa18..0000000
--- a/debian/patches/spelling.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-Last-Update: 2013-01-02
-Author: Dmitry Smirnov <onlyjob at member.fsf.org>
-Forwarded: https://github.com/residualvm/residualvm/pull/722
-Description: spelling corrections
-
---- a/backends/audiocd/audiocd.h
-+++ b/backends/audiocd/audiocd.h
-@@ -109,9 +109,9 @@
- 
- 	/**
- 	 * Initialize the specified CD drive for audio playback.
- 	 * @param drive the drive id
--	 * @return true if the CD drive was inited succesfully
-+	 * @return true if the CD drive was inited successfully
- 	 */
- 	virtual bool openCD(int drive) = 0;
- 
- 	/**
---- a/engines/grim/grim.cpp
-+++ b/engines/grim/grim.cpp
-@@ -744,45 +744,45 @@
- 	delete _currSet;
- 	_currSet = NULL;
- 
- 	Bitmap::getPool().restoreObjects(_savedState);
--	Debug::debug(Debug::Engine, "Bitmaps restored succesfully.");
-+	Debug::debug(Debug::Engine, "Bitmaps restored successfully.");
- 
- 	Font::getPool().restoreObjects(_savedState);
--	Debug::debug(Debug::Engine, "Fonts restored succesfully.");
-+	Debug::debug(Debug::Engine, "Fonts restored successfully.");
- 
- 	ObjectState::getPool().restoreObjects(_savedState);
--	Debug::debug(Debug::Engine, "ObjectStates restored succesfully.");
-+	Debug::debug(Debug::Engine, "ObjectStates restored successfully.");
- 
- 	Set::getPool().restoreObjects(_savedState);
--	Debug::debug(Debug::Engine, "Sets restored succesfully.");
-+	Debug::debug(Debug::Engine, "Sets restored successfully.");
- 
- 	TextObject::getPool().restoreObjects(_savedState);
--	Debug::debug(Debug::Engine, "TextObjects restored succesfully.");
-+	Debug::debug(Debug::Engine, "TextObjects restored successfully.");
- 
- 	PrimitiveObject::getPool().restoreObjects(_savedState);
--	Debug::debug(Debug::Engine, "PrimitiveObjects restored succesfully.");
-+	Debug::debug(Debug::Engine, "PrimitiveObjects restored successfully.");
- 
- 	Actor::getPool().restoreObjects(_savedState);
--	Debug::debug(Debug::Engine, "Actors restored succesfully.");
-+	Debug::debug(Debug::Engine, "Actors restored successfully.");
- 
- 	restoreGRIM();
--	Debug::debug(Debug::Engine, "Engine restored succesfully.");
-+	Debug::debug(Debug::Engine, "Engine restored successfully.");
- 
- 	g_driver->restoreState(_savedState);
--	Debug::debug(Debug::Engine, "Renderer restored succesfully.");
-+	Debug::debug(Debug::Engine, "Renderer restored successfully.");
- 
- 	g_imuse->restoreState(_savedState);
--	Debug::debug(Debug::Engine, "iMuse restored succesfully.");
-+	Debug::debug(Debug::Engine, "iMuse restored successfully.");
- 
- 	g_movie->restoreState(_savedState);
--	Debug::debug(Debug::Engine, "Movie restored succesfully.");
-+	Debug::debug(Debug::Engine, "Movie restored successfully.");
- 
- 	_iris->restoreState(_savedState);
--	Debug::debug(Debug::Engine, "Iris restored succesfully.");
-+	Debug::debug(Debug::Engine, "Iris restored successfully.");
- 
- 	lua_Restore(_savedState);
--	Debug::debug(Debug::Engine, "Lua restored succesfully.");
-+	Debug::debug(Debug::Engine, "Lua restored successfully.");
- 
- 	delete _savedState;
- 
- 	//Re-read the values, since we may have been in some state that changed them when loading the savegame,
-@@ -896,42 +896,42 @@
- 
- 	savegameCallback();
- 
- 	Bitmap::getPool().saveObjects(_savedState);
--	Debug::debug(Debug::Engine, "Bitmaps saved succesfully.");
-+	Debug::debug(Debug::Engine, "Bitmaps saved successfully.");
- 
- 	Font::getPool().saveObjects(_savedState);
--	Debug::debug(Debug::Engine, "Fonts saved succesfully.");
-+	Debug::debug(Debug::Engine, "Fonts saved successfully.");
- 
- 	ObjectState::getPool().saveObjects(_savedState);
--	Debug::debug(Debug::Engine, "ObjectStates saved succesfully.");
-+	Debug::debug(Debug::Engine, "ObjectStates saved successfully.");
- 
- 	Set::getPool().saveObjects(_savedState);
--	Debug::debug(Debug::Engine, "Sets saved succesfully.");
-+	Debug::debug(Debug::Engine, "Sets saved successfully.");
- 
- 	TextObject::getPool().saveObjects(_savedState);
--	Debug::debug(Debug::Engine, "TextObjects saved succesfully.");
-+	Debug::debug(Debug::Engine, "TextObjects saved successfully.");
- 
- 	PrimitiveObject::getPool().saveObjects(_savedState);
--	Debug::debug(Debug::Engine, "PrimitiveObjects saved succesfully.");
-+	Debug::debug(Debug::Engine, "PrimitiveObjects saved successfully.");
- 
- 	Actor::getPool().saveObjects(_savedState);
--	Debug::debug(Debug::Engine, "Actors saved succesfully.");
-+	Debug::debug(Debug::Engine, "Actors saved successfully.");
- 
- 	saveGRIM();
--	Debug::debug(Debug::Engine, "Engine saved succesfully.");
-+	Debug::debug(Debug::Engine, "Engine saved successfully.");
- 
- 	g_driver->saveState(_savedState);
--	Debug::debug(Debug::Engine, "Renderer saved succesfully.");
-+	Debug::debug(Debug::Engine, "Renderer saved successfully.");
- 
- 	g_imuse->saveState(_savedState);
--	Debug::debug(Debug::Engine, "iMuse saved succesfully.");
-+	Debug::debug(Debug::Engine, "iMuse saved successfully.");
- 
- 	g_movie->saveState(_savedState);
--	Debug::debug(Debug::Engine, "Movie saved succesfully.");
-+	Debug::debug(Debug::Engine, "Movie saved successfully.");
- 
- 	_iris->saveState(_savedState);
--	Debug::debug(Debug::Engine, "Iris saved succesfully.");
-+	Debug::debug(Debug::Engine, "Iris saved successfully.");
- 
- 	lua_Save(_savedState);
- 
- 	delete _savedState;
---- a/engines/grim/patchr.cpp
-+++ b/engines/grim/patchr.cpp
-@@ -371,9 +371,9 @@
- 
- 		PatchedFile *pf = new PatchedFile;
- 		if (pf->load(rs, patchfile)) {
- 			rs = Common::wrapBufferedSeekableReadStream(pf, 1024, DisposeAfterUse::YES);
--			Debug::debug(Debug::Patchr, "Patch for %s sucessfully loaded", filename.c_str());
-+			Debug::debug(Debug::Patchr, "Patch for %s successfully loaded", filename.c_str());
- 			break;
- 		}
- 
- 		delete pf;
diff --git a/debian/residualvm-data.install b/debian/residualvm-data.install
index c9ea3b8..3285109 100644
--- a/debian/residualvm-data.install
+++ b/debian/residualvm-data.install
@@ -1,4 +1,3 @@
-dists/engine-data/*.lab		usr/share/residualvm
-gui/themes/modern.zip		usr/share/residualvm
-icons/residualvm.svg		usr/share/pixmaps
+usr/share/icons
+usr/share/residualvm
 icons/residualvm.xpm		usr/share/pixmaps
diff --git a/debian/residualvm.docs b/debian/residualvm.docs
index 9e3f5b7..eea6310 100644
--- a/debian/residualvm.docs
+++ b/debian/residualvm.docs
@@ -1,6 +1,6 @@
 AUTHORS
 COPYRIGHT
 KNOWN_BUGS
-README
+README.md
 TODO
 doc/*
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index 57ccab4..470979b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,7 +32,6 @@ override_dh_auto_build:
 	dh_auto_build
 
 override_dh_auto_test:
-	chmod +x test/cxxtest/cxxtestgen.py    # correcting permissions
 	-dh_auto_test
 
 override_dh_installchangelogs:
@@ -47,30 +46,12 @@ override_dh_strip:
 override_dh_gencontrol:
 	dh_gencontrol -- -Vmy:Built-Using="$(foreach pkg,fonts-freefont-ttf,$(word 2,$(shell dpkg --status $(pkg) | grep Source)) (=$(word 2,$(shell dpkg --status $(pkg) | grep Version))),)"
 
-override_dh_builddeb:
-	dh_builddeb -- -Zxz
-
 # get-orig-source
 PKD  = $(abspath $(dir $(MAKEFILE_LIST)))
 PKG  = $(word 2,$(shell dpkg-parsechangelog -l$(PKD)/changelog | grep ^Source))
 VER ?= $(shell dpkg-parsechangelog -l$(PKD)/changelog | perl -ne 'print $$1 if m{Version:\s*([\d\.]+)}')
 DTYPE := +dfsg
 .PHONY: get-orig-source
-get-orig-source: $(PKG)_$(VER)$(DTYPE).orig.tar.xz
-	@
-
-$(PKG)_$(VER)$(DTYPE).orig.tar.xz:
+get-orig-source:
 	@echo "# Downloading..."
 	uscan --noconf --verbose --rename --destdir=$(CURDIR) --check-dirname-level=0 --force-download --download-version $(VER) $(PKD)
-	@echo "# Extracting..."
-	mkdir $(PKG)-$(VER) \
-	&& tar xf $(PKG)_$(VER).orig.tar.* --directory $(PKG)-$(VER) --strip-components 1 \
-	|| $(RM) -r $(PKG)-$(VER)
-	@echo "# Clean-up..."
-	cd $(PKG)-$(VER) \
-	&& $(RM) -r -v \
-             gui/themes/fonts/topaz    \
-             gui/themes/fonts/Arial*
-	@echo "# Packing..."
-	tar -caf "$(PKG)_$(VER)$(DTYPE).orig.tar.xz" "$(PKG)-$(VER)" \
-	&& $(RM) -r "$(PKG)-$(VER)"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/residualvm.git

More information about the Pkg-games-commits mailing list