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

Simon McVittie smcv at debian.org
Sun Feb 15 15:25:36 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 611ac5833a9a642882fe2370741f94404e5c97b0
Merge: 93fd754 da3a773
Author: Alexandre Detiste <alexandre.detiste at gmail.com>
Date:   Wed Feb 11 14:15:02 2015 +0100

    Merge branch 'master' of git://anonscm.debian.org/pkg-games/game-data-packager
    
    Conflicts:
    	data/doom3.yaml: little bit of duplicate work

 data/comi.yaml                        | 157 +++++++
 data/curse-of-monkey-island.copyright |  22 +
 data/doom.yaml                        |   3 +
 data/doom2.yaml                       |   3 +
 data/doom3.yaml                       |   7 +-
 data/full-throttle-data.copyright     |  22 +
 data/fullthrottle.yaml                | 839 ++++++++++++++++++++++++++++++++++
 data/ja.yaml                          |   4 +
 data/residualvm-common.desktop.in     |   2 +-
 data/scummvm-common.desktop.in        |   2 +-
 debian/changelog                      |  15 +-
 11 files changed, 1071 insertions(+), 5 deletions(-)

diff --cc data/doom3.yaml
index 9509f87,0cdd38b..960423c
--- a/data/doom3.yaml
+++ b/data/doom3.yaml
@@@ -775,133 -723,8 +776,134 @@@ packages
      - base/wads/NERVE.WAD
      - base/wads/DOOM2.WAD
      - base/wads/DOOM.WAD
+ 
 +files:
 +  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/pak005.pk4
 +    - base/pak006.pk4
 +    - base/pak007.pk4
 +    - base/pak008.pk4
 +    - d3xp/pak001.pk4
 +    # ???
 +    - base/game01.pk4
 +    - base/game02.pk4
 +    - base/game03.pk4
 +    - d3xp/game01.pk4
 +    - d3xp/game02.pk4
 +    - d3xp/game03.pk4
 +    - base/zpak003.pk4
 +    - d3xp/zpak101.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: |
 +  3020409499 353159257 base/pak000.pk4
 +  1437100813 229649726 base/pak001.pk4
 +  2513550240 416937674 base/pak002.pk4
 +  1287221965 317590154 base/pak003.pk4
 +  1029570683 237752384 base/pak004.pk4
 +  3302722352 552334    base/pak005.pk4
 +  2130247405 218751    base/pak006.pk4
 +  1446435975 192031    base/pak007.pk4
 +  3955608439 12243     base/pak008.pk4
 +
 +  _ 50        cdoom/Classic Doom 3.url
 +  _ 89        cdoom/autoexec.cfg
 +  _ 22486     cdoom/cdoom.ico
 +  _ 1037189   cdoom/cdoom_dll.pk4
 +  _ 15435202  cdoom/cdoom_linux.pk4
 +  _ 3703491   cdoom/cdoom_mac.pk4
 +  _ 20610219  cdoom/cdoom_main.pk4
 +  _ 29532860  cdoom/cdoom_maps.pk4
 +  _ 72481549  cdoom/cdoom_models.pk4
 +  _ 52829162  cdoom/cdoom_sounds.pk4
 +  _ 15633643  cdoom/cdoom_textures.pk4
 +  _ 23        cdoom/description.txt
 +  _ 954       cdoom/docs/License.txt
 +  _ 13502     cdoom/docs/Readme.txt
 +  _ 45969     cdoom/docs/shot00002.jpg
 +  _ 4938      cdoom/fan_extras/cdoomsource_131/framework/UsercmdGen.h
 +  _ 137567    cdoom/fan_extras/cdoomsource_131/game/Entity.cpp
 +  _ 22440     cdoom/fan_extras/cdoomsource_131/game/Entity.h
 +  _ 116116    cdoom/fan_extras/cdoomsource_131/game/Game_local.cpp
 +  _ 28038     cdoom/fan_extras/cdoomsource_131/game/Game_local.h
 +  _ 32962     cdoom/fan_extras/cdoomsource_131/game/Item.cpp
 +  _ 5033      cdoom/fan_extras/cdoomsource_131/game/Item.h
 +  _ 77425     cdoom/fan_extras/cdoomsource_131/game/Misc.cpp
 +  _ 17302     cdoom/fan_extras/cdoomsource_131/game/Misc.h
 +  _ 104346    cdoom/fan_extras/cdoomsource_131/game/MultiplayerGame.cpp
 +  _ 238594    cdoom/fan_extras/cdoomsource_131/game/Player.cpp
 +  _ 24420     cdoom/fan_extras/cdoomsource_131/game/Player.h
 +  _ 19831     cdoom/fan_extras/cdoomsource_131/game/PlayerView.cpp
 +
    _ 4587      base/D3BFGConfig.cfg
    _ 9064      base/_common.crc
    _ 80383351  base/_common.resources
