[darkplaces] 03/12: Stop excluding snd_3dras* from the tarball

[Simon McVittie]

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

smcv pushed a commit to branch master
in repository darkplaces.

commit 25a3cb3ecf3231d61411c244cb5b7d128a402b41
Author: Simon McVittie <smcv at debian.org>
Date:   Thu Apr 2 09:41:10 2015 +0100

    Stop excluding snd_3dras* from the tarball
    
    They appear to have been contributed to DarkPlaces by the author of
    the 3DRAS library, so there's no particular reason to worry about
    their license.
---
 debian/changelog |  3 +++
 debian/copyright | 46 +++++++++++++++++++++++++++++++++++++++++-----
 debian/gbp.conf  |  1 -
 debian/rules     |  1 -
 4 files changed, 44 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cc872a6..99ef0a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 darkplaces (0~20130304+svn11952-3) UNRELEASED; urgency=medium
 
   * Switch Vcs-Browser to cgit and https
+  * Stop excluding snd_3dras* from the tarball: they appear to have
+    been contributed to DarkPlaces by the author of the 3DRAS library,
+    so there's no particular reason to worry about their license
 
  -- Simon McVittie <smcv at debian.org>  Sun, 15 Feb 2015 16:26:51 +0000
 
diff --git a/debian/copyright b/debian/copyright
index 9e88934..7eed06b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -46,11 +46,6 @@ Comment:
   snd_modplug.c, snd_ogg.c and world.c contain minimal declarations from the
   headers of the relevant libraries, all of which are under GPL-compatible
   licenses.
-  .
-  The following files were omitted from the orig tarball:
-  .
-  snd_3dras*: potentially derived from third-party "3DRAS" library with
-  unknown license, and not used on Linux
 
 Files: debian/*
 Copyright: © 2011-2013 David Banks
@@ -98,6 +93,27 @@ License: public-domain
   .
   This software is in the public domain. Share and enjoy!
 
+Files: snd_3dras.?
+Copyright: © 2008 "Qantourisc"
+License: GPL-2+ and zlib
+Comment:
+  The svn log says "Patch from Qantourisc adding support for his 3D
+  sound library" and the files have a comment "BSD", so they were
+  presumably contributed by the copyright holder under some GPL-compatible
+  version of the BSD license. Since 3DRAS, by the same author, is
+  zlib-licensed, that is presumably the BSD-style license that was intended.
+
+Files: snd_3dras_typedefs.h
+Copyright: © 2008 "Qantourisc"
+License: zlib
+Comment:
+  The file does not contain a copyright statement or license grant, but
+  it appears to have been copied verbatim from ./src/misc/typedefs.h in
+  <http://sourceforge.net/projects/threedras/files/3DRAS/block/3DRAS_blocks.tar.bz2/download>
+  which is released under the zlib license as quoted below. The license
+  grant "This licence below applies to all the files included in this project"
+  appears in ./Copyright.txt in that tarball.
+
 Files: utf8lib.c
 Copyright: © 2009-2011 Rudolf Polzer (divverent)
            © 2009 "blub"
@@ -208,4 +224,24 @@ License: Unicode
   use or other dealings in these Data Files or Software without prior
   written authorization of the copyright holder.
 
+License: zlib
+  This software is provided 'as-is', without any express or implied
+  warranty. In no event will the authors be held liable for any damages
+  arising from the use of this software.
+  .
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+  .
+  1. 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
+  appreciated but is not required.
+  .
+  2. Altered source versions must be plainly marked as such, and must not be
+  misrepresented as being the original software.
+  .
+  3. This notice may not be removed or altered from any source
+  distribution.
+
 # vim:set et sw=2 sts=2:
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 133ecac..e59a70b 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -3,4 +3,3 @@ compression = gzip
 
 [git-import-orig]
 pristine-tar = True
-filter = ["snd_3dras*"]
diff --git a/debian/rules b/debian/rules
index 0bcd810..76c6496 100755
--- a/debian/rules
+++ b/debian/rules
@@ -89,6 +89,5 @@ ORIG_EXPORT := -r ${ORIG_REV} svn://svn.icculus.org/twilight/trunk/darkplaces
 
 get-orig-source:
 	svn export ${ORIG_EXPORT} darkplaces-${ORIG_VER}.orig
-	rm -rf darkplaces-${ORIG_VER}.orig/snd_3dras*
 	tar -zcvf darkplaces_${ORIG_VER}.orig.tar.gz darkplaces-${ORIG_VER}.orig
 	rm -rf darkplaces-${ORIG_VER}.orig

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