[game-data-packager] 01/01: add license: true when applicable, prune extraneous files

Alexandre Detiste detiste-guest at moszumanska.debian.org
Tue Mar 3 10:44:12 UTC 2015


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

detiste-guest pushed a commit to branch master
in repository game-data-packager.

commit 19553086eea7add926f867daa0e68883a7debff5
Author: Alexandre Detiste <alexandre.detiste at gmail.com>
Date:   Tue Mar 3 11:40:53 2015 +0100

    add license: true when applicable, prune extraneous files
    
    "If it was available during packaging, the full license
    appears in /usr/share/doc/grimfandango-demo-data/license.txt."
    
    --> this is now dynamically handled
---
 data/doom3.yaml                                |  2 ++
 data/grimfandango-data.copyright               | 25 -------------------------
 data/grimfandango-demo-data.copyright          | 21 ---------------------
 data/grimfandango.yaml                         |  2 ++
 data/hexen2-demo-data.copyright                | 22 ----------------------
 data/hexen2.yaml                               |  1 +
 data/quake.yaml                                |  5 +++++
 data/quake2.yaml                               | 10 ++++++++++
 data/quake3.yaml                               |  7 +++++++
 data/spear-of-destiny-data.copyright           | 20 --------------------
 data/spear-of-destiny-demo-data.copyright      | 20 --------------------
 data/spear-of-destiny-mission2-data.copyright  | 20 --------------------
 data/spear-of-destiny-mission3-data.control.in |  4 ----
 data/spear-of-destiny-mission3-data.copyright  | 20 --------------------
 data/spear-of-destiny.yaml                     |  3 ++-
 data/theme-hospital.copyright                  | 20 --------------------
 data/theme-hospital.yaml                       |  4 ++++
 data/tyrian-data.control.in                    |  4 ----
 18 files changed, 33 insertions(+), 177 deletions(-)

diff --git a/data/doom3.yaml b/data/doom3.yaml
index 801a63e..9e680ff 100644
--- a/data/doom3.yaml
+++ b/data/doom3.yaml
@@ -809,11 +809,13 @@ files:
     install_to: $docdir
     install_as: license.txt
     distinctive_name: false
+    license: true
 
   cdoom/docs/License.txt:
     install_to: $docdir
     install_as: license.txt
     distinctive_name: false
+    license: true
   cdoom/docs/Readme.txt:
     install_to: $docdir
     install_as: readme.txt
diff --git a/data/grimfandango-data.copyright b/data/grimfandango-data.copyright
deleted file mode 100644
index 016fc3b..0000000
--- a/data/grimfandango-data.copyright
+++ /dev/null
@@ -1,25 +0,0 @@
-The grimfandango-demo-data package was generated using
-game-data-packager.
-
-The files in "/usr/share/games/grimfandango-data" are copyright
-© LucasArts Entertainment Company LLC, with all rights reserved. If
-it was available during packaging, the full license appears in
-/usr/share/doc/grimfandango-demo-data/license.txt.
-
-The Debian packaging is:
-
-© 2008-2013 Jonathan Dowland <jmtd at debian.org>
-© 2015 Simon McVittie
-© 2015 Alexandre Detiste
-
-This program 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; version 2 of the License.
-
-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.
-
-On Debian GNU/Linux systems, the complete text of the GNU General Public
-License can be found in /usr/share/common-licenses/GPL-2.
diff --git a/data/grimfandango-demo-data.copyright b/data/grimfandango-demo-data.copyright
deleted file mode 100644
index 308fd89..0000000
--- a/data/grimfandango-demo-data.copyright
+++ /dev/null
@@ -1,21 +0,0 @@
-The grimfandango-demo-data package was generated using
-game-data-packager.
-Copyright © 2008-2013 Jonathan Dowland <jmtd at debian.org>.
-
-The files within "/usr/share/games/grimfandango" are subject to the
-copyright described in /usr/share/doc/grimfandango-demo-data/license.txt .
-
-The remainder of this package is covered by the following
-Licence:
-
-This program 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; version 2 of the License.
-
-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.
-
-On Debian GNU/Linux systems, the complete text of the GNU General Public
-License can be found in /usr/share/common-licenses/GPL-2.
diff --git a/data/grimfandango.yaml b/data/grimfandango.yaml
index 8ac3600..e2c27c0 100644
--- a/data/grimfandango.yaml
+++ b/data/grimfandango.yaml
@@ -72,6 +72,7 @@ files:
   license.txt:
     distinctive_name: false
     install_to: $docdir