@@@ -2323,58 -2105,8 +2325,59 @@@ md5sums: 
    fb35c4a5a9fd49ec29ab6e900572c524  base/wads/DOOM.WAD
    c3bea40570c23e511a7ed3ebcd9865f7  base/wads/DOOM2.WAD
    967d5ae23daf45196212ae1b605da3b0  base/wads/NERVE.WAD
+ 
  sha1sums: |
 +  3b3cdd19ec394fb5c1ae271993f181097e5c6085  base/pak000.pk4
 +  76e477e61b0248ce5181fef582212a5332c34c20  base/pak001.pk4
 +  cfa56ff89255f9bd56b9e40b24f4d54b76f9caee  base/pak002.pk4
 +  5afb060a63ae0749ccbb0d26da4c00938b241dde  base/pak003.pk4
 +  d77145983d5689e2230c5b479b48a2847aa668b2  base/pak004.pk4
 +  4c53f56f3a784c38b1e45d4eba7a23d1d5cc3ada  base/pak005.pk4
 +  de543a0369dbae3d4181f2c727085adb89ef3531  base/pak006.pk4
 +  662a4014dabe26bcdd988877fadaff7d6a09725c  base/pak007.pk4
 +  c50bf2c97e989aa19ad27fe62e67c5cfc6ae2a8b  base/pak008.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
@@@ -3058,55 -2790,8 +3061,56 @@@
    e5ec79505530e151ff0e6f517f3ce1fd65969c46  base/wads/DOOM.WAD
    a59548125f59f6aa1a41c22f615557d3dd2e85a9  base/wads/DOOM2.WAD
    3451288383fb16e196f273d9f85d58c1fda97bf4  base/wads/NERVE.WAD
