[game-data-packager] 02/08: Eliminate custom package control files, and most custom copyright files
Simon McVittie
smcv at debian.org
Thu Nov 3 00:03:54 UTC 2016
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch master
in repository game-data-packager.
commit 38200bec310195fbb586446da699cfbaf06ac1c4
Author: Simon McVittie <smcv at debian.org>
Date: Wed Nov 2 18:31:20 2016 +0000
Eliminate custom package control files, and most custom copyright files
The differences are basically cosmetic, and not worth special-casing.
The only one I've kept is data/descent2-demo-data.copyright, which
is genuinely quite different.
To avoid a syntax error, wrap the copyright statement for Jedi Academy
into one line and strip the trailing newline.
---
Makefile | 1 -
data/doom3-resurrection-data.control.in | 7 -------
data/enemy-territory.control.in | 5 -----
data/hexen2-data.control.in | 8 --------
data/hexen2-hexenworld-data.control.in | 8 --------
data/hexen2-portals-data.control.in | 8 --------
data/ja.yaml | 3 +--
data/jedi-academy-bonus-data.control.in | 14 --------------
data/jedi-academy-bonus-data.copyright | 23 -----------------------
data/jedi-academy-data.control.in | 7 -------
data/jedi-academy-data.copyright | 22 ----------------------
data/jedi-outcast-data.control.in | 7 -------
data/jedi-outcast-data.copyright | 22 ----------------------
data/lgeneral-data-nonfree.control.in | 7 -------
data/quake2-demo-data.control.in | 7 -------
data/quake2-full-data.control.in | 7 -------
data/quake2-groundzero-data.control.in | 10 ----------
data/quake2-reckoning-data.control.in | 10 ----------
data/quake4-bin.control.in | 10 ----------
data/quake4-censored-de-data.control.in | 10 ----------
data/quake4-data.control.in | 8 --------
data/quake4-pb-bin.control.in | 10 ----------
data/quake4.yaml | 12 ++++++++++++
debian/game-data-packager.install | 1 -
game_data_packager/packaging/deb.py | 11 +----------
25 files changed, 14 insertions(+), 224 deletions(-)
diff --git a/Makefile b/Makefile
index 968a78a..11ccf22 100644
--- a/Makefile
+++ b/Makefile
@@ -351,7 +351,6 @@ install:
cp -ar game_data_packager/ $(DESTDIR)$(pkgdatadir)/
python3 -m game_data_packager.version $(RELEASE) > out/installed-version.py
install -m0644 out/installed-version.py $(DESTDIR)$(pkgdatadir)/game_data_packager/version.py
- install -m0644 out/*.control.in $(DESTDIR)$(pkgdatadir)/
install -m0644 out/*.copyright $(DESTDIR)$(pkgdatadir)/
install -m0644 out/*.png $(DESTDIR)$(pkgdatadir)/
install -m0644 data/*.png $(DESTDIR)$(pkgdatadir)/
diff --git a/data/doom3-resurrection-data.control.in b/data/doom3-resurrection-data.control.in
deleted file mode 100644
index 333a729..0000000
--- a/data/doom3-resurrection-data.control.in
+++ /dev/null
@@ -1,7 +0,0 @@
-Description: game data for Doom 3: Resurrection of Evil
- This package was built using game-data-packager. It contains
- proprietary game data and must not be redistributed.
- .
- Expansion: Doom 3: Resurrection of Evil
- .
- Intended for use with: dhewm3-d3xp
diff --git a/data/enemy-territory.control.in b/data/enemy-territory.control.in
deleted file mode 100644
index 52df99d..0000000
--- a/data/enemy-territory.control.in
+++ /dev/null
@@ -1,5 +0,0 @@
-Description: game data for ET:Legacy
- This package was built using game-data-packager. It contains
- proprietary game data from Wolfenstein: Enemy Territory and must not be
- redistributed. It is intended for use with the etlegacy engine and allows you
- to play the original Enemy Territory game over the internet.
diff --git a/data/hexen2-data.control.in b/data/hexen2-data.control.in
deleted file mode 100644
index ec8b231..0000000
--- a/data/hexen2-data.control.in
+++ /dev/null
@@ -1,8 +0,0 @@
-Description: Hexen II commercial data files
- Hexen II requires an engine and game data to play. This package contains
- the commercial data from Raven Software's game Hexen II,
- and was generated using the "game-data-packager" program from the Debian
- package of the same name.
- .
- To play Hexen II using this data, install a package providing the
- "hexen2-engine" virtual package.
diff --git a/data/hexen2-hexenworld-data.control.in b/data/hexen2-hexenworld-data.control.in
deleted file mode 100644
index 6ca29ad..0000000
--- a/data/hexen2-hexenworld-data.control.in
+++ /dev/null
@@ -1,8 +0,0 @@
-Description: Hexen II: HexenWorld
- Hexen II requires an engine and game data to play. This package contains
- the commercial data from HexenWorld, the multiplayer module for Hexen II,
- and was generated using the "game-data-packager" program from
- the Debian package of the same name.
- .
- To play Hexen II using this data, install a package providing the
- "hexen2-engine" virtual package.
diff --git a/data/hexen2-portals-data.control.in b/data/hexen2-portals-data.control.in
deleted file mode 100644
index 5f7058a..0000000
--- a/data/hexen2-portals-data.control.in
+++ /dev/null
@@ -1,8 +0,0 @@
-Description: Hexen II Mission Pack: Portal of Praevus
- Hexen II requires an engine and game data to play. This package contains
- the commercial data from Raven Software's Hexen II Mission Pack: Portal
- of Praevus, and was generated using the "game-data-packager" program from
- the Debian package of the same name.
- .
- To play Hexen II using this data, install a package providing the
- "hexen2-engine" virtual package.
diff --git a/data/ja.yaml b/data/ja.yaml
index 9708bbd..8ed2a00 100644
--- a/data/ja.yaml
+++ b/data/ja.yaml
@@ -62,7 +62,7 @@ packages:
jedi-academy-bonus-data:
aliases: [bonus]
longname: "Bonus maps for Jedi Academy"
- copyright: |
+ copyright: >-
© 2003-2004 Activision, Inc. / LucasArts,
a division of Lucasfilm Entertainment Company Ltd. and/or Raven Software
description: |
@@ -73,7 +73,6 @@ packages:
* Rift of Shadows CTF map
* Gas Mine, The Fortress, Conquest of Byss and Ord Mantell Canyon FFA maps
* "Destroyer" vehicle combat map for Siege mode
- .
expansion_for: jedi-academy-data
install_to: $assets/jedi-academy
symlinks:
diff --git a/data/jedi-academy-bonus-data.control.in b/data/jedi-academy-bonus-data.control.in
deleted file mode 100644
index 12b01f6..0000000
--- a/data/jedi-academy-bonus-data.control.in
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Star Wars Jedi Knight: Jedi Academy bonus data files
- Jedi Academy requires an engine and game data to play. This
- package was generated using the "game-data-packager"
- program from the Debian package of the same name, and contains
- semi-official, free-to-download bonus data released by Raven Software
- for Jedi Academy:
- .
- * Coruscant duel map
- * Rift of Shadows CTF map
- * Gas Mine, The Fortress, Conquest of Byss and Ord Mantell Canyon FFA maps
- * "Destroyer" vehicle combat map for Siege mode
- .
- To play Jedi Academy using this data, install the jedi-academy-data
- and openjk-academy packages.
diff --git a/data/jedi-academy-bonus-data.copyright b/data/jedi-academy-bonus-data.copyright
deleted file mode 100644
index 5190e45..0000000
--- a/data/jedi-academy-bonus-data.copyright
+++ /dev/null
@@ -1,23 +0,0 @@
-The jedi-academy-bonus-data package was generated using game-data-packager.
-Copyright © 2008-2013 Jonathan Dowland <jmtd at debian.org>.
-
-The files under "/usr/share/games/jedi-academy" are user-supplied
-files that are not covered by the copyright or licence of this package;
-they are copyright © 2003-2004 Activision, Inc., LucasArts, a division of
-Lucasfilm Entertainment Company Ltd. and/or Raven Software, with
-all rights reserved.
-
-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/jedi-academy-data.control.in b/data/jedi-academy-data.control.in
deleted file mode 100644
index f8941a9..0000000
--- a/data/jedi-academy-data.control.in
+++ /dev/null
@@ -1,7 +0,0 @@
-Description: Star Wars Jedi Knight: Jedi Academy data files
- Jedi Academy requires an engine and game data to play. This
- package contains the data from the full version of Jedi Academy,
- and was generated using the "game-data-packager" program from
- the Debian package of the same name.
- .
- To play Jedi Academy using this data, install the openjk-academy package.
diff --git a/data/jedi-academy-data.copyright b/data/jedi-academy-data.copyright
deleted file mode 100644
index 6ba9ef7..0000000
--- a/data/jedi-academy-data.copyright
+++ /dev/null
@@ -1,22 +0,0 @@
-The jedi-academy-data package was generated using game-data-packager.
-Copyright © 2008-2013 Jonathan Dowland <jmtd at debian.org>.
-
-The files under "/usr/share/games/jedi-academy" are user-supplied
-files that are not covered by the copyright or licence of this package;
-they are copyright © 2003 Activision, Inc. / LucasArts, a division of
-Lucasfilm Entertainment Company Ltd., with all rights reserved.
-
-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/jedi-outcast-data.control.in b/data/jedi-outcast-data.control.in
deleted file mode 100644
index e2fbeb3..0000000
--- a/data/jedi-outcast-data.control.in
+++ /dev/null
@@ -1,7 +0,0 @@
-Description: Star Wars Jedi Knight II: Jedi Outcast data files
- Jedi Knight II requires an engine and game data to play. This
- package contains the data from the full version of Jedi Knight II,
- and was generated using the "game-data-packager" program from
- the Debian package of the same name.
- .
- To play Jedi Knight II using this data, install the openjk-outcast package.
diff --git a/data/jedi-outcast-data.copyright b/data/jedi-outcast-data.copyright
deleted file mode 100644
index bdae02d..0000000
--- a/data/jedi-outcast-data.copyright
+++ /dev/null
@@ -1,22 +0,0 @@
-The jedi-outcast-data package was generated using game-data-packager.
-Copyright © 2008-2013 Jonathan Dowland <jmtd at debian.org>.
-
-The files under "/usr/share/games/jedi-outcast" are user-supplied
-files that are not covered by the copyright or licence of this package;
-they are copyright © 2003 Activision, Inc. / LucasArts, a division of
-Lucasfilm Entertainment Company Ltd., with all rights reserved.
-
-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/lgeneral-data-nonfree.control.in b/data/lgeneral-data-nonfree.control.in
deleted file mode 100644
index 5f23649..0000000
--- a/data/lgeneral-data-nonfree.control.in
+++ /dev/null
@@ -1,7 +0,0 @@
-Description: Panzer General commercial data files
- LGeneral requires an engine and game data to play. This package contains
- the commercial data from SSI's game "Panzer General", and was
- generated using the "game-data-packager" program from the Debian package of
- the same name.
- .
- To play LGeneral using this data, please install the lgeneral package.
diff --git a/data/quake2-demo-data.control.in b/data/quake2-demo-data.control.in
deleted file mode 100644
index 2341514..0000000
--- a/data/quake2-demo-data.control.in
+++ /dev/null
@@ -1,7 +0,0 @@
-Description: Quake II demo data files
- Quake II requires an engine and game data to play. This package contains
- the data from the demo version of id Software's game "Quake II", and was
- generated using the "game-data-packager" program from the Debian package of
- the same name.
- .
- To play Quake II using this data, install the quake2 package.
diff --git a/data/quake2-full-data.control.in b/data/quake2-full-data.control.in
deleted file mode 100644
index 86ab34d..0000000
--- a/data/quake2-full-data.control.in
+++ /dev/null
@@ -1,7 +0,0 @@
-Description: Quake II data files
- Quake II requires an engine and game data to play. This package contains
- the data from the full version of id Software's game "Quake II", and was
- generated using the "game-data-packager" program from the Debian package of
- the same name.
- .
- To play Quake II using this data, install the quake2 package.
diff --git a/data/quake2-groundzero-data.control.in b/data/quake2-groundzero-data.control.in
deleted file mode 100644
index 0c44a48..0000000
--- a/data/quake2-groundzero-data.control.in
+++ /dev/null
@@ -1,10 +0,0 @@
-Description: Quake II Mission Pack 2: Ground Zero data files
- Quake II: Ground Zero is a Mission Pack for Quake II created by Rogue
- Entertainment. This package was generated using the "game-data-packager"
- program from the Debian package of the same name.
- .
- The game-code in this package was compiled from a version maintained
- by the author of yamagi-quake2, derived from the Quake II mod SDK.
- .
- To play Quake II using this data, install the quake2 package and pass
- "+set game rogue" as arguments.
diff --git a/data/quake2-reckoning-data.control.in b/data/quake2-reckoning-data.control.in
deleted file mode 100644
index 2eaa240..0000000
--- a/data/quake2-reckoning-data.control.in
+++ /dev/null
@@ -1,10 +0,0 @@
-Description: Quake II Mission Pack 1: The Reckoning data files
- Quake II: The Reckoning is a Mission Pack for Quake II created by Xatrix
- Entertainment. This package was generated using the "game-data-packager"
- program from the Debian package of the same name.
- .
- The game-code in this package was compiled from a version maintained
- by the author of yamagi-quake2, derived from the Quake II mod SDK.
- .
- To play Quake II using this data, install the quake2 package and pass
- "+set game xatrix" as arguments.
diff --git a/data/quake4-bin.control.in b/data/quake4-bin.control.in
deleted file mode 100644
index 07fb0a8..0000000
--- a/data/quake4-bin.control.in
+++ /dev/null
@@ -1,10 +0,0 @@
-Description: Quake 4 binary-only executables
- This package contains the proprietary binary-only executables from
- the game Quake 4.
- .
- This package was built using game-data-packager and should not be
- redistributed.
- .
- Genre: First-person shooter
- Published by: Activision / Bethesda
- Built from: quake4-linux-1.4.2.x86.run
diff --git a/data/quake4-censored-de-data.control.in b/data/quake4-censored-de-data.control.in
deleted file mode 100644
index 3c75cb2..0000000
--- a/data/quake4-censored-de-data.control.in
+++ /dev/null
@@ -1,10 +0,0 @@
-Description: Quake 4 game data - censored German version
- This package contains the commercial data files from the German version
- of the game Quake 4. This version does not interoperate with versions
- from other regions or languages.
- .
- This package was built using game-data-packager. It contains proprietary
- game data and must not be redistributed.
- .
- Genre: First-person shooter
- Published by: Activision / Bethesda
diff --git a/data/quake4-data.control.in b/data/quake4-data.control.in
deleted file mode 100644
index 0e6d79a..0000000
--- a/data/quake4-data.control.in
+++ /dev/null
@@ -1,8 +0,0 @@
-Description: Quake 4 game data
- This package contains the commercial data files from the game Quake 4.
- .
- This package was built using game-data-packager. It contains proprietary
- game data and must not be redistributed.
- .
- Genre: First-person shooter
- Published by: Activision / Bethesda
diff --git a/data/quake4-pb-bin.control.in b/data/quake4-pb-bin.control.in
deleted file mode 100644
index 6a926a4..0000000
--- a/data/quake4-pb-bin.control.in
+++ /dev/null
@@ -1,10 +0,0 @@
-Description: Quake 4 binary-only executables - PunkBuster
- This package contains the optional PunkBuster component of the proprietary
- binary-only executables from the game Quake 4.
- .
- This package was built using game-data-packager and should not be
- redistributed.
- .
- Genre: First-person shooter
- Published by: Activision / Bethesda
- Built from: quake4-linux-1.4.2.x86.run
diff --git a/data/quake4.yaml b/data/quake4.yaml
index d6638b8..e382748 100644
--- a/data/quake4.yaml
+++ b/data/quake4.yaml
@@ -16,6 +16,9 @@ packages:
quake4-pb-bin:
DISABLED: mitigation for CVE-2007-5248 <http://aluigi.altervista.org/adv/d3engfspb-adv.txt>
short_description: Quake 4 PunkBuster binaries
+ description: |
+ This package contains the optional PunkBuster component of the
+ proprietary binary-only executables for Quake 4.
install_to: $prefix/lib/quake4
architecture: i386
version: "1.4.2"
@@ -35,6 +38,9 @@ packages:
install_to: $prefix/lib/quake4
architecture: i386
version: "1.4.2"
+ description: |
+ This package contains the proprietary binary-only executables for
+ Quake 4.
depends:
- game-data-packager-runtime
- libc.so.6 (>= 2.2.4)
@@ -73,6 +79,8 @@ packages:
- it
- pl
- ru
+ description: |
+ This package contains the commercial data files for Quake 4.
license:
- EULA.txt?steam
- patch 1.4.2 licenses
@@ -95,6 +103,10 @@ packages:
provides: quake4-any-data
replaces: quake4-any-data
install_to: $assets/quake4
+ description: |
+ This package contains the commercial data files for the censored
+ German version of Quake 4. This version does not interoperate with
+ versions from other regions.
# this is not actually dubbed, just censored
langs:
- en
diff --git a/debian/game-data-packager.install b/debian/game-data-packager.install
index 015e05e..66afa91 100644
--- a/debian/game-data-packager.install
+++ b/debian/game-data-packager.install
@@ -2,7 +2,6 @@ debian/tmp/etc/game-data-packager
debian/tmp/etc/game-data-packager.conf
usr/games/game-data-packager
usr/share/bash-completion
-usr/share/games/game-data-packager/*.control.in
usr/share/games/game-data-packager/*.copyright
usr/share/games/game-data-packager/*.png
usr/share/games/game-data-packager/*.preinst.in
diff --git a/game_data_packager/packaging/deb.py b/game_data_packager/packaging/deb.py
index a7512ae..b848a70 100644
--- a/game_data_packager/packaging/deb.py
+++ b/game_data_packager/packaging/deb.py
@@ -32,7 +32,6 @@ except ImportError:
from . import (PackagingSystem)
from ..data import (HashedFile)
-from ..paths import (DATADIR)
from ..util import (
check_output,
mkdir_p,
@@ -222,15 +221,7 @@ class DebPackaging(PackagingSystem):
raise FileNotFoundError('Cannot generate .deb packages without '
'python3-debian')
- try:
- control_in = open(os.path.join(DATADIR,
- package.name + '.control.in'), encoding='utf-8')
- control = Deb822(control_in)
- for key in control.keys():
- assert key == 'Description', 'specify "%s" only in YAML' % key
- except FileNotFoundError:
- control = Deb822()
-
+ control = Deb822()
control['Package'] = package.name
control['Version'] = package.version
control['Priority'] = 'optional'
--
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