[game-data-packager] 05/07: Merge branch 'master' of git://anonscm.debian.org/pkg-games/game-data-packager

[Simon McVittie]

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 6375931aef32a645a9f261883a2a80263ccf4a46
Merge: a0b4e64 f693d75
Author: Alexandre Detiste <alexandre.detiste at gmail.com>
Date:   Mon Jan 12 06:18:08 2015 +0100

    Merge branch 'master' of git://anonscm.debian.org/pkg-games/game-data-packager

 Makefile                                           |  39 ++----
 .../doom-common.README.Debian.in                   |   0
 .../control.in => data/doom-common.control.in      |   0
 .../copyright.in => data/doom-common.copyright.in  |   0
 .../applications => data}/doom-common.desktop.in   |   2 +-
 .../preinst.in => data/doom-common.preinst.in      |   0
 data/doom.yaml                                     | 129 ++++++++++++++++++
 {doom-common => data}/doom2.xpm                    |   0
 data/doom2.yaml                                    | 108 +++++++++++++++
 data/final-doom.yaml                               |  93 +++++++++++++
 .../DEBIAN/control.in => data/heretic.control.in   |   0
 data/heretic.yaml                                  |  98 ++++++++++++++
 data/hexen-deathkings-data.control.in              |  15 +++
 data/hexen-deathkings-data.desktop.in              |   9 ++
 hexen/DEBIAN/control.in => data/hexen.control.in   |   0
 data/hexen.yaml                                    | 126 +++++++++++++++++
 data/hexen2.yaml                                   |  10 +-
 data/ja.yaml                                       |   1 +
 data/jedi-academy-bonus-data.control.in            |  23 ++++
 .../jedi-academy-bonus-data.copyright              |  10 +-
 data/quake3.yaml                                   |   2 +
 data/rott.yaml                                     |   1 +
 data/spear-of-destiny.yaml                         |   4 +
 debian/changelog                                   |   9 +-
 debian/control                                     |   1 +
 debian/game-data-packager.install                  |   5 +
 doom-common.mk                                     |  77 -----------
 game-data-packager                                 |   2 +
 lib/doom-common                                    |  41 ------
 lib/game_data_packager/__init__.py                 | 150 ++++++++++++++-------
 lib/game_data_packager/check_syntax.py             |  16 +--
 lib/game_data_packager/games/doom_common.py        | 137 +++++++++++++++++++
 lib/game_data_packager/paths.py                    |  10 ++
 lib/via-python                                     |   2 -
 supported/doom                                     |  20 +--
 supported/doom2                                    |  16 +--
 supported/heretic                                  |  16 +--
 supported/hexen                                    |  16 +--
 supported/plutonia                                 |  17 +--
 supported/tnt                                      |  18 +--
 40 files changed, 914 insertions(+), 309 deletions(-)

diff --cc data/rott.yaml
index 6dae983,5241a80..0d03ff8
--- a/data/rott.yaml
+++ b/data/rott.yaml
@@@ -9,11 -9,9 +9,12 @@@ steam
  
  packages:
    rott-data:
+     longname: "Rise of the Triad shareware episode: The HUNT Begins"
      install_to: usr/share/games/rott
 -    type: demo
 +    type: full
 +    longname: "Rise of the Triad: The HUNT begins"
 +    # this shareware data are considered a as full game because
 +    # it includes the HUNT Begin levels not present in the commercial game
  
      install_files_from_cksums: |
        742977862  27028   DEMO1_3.DMO

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