+ 
  sha256sums: |
 +  220513bba8cc51191738b52b4ea320cd3376736e13147e240aa503622aa926ce  base/pak000.pk4
 +  dc85da3d731793f2973ffb7ef31be17057e88dee0b1157531c7f26a7b33c8fc0  base/pak001.pk4
 +  52d50dc300c87c484a0d7bc28c64777cafd7d581a91b5eeb6222991e328b7f1c  base/pak002.pk4
 +  a946bf100ba931edb1d814d78baccc5b8279a52b1351ab00bb049bce993e365a  base/pak003.pk4
 +  eac10316182f06832b7c087dbac4dad98c4e3243e6aecf7d9906ff7ba9514ba3  base/pak004.pk4
 +  d50a114eb655cb7f55da38870e1a992a9f4efe5c52910f83eba8fe6dbbe85657  base/pak005.pk4
 +  a0d28ebada2697f5a8d4d1f06a705d2335044bab9aee805679a2bd0c3b7d59b1  base/pak006.pk4
 +  e5d57ede9def75c7cbb0542ceef6ad56147c9a2162c8517f716410b9092965a0  base/pak007.pk4
 +  57be0712bb180943ad51757b48486bc590e9242fd885704771c0a7102953d4b7  base/pak008.pk4
 +
 +  43561eabe56575aa74ba89a0650158bbf11bb42f91d1d11d9d77fa04fc7d2ed3  cdoom/Classic Doom 3.url
 +  79918fe28d234e47124c5118117d8b341e133a1c09f06377112ae401217740e5  cdoom/autoexec.cfg
 +  cb42810ea29d1e0b775fde33f9973cc1d08b6350c11bf24693c200810af7e089  cdoom/cdoom.ico
 +  52ce6551669118c1182d1b016ae914acd863ec1060f05528d60c62be592dbe67  cdoom/cdoom_dll.pk4
 +  0802d6a3b9fb0975b8fba775a0227c8878de83d04f2fb9344609cf81cf257335  cdoom/cdoom_linux.pk4
 +  746ccc61f35cfe1a6dfef2c401ba05e842d3eef4cbd73c85122c0f1be85c2a23  cdoom/cdoom_mac.pk4
 +  400142d466ffd39b9fd38c66be38a57d39563b067bdbedc05380d65748de6ffc  cdoom/cdoom_main.pk4
 +  3128bc1deb1ef70bf7732a82315b45844022933c83fe362b0e51d2eb24d113f3  cdoom/cdoom_maps.pk4
 +  0a66779d26bcf1534eadfd24146f74f4ecb69de1cbbb9a4cd502029c6e46b15b  cdoom/cdoom_models.pk4
 +  a3e947329cc27bfaceded74470bfa9064a518ab422ba19b8e4909cfb681e1443  cdoom/cdoom_sounds.pk4
 +  92153ad62f1f1d213995f4bc6cc3209f7da65cebbcee8d6b5c4bcff7c9290536  cdoom/cdoom_textures.pk4
 +  656b8cec2b95c967174d35eede80bd5365877f0552cd66dec5063cf63a0194fa  cdoom/description.txt
 +  1f27d4fd0004c8c5135f143c744bb740ae07584bb01ab5cfd0455f017608840b  cdoom/docs/License.txt
 +  ae5c8c79a0820b3f7b714df942d4d0907d3758183dc065e84fb7a33712b46ee5  cdoom/docs/Readme.txt
 +  6b215d4b462dad10a8bee47126fd84b8cb20c020f3857ee28f834af8b3c10ade  cdoom/docs/shot00002.jpg
 +  45d23583d5bf1edc0cea6ce368b75ea39d0c624db41c8eb2baaf2dd04b937890  cdoom/fan_extras/cdoomsource_131/framework/UsercmdGen.h
 +  9d8c4486e10f5a0372c21874b469760c6fbbe867c248cb2ebe38201530176aee  cdoom/fan_extras/cdoomsource_131/game/Entity.cpp
 +  cffe16b32f89dfad5d78da547d552877f9700cb1779fa84adc1f4c11e47a4aad  cdoom/fan_extras/cdoomsource_131/game/Entity.h
 +  3b6613e7b8e3c91d453beca27a59a258244015a010f8d27b8587261f690c1efa  cdoom/fan_extras/cdoomsource_131/game/Game_local.cpp
 +  cad2ccf33a6325962c24b8564a53027a84743d6a16a39f258f9e128ceae74973  cdoom/fan_extras/cdoomsource_131/game/Game_local.h
 +  64bbb0f87969adbcec7f4236da69c2cd2c79b3c92759cdfe83d132776db3c1cc  cdoom/fan_extras/cdoomsource_131/game/Item.cpp
 +  f1e652be1279ffd99f559b1a51c77bc88d6d67cf06a806a54bc92faa1ef0f21f  cdoom/fan_extras/cdoomsource_131/game/Item.h
 +  2d79e918be8b57dc41c9b7b71d4fcbc2298b452eae202d1e285c88b246c9d5a8  cdoom/fan_extras/cdoomsource_131/game/Misc.cpp
 +  baf11d0b6fd0284f680468b834821e3f95eef8c0d333a8f3909e16323e4a7d76  cdoom/fan_extras/cdoomsource_131/game/Misc.h
 +  943eebeb49d009f78b4b4125bee673a257de546e49ccf669cfd3388ca407a73d  cdoom/fan_extras/cdoomsource_131/game/MultiplayerGame.cpp
 +  effcfb55612691f115346fe28a26c35acfc27a3ef976e34ebd97acf3255f73d4  cdoom/fan_extras/cdoomsource_131/game/Player.cpp
 +  04867b9b3c0faf46c6ad505d6054e3d16f97bd160a6a53bb3ac274e2904aee9b  cdoom/fan_extras/cdoomsource_131/game/Player.h
 +  627faa3ab9498291f147191226031d35383e7bde75e0e3e88683b810317858fd  cdoom/fan_extras/cdoomsource_131/game/PlayerView.cpp
 +  8ce9a640adf65cf3c9d438ee999d7eb66343406f74ff1094a003862047dc9734  cdoom/fan_extras/cdoomsource_131/game/Sound.cpp
 +  456c4ad15a503b38eb51588980a6f9a93c8ae417ff812c8316c1eb50d978700f  cdoom/fan_extras/cdoomsource_131/game/Target.cpp
 +  0322647c44148c3fd6053bd8a1222c68724f5d5b20ba7d8e286be06aa4e8a07c  cdoom/fan_extras/cdoomsource_131/game/Target.h
 +  c1ca1ce2352272b8ad0a8719209893eab6af0e700b4635f7f2a7a7a64ac51a51  cdoom/fan_extras/cdoomsource_131/game/ai/AI.cpp
 +  860d3b652f194df3e4101046f267c7dd03525134bfaf311c0b5439393bae9e03  cdoom/fan_extras/cdoomsource_131/game/gamesys/SysCmds.cpp
 +  eedacabcef911efea22ccdf3a5b3e0017ae400730e71bded961bad3f81668840  cdoom/fan_extras/cdoomsource_131/game/gamesys/SysCvar.cpp
 +  dbfe72b2e473d63eb63f80f498a9263fdae8db6c9e6accbe4b6676f1717360d3  cdoom/fan_extras/cdoomsource_131/game/gamesys/SysCvar.h
 +  4092a0be828f7002673bcf985d1b0ca975f71edd2eda701f648ed4fa5b638c28  cdoom/fan_extras/cdoomsource_131/readme.txt
 +  ab946b66ef97d736b9e7045f89e2bbc1b400b0c5b93f20a03307747164751a50  cdoom/fan_extras/classicdoom_001_1280x1024.jpg
 +
    358600c024093d3bf16065160329903e8c75caf47c57ca62b6110b19c0e49002  base/D3BFGConfig.cfg
    653f3aa478e1a179e6b307ba0077c402d4e9af3c6ffd441487f4678d7ea35a4f  base/_common.crc
    b683ac1b1d3f0ca6b92111db85fc77ece9d5c034ce5461eb8a7c4add8e239a22  base/_common.resources

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