[dhewm3] 05/13: Change to dfsg suffix due to the unclear licenses of jpeg_memory_src.*

Thu Mar 12 10:25:02 UTC 2015

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

tobi pushed a commit to branch master
in repository dhewm3.

commit b48f7675a52ac5b95780949a52b0565d2b81159c
Author: Tobias Frost <tobi at coldtobi.de>
Date:   Thu Mar 12 09:31:24 2015 +0100

    Change to dfsg suffix due to the unclear licenses of jpeg_memory_src.*
---
 debian/README.source |  8 +++++---
 debian/copyright     | 44 +++++++++++++++++++++++---------------------
 debian/rules         |  2 +-
 3 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/debian/README.source b/debian/README.source
index 76ee192..4e621b7 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -8,9 +8,11 @@ With the help of this target, the upstream tarball can be regenerated.
 
 Several files will removed from the archive: Binaries, Windows executeables,
 dlls and files only needed to build non-Unix architectures.
+neo/renderer/jpeg_memory_src.* has been removed as the README describing the
+distribution license is not in the tarball. (removed for DFSG compliance).
 
-Please see the get-orgig-source target in debian/rules or the Files-Excluded
-entry in debian/copyright for the complete list.
+Please the Files-Excluded entry in debian/copyright for the complete list
+of removed files.
 
 To retrieve the latest upstream version you can set the date with the VER
 variable, set to the format YYYYMMDD. If not set, the date from
@@ -42,4 +44,4 @@ The game engine is currently packed for the contrib section, aa there is no
 free game data known. If you know about DFSG-free content, please let me
 know.
 
- -- Tobias Frost <tobi at debian.org>  Sat, 14 Feb 2015 13:49:22 +0100
+ -- Tobias Frost <tobi at debian.org>  Thu, 12 Mar 2015 09:24:14 +0100
diff --git a/debian/copyright b/debian/copyright
index 3f168e3..c6de1a1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,10 +2,13 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: dhewm3
 Source: https://github.com/dhewm/dhewm3
 Comment: The removed files contained prebuilt binaries and we do not need those.
+  The jpeg_memory_src.* have been removed due the missing README -- which
+  defines the license for those two files.
 
 Files-Excluded: neo/tools/common/PropTree/* neo/sys/win32/*
      neo/sys/linux/setup/*/bin neo/sys/linux/setup/lokisetup
      neo/sys/linux/setup/image-* neo/sys/linux/setup/makeself/*
+     neo/renderer/jpeg_memory_src.*
 
 Files: *
 Copyright: 1999-2011 id Software LLC, a ZeniMax Media company
@@ -140,6 +143,26 @@ Files: neo/sys/linux/setup/brandelf.c
 Copyright: 1996 Søren Schmidt
 License: BSD-2-clause
 
+Files: debian/*
+Copyright: 2015 Tobias Frost <tobi at debian.org>
+License: GPL-3+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This package 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 this program. If not, see <http://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
+
+
 License: BSD-2-clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
@@ -171,24 +194,3 @@ License: zlib
  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.
-
-
-
-Files: debian/*
-Copyright: 2015 Tobias Frost <tobi at debian.org>
-License: GPL-3+
- This package is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
- .
- This package 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 this program. If not, see <http://www.gnu.org/licenses/>
- .
- On Debian systems, the complete text of the GNU General
- Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
diff --git a/debian/rules b/debian/rules
index d54ce1e..b5796a0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,7 +19,7 @@ UURL =  https://github.com/dhewm/dhewm3.git
 PKD   = $(abspath $(dir $(MAKEFILE_LIST)))
 PKG   = $(word 2,$(shell dpkg-parsechangelog -l$(PKD)/changelog | grep ^Source))
 VER  ?= $(shell dpkg-parsechangelog -l$(PKD)/changelog  -SVersion | sed -e s/^.*git// -e s/+repack// | cut -d- -f1 )
-DTYPE = +repack
+DTYPE = +dfsg
 UPSVER ?= $(shell dpkg-parsechangelog -l$(PKD)/changelog -SVersion | cut -d+ -f1)
 
 ## from: https://wiki.debian.org/onlyjob/get-orig-source

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

