[game-data-packager] 14/14: Merge remote-tracking branch 'a-detiste/master'

Simon McVittie smcv at debian.org
Sun Feb 15 15:25:41 UTC 2015


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 80b2b6d6d39b840b704c0834eb49ab6d1cd0349b
Merge: 162361f 78fb49f
Author: Simon McVittie <smcv at debian.org>
Date:   Sun Feb 15 15:25:13 2015 +0000

    Merge remote-tracking branch 'a-detiste/master'
    
    Conflicts:
    	data/doom3.yaml

 Makefile                                |   2 +
 data/comi.yaml                          |   1 +
 data/copyright                          |  31 +++
 data/descent1.yaml                      |   1 +
 data/descent2.yaml                      |   1 +
 data/doom.yaml                          |   1 +
 data/doom2.yaml                         |   1 +
 data/doom3.yaml                         | 354 +++++++++++++++++++++++++++++++-
 data/final-doom.yaml                    |   1 +
 data/fullthrottle.yaml                  |   1 +
 data/grimfandango.yaml                  |   1 +
 data/heretic.yaml                       |   1 +
 data/hexen.yaml                         |   1 +
 data/hexen2.yaml                        |   1 +
 data/ja.yaml                            |   5 +
 data/jk2.yaml                           |   1 +
 data/lgeneral.yaml                      |   1 +
 data/maniacmansion.yaml                 |   2 +
 data/quake-armagon-music.control.in     |   8 -
 data/quake-dissolution-music.control.in |   8 -
 data/quake-music.control.in             |   8 -
 data/quake.yaml                         |   6 +
 data/quake2.yaml                        |   5 +
 data/quake3.yaml                        |   2 +
 data/rott.yaml                          |   5 +
 data/rtcw.yaml                          |   1 +
 data/spear-of-destiny.yaml              |   1 +
 data/theme-hospital.yaml                |   3 +-
 data/tyrian.yaml                        |   1 +
 data/wolf3d.yaml                        |   1 +
 debian/control                          |   4 +-
 doc/adding_a_game.mdwn                  |   9 +
 game_data_packager/__init__.py          |  87 ++++++--
 game_data_packager/make_template.py     |  52 ++++-
 34 files changed, 556 insertions(+), 52 deletions(-)