+    license: true
   readme.txt:
     distinctive_name: false
     install_to: $docdir
@@ -82,6 +83,7 @@ files:
     distinctive_name: false
     install_to: $docdir
     install_as: license.txt
+    license: true
   install/readme.txt:
     distinctive_name: false
     install_to: $docdir
diff --git a/data/hexen2-demo-data.copyright b/data/hexen2-demo-data.copyright
deleted file mode 100644
index 5bee890..0000000
--- a/data/hexen2-demo-data.copyright
+++ /dev/null
@@ -1,22 +0,0 @@
-The hexen2-data package was generated using game-data-packager.
-Copyright © 2008-2012 Jon Dowland <jmtd at debian.org>.
-
-The files under "/usr/share/games/hexen2" are user-supplied
-files that are not covered by the copyright or licence of this 
-package; they are Copyright © 1997 Id Software, Activision,
-Raven Software.
-
-The remainder of this package is covered by the following
-Licence:
-
-This program 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; version 2 of the License.
-
-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.
-
-On Debian GNU/Linux systems, the complete text of the GNU General Public
-License can be found in /usr/share/common-licenses/GPL-2.
diff --git a/data/hexen2.yaml b/data/hexen2.yaml
index d4787ee..eee568b 100644
--- a/data/hexen2.yaml
+++ b/data/hexen2.yaml
@@ -92,6 +92,7 @@ files:
     look_for: [HEXEN II SUBLICENSE.doc, SUBLICENSE.doc]
     install_to: $docdir
     install_as: hexen_II_sublicense.doc
+    license: true
 
 cksums: |
   1099843119 27750257 data1/pak0.pak_demo
diff --git a/data/quake.yaml b/data/quake.yaml
index aad0c93..c017319 100644
--- a/data/quake.yaml
+++ b/data/quake.yaml
@@ -132,20 +132,24 @@ files:
     distinctive_name: false
     install_as: licinfo.txt
     install_to: $docdir
+    license: true
 
   licinfo.txt_101_cd:
     distinctive_name: false
     install_as: licinfo.txt
     install_to: $docdir
+    license: true
 
   license.txt_mp12_cd:
     distinctive_name: false
     install_as: license.txt
     install_to: $docdir
+    license: true
 
   slicnse.txt:
     distinctive_name: false
     install_to: $docdir
+    license: true
 
   manual.txt_101_cd:
     distinctive_name: false
@@ -161,6 +165,7 @@ files:
     distinctive_name: false
     install_to: $docdir
     install_as: rlicnse.txt
+    license: true
 
   armagon/manual.htm:
     install_to: $docdir
diff --git a/data/quake2.yaml b/data/quake2.yaml
index aa3000e..d76c793 100644
--- a/data/quake2.yaml
+++ b/data/quake2.yaml
@@ -1003,6 +1003,7 @@ files:
     distinctive_name: false
     install_as: license.txt
     install_to: $docdir
+    license: true
 
   readme.txt_3.14_demo:
     distinctive_name: false
@@ -1018,6 +1019,7 @@ files:
     distinctive_name: false
     install_as: license.txt
     install_to: $docdir
+    license: true
 
   readme.txt_3.20:
     distinctive_name: false
@@ -1026,6 +1028,7 @@ files:
 
   Commercial Exploitation.doc:
     install_to: $docdir
+    license: true
 
   Manual.html:
     distinctive_name: false
@@ -1033,9 +1036,11 @@ files:
 
   QII License Information.doc:
     install_to: $docdir
