[openjk] 02/07: No need to exclude 2 out of 3 copies of glext.h any more

Simon McVittie smcv at debian.org
Sun Feb 8 21:54:14 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 1784192f43545d6ac82bad587a2537578259b90d
Author: Simon McVittie <smcv at debian.org>
Date:   Sun Feb 8 17:28:15 2015 +0000

    No need to exclude 2 out of 3 copies of glext.h any more
    
    2 out of 3 copies now have a less inconvenient license (MIT/X11
    variant rather than SGI Free B v1.1). The third is entirely unused,
    so we don't need to patch the build system to not need it.
---
 debian/copyright                                   | 39 ++++++++++++--
 .../patches/Only-require-glext.h-on-Windows.patch  | 61 ----------------------
 debian/patches/series                              |  1 -
 debian/rules                                       |  2 +-
 4 files changed, 36 insertions(+), 67 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index fabb7af..df02c3b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,7 +7,7 @@ Files-Excluded:
  CMakeModules/FindPNG.cmake
  code*/client/OpenAL
  code*/client/eax
- code*/rd-*/glext.h
+ codemp/rd-dedicated/glext.h
  code*/*.dll
  lib/*.lib
  lib/jpeg-8c
@@ -81,7 +81,7 @@ Comment:
  EAX is only relevant on Windows, and the license of the bundled DLL
  is unknown.
  .
- glext.h is only used on Windows, and the copy bundled in OpenJK is
+ rd-dedicated/glext.h is only used on Windows, and the copy bundled in OpenJK is
  under an annoyingly verbose license.
  .
  The tools directory is not needed for the main OpenJK build, apart from
@@ -129,7 +129,7 @@ Files:
  CMakeModules/GetGitRevisionDescription.cmake*
 Copyright:
  © 2009-2010 Iowa State University
-License: boost
+License: boost-permissive
 
 Files:
  code/qcommon/md4.cpp
@@ -158,6 +158,12 @@ Copyright:
  © 1990-2000 Info-Zip
 License: zlib
 
+Files:
+ code/rd-*/glext.h
+Copyright:
+ © 2013-2014 The Khronos Group Inc.
+License: glext-permissive
+
 # ==== LICENSE TEXTS ===================================================
 
 License: GPL-2
@@ -231,7 +237,7 @@ License: zlib
     misrepresented as being the original software.
  3. This notice may not be removed or altered from any source distribution.
 
-License: boost
+License: boost-permissive
  Permission is hereby granted, free of charge, to any person or organization
  obtaining a copy of the software and accompanying documentation covered by
  this license (the "Software") to use, reproduce, display, distribute,
@@ -253,6 +259,8 @@ License: boost
  FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
  ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  DEALINGS IN THE SOFTWARE.
+Comment:
+ Very similar to the Expat (MIT/X11) license
 
 License: BSD-3-clause-cmake
  Redistribution and use in source and binary forms, with or without
@@ -282,3 +290,26 @@ License: BSD-3-clause-cmake
  THEORY 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: 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:
+ .
+ The above copyright notice and this permission notice shall be included
+ in all copies or substantial portions of the Materials.
+ .
+ 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.
+Comment:
+ The same as the Expat (MIT/X11) license, except that it says Materials
+ instead of Software
diff --git a/debian/patches/Only-require-glext.h-on-Windows.patch b/debian/patches/Only-require-glext.h-on-Windows.patch
deleted file mode 100644
index 96ed35b..0000000
--- a/debian/patches/Only-require-glext.h-on-Windows.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From: Simon McVittie <smcv at debian.org>
-Date: Thu, 25 Dec 2014 23:55:35 +0000
-Subject: Only require glext.h on Windows
-
-The license of the version shipped in OpenJK is Free, but is annoyingly
-verbose; removing it is easier than putting it in debian/copyright.
-
-Forwarded: not needed, Debian-specific
----
- code/rd-vanilla/CMakeLists.txt   | 6 +++++-
- codemp/rd-vanilla/CMakeLists.txt | 6 +++++-
- 2 files changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/code/rd-vanilla/CMakeLists.txt b/code/rd-vanilla/CMakeLists.txt
-index 41edc95..4e00534 100644
---- a/code/rd-vanilla/CMakeLists.txt
-+++ b/code/rd-vanilla/CMakeLists.txt
-@@ -118,7 +118,6 @@ if(BuildSPRdVanilla OR BuildJK2SPRdVanilla)
- 
- 	# main files
- 	set(SPRDVanillaMainFiles
--		"${SPDir}/rd-vanilla/glext.h"
- 		"${SPDir}/rd-vanilla/qgl.h"
- 		"${SPDir}/rd-vanilla/tr_arb.cpp"
- 		"${SPDir}/rd-vanilla/tr_backend.cpp"
-@@ -154,6 +153,11 @@ if(BuildSPRdVanilla OR BuildJK2SPRdVanilla)
- 		"${SPDir}/rd-vanilla/tr_WorldEffects.h"
- 		)
- 	source_group("renderer" FILES ${SPRDVanillaMainFiles})
-+
-+	if(WIN32)
-+		set(SPRDVanillaMainFiles ${SPRDVanillaMainFiles} "${SPDir}/rd-vanilla/glext.h")
-+	endif()
-+
- 	set(SPRDVanillaFiles ${SPRDVanillaFiles} ${SPRDVanillaMainFiles})
- 
- 	set(SPRDVanillaRdCommonFiles
-diff --git a/codemp/rd-vanilla/CMakeLists.txt b/codemp/rd-vanilla/CMakeLists.txt
-index bc4c09d..1b05ba0 100644
---- a/codemp/rd-vanilla/CMakeLists.txt
-+++ b/codemp/rd-vanilla/CMakeLists.txt
-@@ -9,7 +9,6 @@ set(MPVanillaRendererIncludeDirectories ${MPDir})
- set(MPVanillaRendererIncludeDirectories ${MPVanillaRendererIncludeDirectories} "${MPDir}/rd-vanilla")
- 
- set(MPVanillaRendererFiles
--	"${MPDir}/rd-vanilla/glext.h"
- 	"${MPDir}/rd-vanilla/qgl.h"
- 	"${MPDir}/rd-vanilla/G2_API.cpp"
- 	"${MPDir}/rd-vanilla/G2_bolts.cpp"
-@@ -47,6 +46,11 @@ set(MPVanillaRendererFiles
- 	"${MPDir}/rd-vanilla/tr_WorldEffects.cpp"
- 	"${MPDir}/rd-vanilla/tr_WorldEffects.h"
- 	)
-+
-+if(WIN32)
-+	set(MPVanillaRendererFiles ${MPVanillaRendererFiles} "${MPDir}/rd-vanilla/glext.h")
-+endif()
-+
- source_group("renderer" FILES ${MPVanillaRendererFiles})
- 
- set(MPVanillaRendererGhoul2Files
diff --git a/debian/patches/series b/debian/patches/series
index ecf72e8..a233f30 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-Only-require-glext.h-on-Windows.patch
 g_utils-stub-out-debug-code-to-write-to-a-misc-Windo.patch
 Don-t-link-renderer-and-clients-to-a-bunch-of-unnece.patch
 Use-NET_Sleep-or-Sys_Sleep-for-SP-to-avoid-busy-wait.patch
diff --git a/debian/rules b/debian/rules
index 7320007..fe6b243 100755
--- a/debian/rules
+++ b/debian/rules
@@ -150,7 +150,7 @@ get-orig-source:
 	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*/rd-*/glext.h
+	rm -fr openjk-${ORIG_VER}.orig/codemp/rd-dedicated/glext.h
 	rm -fr openjk-${ORIG_VER}.orig/code*/*.dll
 	rm -fr openjk-${ORIG_VER}.orig/lib/*.lib
 	rm -fr openjk-${ORIG_VER}.orig/lib/jpeg-*

-- 
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