diff --cc data/doom3.yaml
index 6f11b72,3f2398d..8973e25
--- a/data/doom3.yaml
+++ b/data/doom3.yaml
@@@ -6,8 -7,9 +7,9 @@@ try_repack_from: [/usr/local/share/dhew
  packages:
    doom3-data:
      longname: 'Doom 3'
+     copyright: © 2004 id Software
      debian:
 -      engine: dhewm3
 +      engine: dhewm3-doom3
      steam:
        id: 9050
      install:
@@@ -725,27 -793,99 +793,119 @@@
      - base/wads/DOOM.WAD
  
  files:
 +  doom3-linux-1.3.1.1304.x86.run:
 +    size: 21145838
 +    distinctive_size: true
 +    download:
 +      idstuff-mirrors:
 +        path: doom3/linux
 +    provides:
 +    - base/pak005.pk4
 +    - base/pak006.pk4
 +    - base/pak007.pk4
 +    - base/pak008.pk4
 +    - d3xp/pak001.pk4
 +    md5: 6325f0936f59420d33668754032141cb
 +    sha1: 028dd18e5bada1e563c2a0d3bf5e77572d78e6b9
 +    sha256: 2f90dff20f2d3c0c47f17b3d6d45c4f0e7d27b986bf6084f21b85180cd1e03b4
 +    unpack:
 +      format: tar.gz
 +      skip: 8736
 +
+   License.txt:
+     install_to: $docdir
+     install_as: license.txt
+     distinctive_name: false
+ 
+   cdoom/docs/License.txt:
+     install_to: $docdir
+     install_as: license.txt
+     distinctive_name: false
+   cdoom/docs/Readme.txt:
+     install_to: $docdir
+     install_as: readme.txt
+     distinctive_name: false
+   cdoom/Classic Doom 3.url:
+     install_to: $docdir
+     install_as: classic_doom3.url
+   cdoom/fan_extras/cdoomsource_131/readme.txt:
+     distinctive_name: false
+ 
+   DOOM3-1.3.1.exe:
+     size: 19653399
+     md5: 48330b83d08298826992da9a348c1620
+     sha1sum: a619eb0c6dd2cc384e5ba2c8b444ab56db43897d
+     sha256sum: a3215349ecfbb6d6b4d3411d1ed5c60394a8c072c74c6214609c78e556f1fb5b
+     unpack:
+       format: 7z
+     provides:
+     - base/game01.pk4
+     - base/game02.pk4
+     - base/game03.pk4
+     - base/pak005.pk4
+     - base/pak006.pk4
+     - base/pak007.pk4
+     - base/pak008.pk4
+     - d3xp/game01.pk4
+     - d3xp/game02.pk4
+     - d3xp/game03.pk4
+     - d3xp/pak001.pk4
+ 
+   classic_doom_3_1.3.1.exe:
+     size: 212439198
+     md5: 2cea594e8e0638e94bcada63b977d02e
+     sha1sum: 5402b4edf1dbff8fff242d999325fc2be51e4b72
+     sha256sum: 2eacb9fce4447c22b8f7a24741534df952116b6efa9e6cdc807651b184432935
+     unpack:
+       format: 7z
+     provides:
+     - cdoom/Classic Doom 3.url
+     - cdoom/autoexec.cfg
+     - cdoom/cdoom.ico
+     - cdoom/cdoom_dll.pk4
+     - cdoom/cdoom_linux.pk4
+     - cdoom/cdoom_mac.pk4
+     - cdoom/cdoom_main.pk4
+     - cdoom/cdoom_maps.pk4
+     - cdoom/cdoom_models.pk4
+     - cdoom/cdoom_sounds.pk4
+     - cdoom/cdoom_textures.pk4
+     - cdoom/description.txt
+     - cdoom/docs/License.txt
+     - cdoom/docs/Readme.txt
+     - cdoom/docs/shot00002.jpg
+     - cdoom/fan_extras/cdoomsource_131/readme.txt
+     - cdoom/fan_extras/cdoomsource_131/framework/UsercmdGen.h
+     - cdoom/fan_extras/cdoomsource_131/game/Entity.cpp
+     - cdoom/fan_extras/cdoomsource_131/game/Entity.h
+     - cdoom/fan_extras/cdoomsource_131/game/Game_local.cpp
+     - cdoom/fan_extras/cdoomsource_131/game/Game_local.h
+     - cdoom/fan_extras/cdoomsource_131/game/Item.cpp
+     - cdoom/fan_extras/cdoomsource_131/game/Item.h
+     - cdoom/fan_extras/cdoomsource_131/game/Misc.cpp
+     - cdoom/fan_extras/cdoomsource_131/game/Misc.h
+     - cdoom/fan_extras/cdoomsource_131/game/MultiplayerGame.cpp
+     - cdoom/fan_extras/cdoomsource_131/game/Player.cpp
+     - cdoom/fan_extras/cdoomsource_131/game/Player.h
+     - cdoom/fan_extras/cdoomsource_131/game/PlayerView.cpp
+     - cdoom/fan_extras/cdoomsource_131/game/Sound.cpp
+     - cdoom/fan_extras/cdoomsource_131/game/Target.cpp
+     - cdoom/fan_extras/cdoomsource_131/game/Target.h
+     - cdoom/fan_extras/cdoomsource_131/game/ai/AI.cpp
+     - cdoom/fan_extras/cdoomsource_131/game/gamesys/SysCmds.cpp
+     - cdoom/fan_extras/cdoomsource_131/game/gamesys/SysCvar.cpp
+     - cdoom/fan_extras/cdoomsource_131/game/gamesys/SysCvar.h
+     - cdoom/fan_extras/classicdoom_001_1280x1024.jpg
+     - cdoom/fan_extras/wallpaper1.jpg
+     - cdoom/fan_extras/wallpaper2.jpg
+     - cdoom/fan_extras/wallpaper3.jpg
+ 
  cksums: |
 +  3705538269 21145838 doom3-linux-1.3.1.1304.x86.run
+   698551627  963485    base/game00.pk4
+   1740423552 1542504   base/game01.pk4
+   143642192  1789687   base/game02.pk4
+   3855177723 965775    base/game03.pk4
    3020409499 353159257 base/pak000.pk4
    1437100813 229649726 base/pak001.pk4
    2513550240 416937674 base/pak002.pk4
@@@ -1441,7 -1615,10 +1635,11 @@@
    _ 3819855   base/wads/NERVE.WAD
  
  md5sums: |
 +  6325f0936f59420d33668754032141cb  doom3-linux-1.3.1.1304.x86.run
+   0a2843d900347a0bf8c2b556ff8652b2  base/game00.pk4
+   197f85d31672a7fb5a145e88e0ab3519  base/game01.pk4
+   425173e95a5a4115127662077e4e877b  base/game02.pk4
+   882c1b0aaad0bf62dde6df43048a9999  base/game03.pk4
    71b8d37b2444d3d86a36fd61783844fe  base/pak000.pk4
    4bc4f3ba04ec2b4f4837be40e840a3c1  base/pak001.pk4
    fa84069e9642ad9aa4b49624150cc345  base/pak002.pk4
@@@ -2149,7 -2374,53 +2392,57 @@@ sha1sums: 
    de543a0369dbae3d4181f2c727085adb89ef3531  base/pak006.pk4
    662a4014dabe26bcdd988877fadaff7d6a09725c  base/pak007.pk4
    c50bf2c97e989aa19ad27fe62e67c5cfc6ae2a8b  base/pak008.pk4
++  8514ef18e32b157e07a45400d6283ef5f555bc80  base/game00.pk4
++  711948baf6fa62aa8325ddfee4370282911977dd  base/game01.pk4
++  4b5e447c1fe0b9f87865e6b638a93e055e3c5e16  base/game02.pk4
++  5efc59540da641f58b17a1d410cee37ef95d3d46  base/game03.pk4
+   846b7e0d931d48d08ee45cf226a5dbe7dba59861  License.txt
+   97d21648b424f1f6f8c11456166fd6e38e24abe0  d3xp/game01.pk4
+   22c7f6117043b2ddd10d9076336cce67bfd15a90  d3xp/game02.pk4
+   46230705a87cf88f1fa4a6094abc3c7cdf1ab428  d3xp/game03.pk4
    0d9ca3d4532c0d412fbb64ab2885f52ef8852594  d3xp/pak001.pk4
+ 
+   7fdba41af0521cdb815cad272499b888a348acfd  cdoom/Classic Doom 3.url
+   c4b63b17223ba9ec77408eac0d2bad1370ce47c2  cdoom/autoexec.cfg
+   295abe683546900bdea4b73a2760545e03f6ad55  cdoom/cdoom.ico
+   a2e4d30f06fa64868c59aa8805c1644c4199371b  cdoom/cdoom_dll.pk4
+   05619f728c50e563c8daf1aea6b915a2a4fcc46d  cdoom/cdoom_linux.pk4
+   bd9f8e158604c937b99cd02fc7dca2022745b5e2  cdoom/cdoom_mac.pk4
+   e0158ab23856803b8999d16418f4bc8ba8a0274f  cdoom/cdoom_main.pk4
+   6ed75bbaad262d2ce263aefe0252e68f51ee50ce  cdoom/cdoom_maps.pk4
+   7c95dc757ec1dd9c8b2558efa7fede3f731cd463  cdoom/cdoom_models.pk4
+   e8f650c96c58b23cca4c747fb1ef9d1fc68bceb8  cdoom/cdoom_sounds.pk4
+   5d328e7dea28283515eabb6eb32f8b33d1192d07  cdoom/cdoom_textures.pk4
+   5bf5c1759793319b369fc259cd556b580ad989be  cdoom/description.txt
+   ff922feefc9aebd9e5acd680c18d52eeb2ec70e4  cdoom/docs/License.txt
+   a0e1a98224a1e153e7de55365ebeafffbb175c2a  cdoom/docs/Readme.txt
+   aad0d136bf69d16c0b4e7b286df6406c329b5d96  cdoom/docs/shot00002.jpg
+   60a340ad7e8b971db61b17c4a40af227355a6469  cdoom/fan_extras/cdoomsource_131/framework/UsercmdGen.h
+   e2bbe141340597cb5d5768a72ef940cce26a0d89  cdoom/fan_extras/cdoomsource_131/game/Entity.cpp
+   29d84c56ad11eb394e6662e4b583c99add0420e9  cdoom/fan_extras/cdoomsource_131/game/Entity.h
+   41739b7c6a8ad05cdccaa7226d1f7065c3b5f201  cdoom/fan_extras/cdoomsource_131/game/Game_local.cpp
+   cfb4d297ba170c0607b5d78c59246f4eb93afea5  cdoom/fan_extras/cdoomsource_131/game/Game_local.h
+   64b11793192755c8123b066b550f8efb668c064d  cdoom/fan_extras/cdoomsource_131/game/Item.cpp
+   7fdc71059af7138ae102c85b821406352f398dce  cdoom/fan_extras/cdoomsource_131/game/Item.h
+   5261e4e0651d4909608eaaad175b392a7ee6d0b9  cdoom/fan_extras/cdoomsource_131/game/Misc.cpp
+   168b15242a08f39414c4b83b3132d0b5bb89e410  cdoom/fan_extras/cdoomsource_131/game/Misc.h
+   6b74cf43cf3a24137ae6c071a4f52a2303c2ec1d  cdoom/fan_extras/cdoomsource_131/game/MultiplayerGame.cpp
+   6ca1608f483385484c0f696e8c35d3dd69cbcf79  cdoom/fan_extras/cdoomsource_131/game/Player.cpp
+   7756dce4a0e9b88743bda630d9c24dadee2d657b  cdoom/fan_extras/cdoomsource_131/game/Player.h
+   9c66a7777725eb01f60fea95162c5b8c3f981f1c  cdoom/fan_extras/cdoomsource_131/game/PlayerView.cpp
+   ab4b0e5e23eb3c7124b894567d9bd1806e5be1a3  cdoom/fan_extras/cdoomsource_131/game/Sound.cpp
+   596db8c732b24012738d807a6118aec7be550487  cdoom/fan_extras/cdoomsource_131/game/Target.cpp
+   6d75beaa41a9fe11590cc6e741e593f3804de576  cdoom/fan_extras/cdoomsource_131/game/Target.h
+   1882ebf04e2fdc029c9dd44d83115b83f58a9f96  cdoom/fan_extras/cdoomsource_131/game/ai/AI.cpp
+   76b490b874cb644ff4d29cb39c13281d628eefd9  cdoom/fan_extras/cdoomsource_131/game/gamesys/SysCmds.cpp
+   8aefcab7b3e48e14db9f1108525173dba985f24c  cdoom/fan_extras/cdoomsource_131/game/gamesys/SysCvar.cpp
+   423bd84e968250ff66732c714f1c508e9f4f2779  cdoom/fan_extras/cdoomsource_131/game/gamesys/SysCvar.h
+   15e8e9e223d5a1d84b0bb2b42ea0fa9d620c95bf  cdoom/fan_extras/cdoomsource_131/readme.txt
+   dff9e44df79295b8ac837a7d8f247e66da0e5388  cdoom/fan_extras/classicdoom_001_1280x1024.jpg
+   fe8cfebbb329f90f51c08829b9491e04e5eadf13  cdoom/fan_extras/wallpaper1.jpg
+   75107cead28f79d2519f007ad077fd7d56548932  cdoom/fan_extras/wallpaper2.jpg
+   cf248c648914d35e0adc47e5cae9a2dbce3276ed  cdoom/fan_extras/wallpaper3.jpg
+ 
    0a9d9a9baff7eb1760214cefdb76a506c41e9f39  base/D3BFGConfig.cfg
    183b4f08dba658cd07c2ba5ef9e2ba8e1c319d2f  base/_common.crc
    d90263e4dbdb2d2efcc2ff0d25c500b3d2d5657b  base/_common.resources
@@@ -2835,7 -3106,10 +3128,11 @@@
    3451288383fb16e196f273d9f85d58c1fda97bf4  base/wads/NERVE.WAD
  
  sha256sums: |
 +  2f90dff20f2d3c0c47f17b3d6d45c4f0e7d27b986bf6084f21b85180cd1e03b4  doom3-linux-1.3.1.1304.x86.run
+   637985b519a35afb20bb4fa93e31fd3d4789bfaf75135b1ac3b15120cb4acc11  base/game00.pk4
+   510ed64ea6866f6c75d9d72a5e2735b863e4dfb559ac390b5b24a37f8ddd7813  base/game01.pk4
+   69ab195967817b0e22dbf8ab126ff073cfb56332c327da6789736e3074b73cc4  base/game02.pk4
+   25454a2d05204f09795ade93aac849cb119daf27395516704eb7bb9ea36cf9f6  base/game03.pk4
    220513bba8cc51191738b52b4ea320cd3376736e13147e240aa503622aa926ce  base/pak000.pk4
    dc85da3d731793f2973ffb7ef31be17057e88dee0b1157531c7f26a7b33c8fc0  base/pak001.pk4
    52d50dc300c87c484a0d7bc28c64777cafd7d581a91b5eeb6222991e328b7f1c  base/pak002.pk4

-- 
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