+    license: true
 
   Quake II License.doc:
     install_to: $docdir
+    license: true
 
   Release Notes.doc:
     distinctive_name: false
@@ -1043,9 +1048,11 @@ files:
 
   commexp.txt:
     install_to: $docdir
+    license: true
 
   licinfo.txt:
     install_to: $docdir
+    license: true
 
   readme.doc:
     distinctive_name: false
@@ -1101,6 +1108,7 @@ files:
     distinctive_name: false
     install_to: $docdir
     install_as: game_code_license.txt
+    license: true
     look_for:
     - LICENSE
     - game_code_license.txt
@@ -1173,6 +1181,7 @@ files:
     distinctive_name: false
     install_to: $docdir
     install_as: data_license.txt
+    license: true
     look_for:
     - xatrix/docs/license.txt
     - data_license.txt
@@ -1181,6 +1190,7 @@ files:
     distinctive_name: false
     install_to: $docdir
     install_as: data_license.doc
+    license: true
     look_for:
     - rogue/docs/license.doc
     - data_license.doc
diff --git a/data/quake3.yaml b/data/quake3.yaml
index 089465e..fc2a7c2 100644
--- a/data/quake3.yaml
+++ b/data/quake3.yaml
@@ -767,9 +767,16 @@ files:
     - Help/DedicatedServer.html
     - Help/BotCommands.html
 
+  Help/Q3A_EULA.txt:
+    license: true
+
   Help/Q3A_EULA.txt_loki:
     look_for: [Help/Q3A_EULA.txt]
     install_as: Help/Q3A_EULA.txt
+    license: true
+
+  Help/Q3A_CELA.txt:
+    license: true
 
 cksums: |
   2320976398 49289300 linuxq3ademo-1.11-6.x86.gz.sh
diff --git a/data/spear-of-destiny-data.copyright b/data/spear-of-destiny-data.copyright
deleted file mode 100644
index ed41491..0000000
--- a/data/spear-of-destiny-data.copyright
+++ /dev/null
@@ -1,20 +0,0 @@
-The spear-of-destiny-data package was generated using game-data-packager.
-Copyright © 2008-2015 Jonathan Dowland <jmtd at debian.org>.
-
-The files within "/usr/share/games/wolf3d" are subject to the
-original copyright of their respective sources.
-
-The remainder of this package is covered by the following
-Licence:
-
-This program 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; version 2 of the License.
-
-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.
-
-On Debian GNU/Linux systems, the complete text of the GNU General Public
-License can be found in /usr/share/common-licenses/GPL-2.
diff --git a/data/spear-of-destiny-demo-data.copyright b/data/spear-of-destiny-demo-data.copyright
deleted file mode 100644
index b7ded08..0000000
--- a/data/spear-of-destiny-demo-data.copyright
+++ /dev/null
@@ -1,20 +0,0 @@
-The spear-of-destiny-demo-data package was generated using game-data-packager.
-Copyright © 2008-2015 Jonathan Dowland <jmtd at debian.org>.
-
-The files within "/usr/share/games/wolf3d" are subject to the copyright
-described in /usr/share/doc/spear-of-destiny-demo-data/sod.doc.
-
-The remainder of this package is covered by the following
-Licence:
-
-This program 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; version 2 of the License.
-
-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.
-
-On Debian GNU/Linux systems, the complete text of the GNU General Public
-License can be found in /usr/share/common-licenses/GPL-2.
diff --git a/data/spear-of-destiny-mission2-data.copyright b/data/spear-of-destiny-mission2-data.copyright
deleted file mode 100644
index 526a33e..0000000
--- a/data/spear-of-destiny-mission2-data.copyright
+++ /dev/null
@@ -1,20 +0,0 @@
-The spear-of-destiny-mission2-data package was generated using game-data-packager.
-Copyright © 2008-2015 Jonathan Dowland <jmtd at debian.org>.
-
-The files within "/usr/share/games/wolf3d" are subject to the
-original copyright of their respective sources.
-
-The remainder of this package is covered by the following
-Licence:
-
-This program 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; version 2 of the License.
-
-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.
-
-On Debian GNU/Linux systems, the complete text of the GNU General Public
-License can be found in /usr/share/common-licenses/GPL-2.
diff --git a/data/spear-of-destiny-mission3-data.control.in b/data/spear-of-destiny-mission3-data.control.in
deleted file mode 100644
index bc92509..0000000
--- a/data/spear-of-destiny-mission3-data.control.in
+++ /dev/null
@@ -1,4 +0,0 @@
-Description: Spear of Destiny - Mission 3: Ultimate Challenge
- This package contains extra levels for Spear Of Destiny,
- the sequel of Wolfenstein 3D and was generated
- using the "game-data-packager" program.
diff --git a/data/spear-of-destiny-mission3-data.copyright b/data/spear-of-destiny-mission3-data.copyright
deleted file mode 100644
index 92d956e..0000000
--- a/data/spear-of-destiny-mission3-data.copyright
+++ /dev/null
@@ -1,20 +0,0 @@
-The spear-of-destiny-mission3-data package was generated using game-data-packager.
-Copyright © 2008-2015 Jonathan Dowland <jmtd at debian.org>.
-
-The files within "/usr/share/games/wolf3d" are subject to the
-original copyright of their respective sources.
-
-The remainder of this package is covered by the following
-Licence:
-
-This program 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; version 2 of the License.
-
-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.
-
-On Debian GNU/Linux systems, the complete text of the GNU General Public
-License can be found in /usr/share/common-licenses/GPL-2.
diff --git a/data/spear-of-destiny.yaml b/data/spear-of-destiny.yaml
index ac09674..39481f5 100644
--- a/data/spear-of-destiny.yaml
+++ b/data/spear-of-destiny.yaml
@@ -41,7 +41,7 @@ packages:
       2382785751 305891  vgagraph.sdm
       3240931844 402     vgahead.sdm
       3002732200 730624  vswap.sdm
