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 bdd0ff60479765865279b992fa8e61ee7e801756 Author: Simon McVittie <[email protected]> Date: Tue May 5 23:42:55 2015 +0100 Change "area" to "component" The term used in https://wiki.debian.org/RepositoryFormat and in the Release file is "component", although they're also sometimes also called archive areas. --- data/hacx.yaml | 2 +- data/heretic.yaml | 2 +- data/quake.yaml | 2 +- data/sfinx.yaml | 4 ++-- data/soltys.yaml | 6 +++--- data/spear-of-destiny.yaml | 2 +- game_data_packager/__init__.py | 34 ++++++++++++++++++---------------- 7 files changed, 27 insertions(+), 25 deletions(-) diff --git a/data/hacx.yaml b/data/hacx.yaml index cba13fa..ec4c06b 100644 --- a/data/hacx.yaml +++ b/data/hacx.yaml @@ -16,7 +16,7 @@ help_text: | packages: hacx-data: - area: non-free + component: non-free install_to: usr/share/games/doom install: - hacx.wad diff --git a/data/heretic.yaml b/data/heretic.yaml index 646f441..1987892 100644 --- a/data/heretic.yaml +++ b/data/heretic.yaml @@ -34,7 +34,7 @@ packages: longname: "Heretic (shareware)" install_to: usr/share/games/doom demo_for: heretic-wad - area: non-free + component: non-free debian: replaces: heretic-shareware-data install: diff --git a/data/quake.yaml b/data/quake.yaml index be63195..44ce73d 100644 --- a/data/quake.yaml +++ b/data/quake.yaml @@ -28,7 +28,7 @@ packages: quake-shareware: demo_for: quake-registered longname: Quake (shareware) - area: non-free + component: non-free debian: provides: quake-data conflicts: quake-registered diff --git a/data/sfinx.yaml b/data/sfinx.yaml index 1b31a1a..8f22f23 100644 --- a/data/sfinx.yaml +++ b/data/sfinx.yaml @@ -12,7 +12,7 @@ packages: version: '1.1' debian: provides: sfinx-data - area: main + component: main install: - vol.cat - vol.dat @@ -24,7 +24,7 @@ packages: version: '1.0' debian: provides: sfinx-data - area: main + component: main install: - vol.cat_pl - vol.dat_pl diff --git a/data/soltys.yaml b/data/soltys.yaml index a007e0b..ac14d09 100644 --- a/data/soltys.yaml +++ b/data/soltys.yaml @@ -8,7 +8,7 @@ packages: version: '1.0' debian: provides: soltys-data - area: main + component: main install: - vol.cat - vol.dat @@ -20,7 +20,7 @@ packages: version: '1.0' debian: provides: soltys-data - area: main + component: main install: - vol.cat_pl - vol.dat_pl @@ -32,7 +32,7 @@ packages: version: '1.0' debian: provides: soltys-data - area: main + component: main install: - vol.cat_es - vol.dat_es diff --git a/data/spear-of-destiny.yaml b/data/spear-of-destiny.yaml index 0f82134..9d89e14 100644 --- a/data/spear-of-destiny.yaml +++ b/data/spear-of-destiny.yaml @@ -29,7 +29,7 @@ packages: spear-of-destiny-demo-data: longname: "Spear of Destiny (shareware)" demo_for: spear-of-destiny-data - area: non-free + component: non-free debian: provides: wolf3d-data install_to: usr/share/games/wolf3d diff --git a/game_data_packager/__init__.py b/game_data_packager/__init__.py index 81ecd2a..1584f13 100644 --- a/game_data_packager/__init__.py +++ b/game_data_packager/__init__.py @@ -394,8 +394,10 @@ class GameDataPackage(object): # Debian architecture(s) self.architecture = 'all' - # Debian archive area/section - self.area = 'local' + # Component (archive area): main, contrib, non-free, local + # We use "local" to mean "not distributable"; the others correspond + # to components in the Debian archive + self.component = 'local' self.section = 'games' @property @@ -792,13 +794,13 @@ class GameData(object): for k in ('expansion_for', 'longname', 'symlinks', 'install_to', 'install_to_docdir', 'install_contents_of', 'steam', 'debian', 'rip_cd', 'architecture', 'aliases', 'better_version', - 'copyright', 'engine', 'gog', 'origin', 'lang', 'area', 'section'): + 'copyright', 'engine', 'gog', 'origin', 'lang', 'component', 'section'): if k in d: setattr(package, k, d[k]) assert self.copyright or package.copyright, package.name - assert package.area in ('main', 'contrib', 'non-free', 'local') - assert package.area == 'local' or 'license' in d + assert package.component in ('main', 'contrib', 'non-free', 'local') + assert package.component == 'local' or 'license' in d assert package.section in ('games'), 'unsupported' if 'install_to' in d: @@ -1760,10 +1762,10 @@ class GameData(object): l.write('%s: extra-license-file usr/share/doc/%s/%s\n' % (package.name, package.name, license_file)) - if package.area == 'local': + if package.component == 'local': o.write('It contains proprietary game data ' 'and must not be redistributed.\n\n') - elif package.area == 'non-free': + elif package.component == 'non-free': o.write('It contains proprietary game data ' 'that may be redistributed\nonly under' 'conditions specified in\n') @@ -1812,7 +1814,7 @@ class GameData(object): o.write(package.copyright or self.copyright) o.write(', with all rights reserved.\n') - if licenses and package.area == 'local': + if licenses and package.component == 'local': o.write('\nThe full license appears in ') o.write(',\n'.join(licenses)) o.write('\n') @@ -2006,10 +2008,10 @@ class GameData(object): control[field] = default_values[field] assert 'Section' not in control, 'please specify only in YAML' - if package.area == 'main': + if package.component == 'main': control['Section'] = package.section else: - control['Section'] = package.area + '/' + package.section + control['Section'] = package.component + '/' + package.section if package.architecture != 'all': control['Architecture'] = self.get_architecture() @@ -2083,10 +2085,10 @@ class GameData(object): short_desc = package.data_type + ' for "' + longname + '" game' long_desc = ' This package was built using game-data-packager.\n' - if package.area == 'local': + if package.component == 'local': long_desc += ' It contains proprietary game data and must not be redistributed.\n' long_desc += ' .\n' - elif package.area == 'non-free': + elif package.component == 'non-free': long_desc += ' It contains proprietary game data that may be redistributed\n' long_desc += ' only under some conditions.\n' long_desc += ' .\n' @@ -2590,16 +2592,16 @@ class GameData(object): def construct_package(self, binary): return GameDataPackage(binary) - def check_area(self, package): + def check_component(self, package): # redistributable packages are redistributable as long as their # optional license file is present - if package.area == 'local': + if package.component == 'local': return for f in package.optional: if not self.files[f].license: continue if self.file_status[f] is not FillResult.COMPLETE: - package.area = 'local' + package.component = 'local' return return @@ -2610,7 +2612,7 @@ class GameData(object): """ destdir = os.path.join(self.get_workdir(), '%s.deb.d' % package.name) - self.check_area(package) + self.check_component(package) if not self.fill_dest_dir(package, destdir): # FIXME: probably better as an exception? return None -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/game-data-packager.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
