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 0a058d47b4b48926f8e0fd23aa4e8c167ac75ae9 Author: Simon McVittie <[email protected]> Date: Thu Apr 30 09:06:06 2015 +0100 Fix spelling of "available" and various other bits of text --- data/brokensword1.yaml | 7 +++---- data/duke3d.yaml | 4 ++-- data/hexen2.yaml | 4 ++-- data/strife.yaml | 4 ++-- doc/adding_a_game.mdwn | 10 +++++----- doc/game-data-packager.6 | 2 +- game_data_packager/__init__.py | 8 +++++--- game_data_packager/stats.py | 2 +- game_data_packager/util.py | 2 +- 9 files changed, 22 insertions(+), 21 deletions(-) diff --git a/data/brokensword1.yaml b/data/brokensword1.yaml index 9b723a3..abb3a04 100644 --- a/data/brokensword1.yaml +++ b/data/brokensword1.yaml @@ -7,11 +7,10 @@ gameid: sword1 # http://wiki.scummvm.org/index.php/Datafiles#Broken_Sword:_The_Shadow_of_the_Templars help_text: | - As stated in README [1], video cutscenes were not avaible - in all release, but replacement video replacement are - provided on ScummVM website. + As stated in README [1], video cutscenes were not available + in all releases, but replacement videos are provided on the ScummVM website. - [1] https://github.com/scummvm/scummvm/blob/master/README § 3.8 + [1] https://github.com/scummvm/scummvm/blob/master/README §3.8 [2] http://www.scummvm.org/games/#sword1 packages: diff --git a/data/duke3d.yaml b/data/duke3d.yaml index 66a18af..5b6780d 100644 --- a/data/duke3d.yaml +++ b/data/duke3d.yaml @@ -8,7 +8,7 @@ genre: First-person shooter help_text: | To play this game, you need to install the EDuke32 - engine that is not currently avaible in Debian. + engine, which is not currently available in Debian. packages: duke3d-shareware: @@ -40,7 +40,7 @@ packages: - manual.pdf license: - license.txt - + files: 3dduke13.zip: download: ftp://ftp.3drealms.com/share/3dduke13.zip diff --git a/data/hexen2.yaml b/data/hexen2.yaml index 8a862ce..fb82c85 100644 --- a/data/hexen2.yaml +++ b/data/hexen2.yaml @@ -16,7 +16,7 @@ help_text: | Steam installations would typically be found in: C:/Program Files/Steam/steamapps/common/Hexen 2 - A demo is avaible here: + A demo is available here, but cannot be downloaded noninteractively: http://www.fileplanet.com/10770/download/Hexen-II---Demo packages: @@ -60,7 +60,7 @@ files: - hw/pak4.pak # FIXME: if we list this as downloadable, then g-d-p will download it # every time we try to package something else. Downloadable expansions - # should be a little less enthusiastic + # should be a little less enthusiastic (#775080) #download: http://downloads.sourceforge.net/project/uhexen2/Hexen2%20GameData/hexenworld-pakfiles/hexenworld-pakfiles-0.15.tgz?r=http%3A%2F%2Fuhexen2.sourceforge.net%2Fdownload.html unpack: format: tar.gz diff --git a/data/strife.yaml b/data/strife.yaml index 61622a1..fdd1ff2 100644 --- a/data/strife.yaml +++ b/data/strife.yaml @@ -12,10 +12,10 @@ genre: Role-playing help_text: | Please provide the STRIFE1.WAD and VOICES.WAD from Strife version 1.2 to 1.31. - + Version 1.0 and the shareware version are currently not supported by the Doom engines - avaible in Debian. + available in Debian. packages: strife-data: diff --git a/doc/adding_a_game.mdwn b/doc/adding_a_game.mdwn index 573fe6e..6fe628c 100644 --- a/doc/adding_a_game.mdwn +++ b/doc/adding_a_game.mdwn @@ -144,12 +144,12 @@ all the field required by policy are present: appropriate. To document an engine, you should add a `engine:` key in the YAML file. If your game is split in several packages, the package with - the full game should `Suggests` all the avaible expansions; - to avoid that those are recognised as useless + the full game should have a `Suggests` relationship on all the available + expansions; to avoid them being classified as unused and then removed by aptitude or deborphan. This is done - automatically if you set the correct `expansion_for:`. - An expansion will also automatically `Depends` on - the matching full game. + automatically if you set the correct `expansion_for:`. + An expansion will also automatically have a `Depends` relationship with + the matching full game. If ever needed; the standard Debian dependencies are also supported using the `debian: depends:/recommends:/suggests:/replaces:/...` keys. diff --git a/doc/game-data-packager.6 b/doc/game-data-packager.6 index 3fd4d39..9f8685e 100644 --- a/doc/game-data-packager.6 +++ b/doc/game-data-packager.6 @@ -79,7 +79,7 @@ will display a list of valid options for that game. .SH ENVIRONMENT VARIABLES .TP .B LANGUAGE, LANG -These environment variables are used when a game is avaible in +These environment variables are used when a game is available in various languages to choose the correct version. .br Those are normally set by your desktop environment. diff --git a/game_data_packager/__init__.py b/game_data_packager/__init__.py index ff43356..d3d408e 100644 --- a/game_data_packager/__init__.py +++ b/game_data_packager/__init__.py @@ -2379,7 +2379,9 @@ class GameData(object): if (package.better_version and self.packages[package.better_version] in possible): logger.debug('will not produce "%s" because better version ' - '"%s" is also avaible', package.name, package.better_version) + '"%s" is also available', + package.name, + package.better_version) continue abort = False @@ -2390,14 +2392,14 @@ class GameData(object): for fullgame in possible: if fullgame.type == 'full': logger.warning("won't generate '%s' expansion, because " - 'full game "%s" is not avaible nor already installed;' + 'full game "%s" is neither available nor already installed;' ' and we are packaging "%s" instead.', package.name, package.expansion_for, fullgame.name) abort = True break else: logger.warning('will generate "%s" expansion, but full game ' - '"%s" is not avaible nor already installed.', + '"%s" is neither available nor already installed.', package.name, package.expansion_for) if not build_demos: diff --git a/game_data_packager/stats.py b/game_data_packager/stats.py index 26e063b..1829668 100644 --- a/game_data_packager/stats.py +++ b/game_data_packager/stats.py @@ -46,5 +46,5 @@ for game in games: last_genre = game['genre'] print('') -print('($): no freeload (fullgame/demo) avaible') +print('($): no freeload (fullgame/demo) available') print(' remember there is doom-wad-shareware in non-free repository') diff --git a/game_data_packager/util.py b/game_data_packager/util.py index dda3976..4e2c292 100644 --- a/game_data_packager/util.py +++ b/game_data_packager/util.py @@ -93,7 +93,7 @@ def is_installed(package): return os.path.isdir(os.path.join('/usr/share/doc', package)) -def is_avaible(package): +def is_available(package): proc = subprocess.Popen(['apt-cache', 'pkgnames', package], universal_newlines=True, stdout=subprocess.PIPE) -- 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