-    install:
+    optional:
     - sod.doc
 
   spear-of-destiny-data:
@@ -135,6 +135,7 @@ files:
 
   sod.doc:
     install_to: $docdir
+    license: true
 
 cksums: |
   2532954622 6852    sod.doc
diff --git a/data/theme-hospital.copyright b/data/theme-hospital.copyright
deleted file mode 100644
index f6ebdcc..0000000
--- a/data/theme-hospital.copyright
+++ /dev/null
@@ -1,20 +0,0 @@
-The theme-hospital-full-data package was generated using game-data-packager.
-Copyright © 2008-2013 Jonathan Dowland <jmtd at debian.org>.
-
-The files within "/usr/share/games/theme-hospital" 
-are licensed by Bullfrog Productions.
-
-The remainder of this package is covered by the following
-Licence:
-
-This program 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; version 2 of the License.
-
-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.
-
-On Debian GNU/Linux systems, the complete text of the GNU General Public
-License can be found in /usr/share/common-licenses/GPL-2.
diff --git a/data/theme-hospital.yaml b/data/theme-hospital.yaml
index f2c6007..656cd52 100644
--- a/data/theme-hospital.yaml
+++ b/data/theme-hospital.yaml
@@ -897,10 +897,14 @@ files:
     install_to: $docdir
   eula.txt:
     install_to: $docdir
+    license: true
   gog_eula.txt:
     install_to: $docdir
+    license: true
   en_US_eula.rtf:
     install_to: $docdir
+    license: true
+
   anims/winlevel.smk_demo:
     install_as: anims/winlevel.smk
   anims/winlevel.smk_demo:
diff --git a/data/tyrian-data.control.in b/data/tyrian-data.control.in
deleted file mode 100644
index cb875fd..0000000
--- a/data/tyrian-data.control.in
+++ /dev/null
@@ -1,4 +0,0 @@
-Description: Game data for OpenTyrian
- OpenTyrian requires game data to play. This package contains
- the game data from the shareware episode of OpenTyrian and
- was generated using the "game-data-packager" program.

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



More information about the Pkg-games-commits mailing list