[openjk] 02/05: New snapshot with source files for icons, and some licensing fixes

Simon McVittie smcv at debian.org
Mon Mar 23 22:39:20 UTC 2015 

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

smcv pushed a commit to branch master
in repository openjk.

commit dd43cb6e63d0bfe47ca99a47c6a5088c240fa0a6
Author: Simon McVittie <smcv at debian.org>
Date:   Mon Mar 23 21:31:36 2015 +0000

    New snapshot with source files for icons, and some licensing fixes
---
 debian/changelog |  4 +--
 debian/copyright | 98 ++++++++++++++++++++++++++++++++------------------------
 debian/rules     | 21 ++++++------
 3 files changed, 68 insertions(+), 55 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b39c143..17bf9cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-openjk (0~20150318+ds1-1) UNRELEASED; urgency=low
+openjk (0~20150323+ds1-1) UNRELEASED; urgency=low
 
   * Initial release. (Closes: #739486)
 
- -- Simon McVittie <smcv at debian.org>  Thu, 19 Mar 2015 08:34:41 +0000
+ -- Simon McVittie <smcv at debian.org>  Mon, 23 Mar 2015 21:23:11 +0000
diff --git a/debian/copyright b/debian/copyright
index a7d2e6b..af6787b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,8 +3,6 @@ Upstream-Name: OpenJK
 Source: https://github.com/JACoders/OpenJK/
 License: GPL-2
 Files-Excluded:
- CMakeModules/FindJPEG.cmake
- CMakeModules/FindPNG.cmake
  code*/client/OpenAL
  code*/client/eax
  code*/*.dll
@@ -80,6 +78,7 @@ Comment:
 
 Files: *
 Copyright:
+ © 1997 Tomas Möller
  © 1999-2005 Id Software, Inc.
  © 2000-2013 Raven Software, Inc.
  © 2001-2013 Activision, Inc.
@@ -88,6 +87,8 @@ Copyright:
 License: GPL-2
 
 Files:
+ code/mp3code/*
+ codemp/mp3code/*
  codemp/client/cl_avi.cpp
  code*/qcommon/md4.cpp
  shared/sdl/sdl_sound.cpp
@@ -95,27 +96,36 @@ Files:
  shared/sys/con_tty.cpp
  shared/sys/con_win32.cpp
 Copyright:
+ © 1995-1997 Xing Technology
+ © 1998-1999 EMusic.com
  © 1997-1998 Andrew Tridgell
  © 1999-2005 Id Software, Inc.
  © 2005-2006 Tim Angus
 License: GPL-2+
+ mp3code taken from "FreeAmp - The Free MP3 Player", which was
+ later renamed to Zinf due to trademark issues, and was in Debian
+ under that name until it was removed due to unfixed bugs in 2007.
+ Other modules mostly from ioquake3.
 
 Files:
- code/mp3code/*
- codemp/mp3code/*
+ code*/macosx/OpenJK.icns
+ code/win32/starwars.ico
+ codemp/win32/icon.ico
+ shared/icons/*
+ shared/sdl/sdl_icon.h
 Copyright:
- © 1995-1997 Xing Technology
- © 1998-1999 EMusic.com
-License: GPL-2+
-Comment:
- Apparently taken from "FreeAmp - The Free MP3 Player", which was
- later renamed to Zinf due to trademark issues, and was in Debian
- under that name until it was removed due to unfixed bugs in 2007.
+ © 2013 Antonio Aiello
+License: Expat
 
 Files:
+ CMakeModules/FindJPEG.cmake
+ CMakeModules/FindPNG.cmake
  CMakeModules/FindSDL2.cmake
+ CMakeModules/InstallZIP.cmake
 Copyright:
- © 2003-2009 Kitware, Inc.
+ © 2000-2009 Kitware, Inc.
+ © 2000-2009 Insight Software Consortium
+ © 2015 OpenJK contributors
 License: BSD-3-clause-cmake
 
 Files:
@@ -137,32 +147,36 @@ Copyright:
  © 1998-2005 Gilles Vollant
  © 1990-2000 Info-Zip
 License: zlib
+Comment:
+ This is a subset of libminizip, modified to use the Quake 3 engine's
+ Z_Malloc "zone" (memory pool) allocator.
 
 Files:
  code/rd-*/glext.h
 Copyright:
  © 2013-2014 The Khronos Group Inc.
-License: glext-permissive
+License: Expat
 
 # ==== LICENSE TEXTS ===================================================
 
 License: GPL-2
- Jedi Academy is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2
- as published by the Free Software Foundation.
+ OpenJK is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License version 2 as
+ published by the Free Software Foundation.
  .
- Jedi Academy is distributed in the hope that it will be useful,
+ This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  GNU General Public License for more details.
  .
  You should have received a copy of the GNU General Public License
- along with Jedi Academy.  If not, see <http://www.gnu.org/licenses/>.
+ along with this program; if not, see <http://www.gnu.org/licenses/>.
 Comment:
  See /usr/share/common-licenses/GPL-2 for a copy of the GPL version 2.
  .
- Some files have the same license grant but with "Jedi Academy" replaced
- by "Jedi Knight 2" or "OpenJK".
+ Some files have the same license grant with trivial differences,
+ e.g. "This program" instead of OpenJK, or different details for
+ contacting the FSF.
 
 License: GPL-2+
  Quake III Arena source code is free software; you can redistribute it
@@ -181,9 +195,9 @@ License: GPL-2+
 Comment:
  See /usr/share/common-licenses/GPL-2 for a copy of the GPL version 2.
  .
- Some files have the same license grant but with "This program"
- or similar text instead of "Quake III Arena", or with different details for
- contacting the FSF.
+ Some files have the same license grant with trivial differences,
+ e.g. "This program" instead of "Quake III Arena source code", or
+ different details for contacting the FSF.
 
 License: zlib
  This software is provided 'as-is', without any express or implied
@@ -256,25 +270,25 @@ License: BSD-3-clause-cmake
  (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: glext-permissive
- Permission is hereby granted, free of charge, to any person obtaining a
- copy of this software and/or associated documentation files (the
- "Materials"), to deal in the Materials without restriction, including
- without limitation the rights to use, copy, modify, merge, publish,
- distribute, sublicense, and/or sell copies of the Materials, and to
- permit persons to whom the Materials are furnished to do so, subject to
- the following conditions:
+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 Materials.
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
  .
- THE MATERIALS ARE 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
- MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
+ 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:
- The same as the Expat (MIT/X11) license, except that it says Materials
- instead of Software
+ The license of code*/rd-*/glext.h is a trivial variation on this license:
+ it says "the Materials" instead of "the Software", and replaces
+ "software and associated documentation" with "software and/or documentation".
diff --git a/debian/rules b/debian/rules
index ad4ff07..5fc2704 100755
--- a/debian/rules
+++ b/debian/rules
@@ -95,13 +95,14 @@ override_dh_auto_install: debian/icons
 
 debian/icons: debian/rules
 	install -d debian/icons/512 debian/icons/128 \
-		debian/icons/32 debian/icons/16
-	icns2png -x code/macosx/OpenJK.icns
-	mv OpenJK_512x512x32.png debian/icons/512/openjk.png
-	mv OpenJK_128x128x32.png debian/icons/128/openjk.png
-	mv OpenJK_32x32x32.png debian/icons/32/openjk.png
+		debian/icons/64 debian/icons/32 debian/icons/16
+	install -m644 shared/icons/OpenJK_Icon_128.png debian/icons/128/openjk.png
+	install -m644 shared/icons/OpenJK_Icon_64.png debian/icons/64/openjk.png
+	install -m644 shared/icons/OpenJK_Icon_32.png debian/icons/32/openjk.png
+	install -m644 shared/icons/OpenJK_Icon_16.png debian/icons/16/openjk.png
+	convert -resize 512x512 shared/icons/OpenJK_Icon_1024.png \
+		debian/icons/512/openjk.png
 	convert debian/icons/32/openjk.png debian/icons/openjk.xpm
-	mv OpenJK_16x16x32.png debian/icons/16/openjk.png
 
 # no libraries here, only plugins
 override_dh_makeshlibs:
@@ -119,10 +120,10 @@ override_dh_clean:
 ORIG_REPO ?= https://github.com/JACoders/OpenJK
 ORIG_REL =
 # Empty if it's a release
-ORIG_REV = eb70ecaf184caf54f3c28973b726ce847d77fb22
+ORIG_REV = f56cc41bc80bbf9656cf56020b9eabede7d9b076
 # Use the date of the ORIG_REV, or 20130426.1 if you snapshot twice in a day,
 # or empty if ORIG_REV is
-ORIG_DATE = 20150318
+ORIG_DATE = 20150323
 ORIG_SUFFIX = +ds1
 
 ifeq (${ORIG_REV},)
@@ -146,8 +147,6 @@ get-orig-source:
 		--format=tar \
 		--prefix=openjk-${ORIG_VER}.orig/ \
 		${ORIG_EXPORT} | tar -xvf-
-	rm -fr openjk-${ORIG_VER}.orig/CMakeModules/FindJPEG.cmake
-	rm -fr openjk-${ORIG_VER}.orig/CMakeModules/FindPNG.cmake
 	rm -fr openjk-${ORIG_VER}.orig/code*/client/OpenAL
 	rm -fr openjk-${ORIG_VER}.orig/code*/client/eax
 	rm -fr openjk-${ORIG_VER}.orig/code*/*.dll
@@ -158,7 +157,7 @@ get-orig-source:
 	rm -fr openjk-${ORIG_VER}.orig/lib/zlib
 	rm -fr openjk-${ORIG_VER}.orig/tools/Assimilate
 	rm -fr openjk-${ORIG_VER}.orig/tools/ModView
-	rm -fr openjk-${ORIG_VER}.orig/tools/Ibize/[^i]*
+	rm -fr openjk-${ORIG_VER}.orig/tools/Ibize/[!i]*
 	rm -fr openjk-${ORIG_VER}.orig/tools/Ibize/ibize.cpp
 	rm -fr openjk-${ORIG_VER}.orig/tools/Ibize/interpreter.h
 	rm -fr openjk-${ORIG_VER}.orig/tools/create_soundbank

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

More information about the Pkg-games-commits mailing list