[game-data-packager] 01/10: Classic Doom: use ?variation syntax

Simon McVittie smcv at debian.org
Sun Oct 4 20:47:56 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 116114e13e913ab0db7c00bb3ec2b70a49b8065d
Author: Simon McVittie <smcv at debian.org>
Date:   Sun Oct 4 21:26:44 2015 +0100

    Classic Doom: use ?variation syntax
---
 data/doom.yaml       |  56 +++++++++--------------
 data/doom2.yaml      | 124 ++++++++++++++++++++++-----------------------------
 data/final-doom.yaml |  42 +++++++----------
 3 files changed, 91 insertions(+), 131 deletions(-)

diff --git a/data/doom.yaml b/data/doom.yaml
index cc14e0b..0d2bf96 100644
--- a/data/doom.yaml
+++ b/data/doom.yaml
@@ -44,99 +44,87 @@ files:
   # full version
   doom.wad:
     alternatives:
-    - doom.wad_1.9ud
-    - doom.wad_1.9
-    - doom.wad_xbox
-    - doom.wad_psn
-    - doom.wad_bfg
-    - doom1.wad_pocketpc
+    - doom.wad?1.9ud
+    - doom.wad?1.9
+    - doom.wad?xbox
+    - doom.wad?psn
+    - doom.wad?bfg
+    - doom1.wad?pocketpc
 
   # Best available full version: The Ultimate Doom
-  doom.wad_1.9ud:
+  doom.wad?1.9ud:
     size: 12408292
     sha1: 9b07b02ab3c275a6a7570c3f73cc20d63a0e3833
     md5: c4fe9fd920207691a9f493668e0a2083
-    look_for:
-    - doom.wad
 
   # Other 1.9 variants
-  doom.wad_1.9:
+  doom.wad?1.9:
     size: 11159840
     sha1: 7742089b4468a736cadb659a7deca3320fe6dcbd
     md5: 1cd63c5ddff1bf8ce844237f580e9cf3
-    look_for:
-    - doom.wad
-  doom.wad_xbox:
+  doom.wad?xbox:
     size: 12538385
     md5: 0c8758f102ccafe26a3040bee8ba5021
     sha1: 1d1d4f69fe14fa255228d8243470678b1b4efdc5
-    look_for:
-    - doom.wad
-  doom.wad_psn:
+  doom.wad?psn:
     size: 12474561
     md5: e4f120eab6fb410a5b6e11c947832357
     sha1: 117015379c529573510be08cf59810aa10bb934e
-    look_for:
-    - doom.wad
-  doom.wad_bfg:
+  doom.wad?bfg:
     size: 12487824
     md5: fb35c4a5a9fd49ec29ab6e900572c524
     sha1: e5ec79505530e151ff0e6f517f3ce1fd65969c46
-    look_for:
-    - doom.wad
   # despite its name this is full Doom
-  doom1.wad_pocketpc:
+  doom1.wad?pocketpc:
     distinctive_name: false
     size: 14445632
     md5: 3e410ecd27f61437d53fa5c279536e88
     sha1: 1d3c00534c452e266012e28ddc399ffe4d9ac8ed
-    look_for:
-    - doom1.wad
 
   # Older versions
-  doom.wad_0.2:
+  doom.wad?0.2:
     size: 496250
     md5: 740901119ba2953e3c7f3764eca6e128
     sha1: 89d934616c57fe974b06c2b37a9837853a89dbbc
     look_for: [doom1.wad]
     unsuitable: Doom 1.9 or The Ultimate Doom is required
-  doom.wad_0.4:
+  doom.wad?0.4:
     size: 2675669
     md5: b6afa12a8b22e2726a8ff5bd249223de
     sha1: 5f78b23fbffc828f5863ecff7e908d556241ff45
     look_for: [doom1.wad]
     unsuitable: Doom 1.9 or The Ultimate Doom is required
-  doom.wad_0.5:
+  doom.wad?0.5:
     size: 3522207
     md5: 9c877480b8ef33b7074f1f0c07ed6487
     sha1: d3648d720b5324ce3c7bf58cf019e395911d677e
     look_for: [doom1.wad]
     unsuitable: Doom 1.9 or The Ultimate Doom is required
-  doom.wad_beta:
+  doom.wad?beta:
     size: 5468456
     md5: 049e32f18d9c9529630366cfc72726ea
     sha1: 692994db9579be4201730b9ac77797fae2111bde
     look_for: [doom1.wad]
     unsuitable: Doom 1.9 or The Ultimate Doom is required
-  doom.wad_1.1:
+  doom.wad?1.1:
     size: 10396254
     md5: 981b03e6d1dc033301aa3095acc437ce
     sha1: df0040ccb29cc1622e74ceb3b7793a2304cca2c8
     look_for: [doom1.wad]
     unsuitable: Doom 1.9 or The Ultimate Doom is required
-  doom.wad_1.2:
+  doom.wad?1.2:
     size: 10399316
     md5: 792fd1fea023d61210857089a7c1e351
     sha1: b5f86a559642a2b3bdfb8a75e91c8da97f057fe6
     look_for: [doom1.wad]
     unsuitable: Doom 1.9 or The Ultimate Doom is required
-  doom.wad_1.666:
+  doom.wad?1.666:
     size: 11159840
     md5: 54978d12de87f162b9bcc011676cb3c0
     sha1: 2e89b86859acd9fc1e552f587b710751efcffa8e
     look_for: [doom1.wad]
     unsuitable: Doom 1.9 or The Ultimate Doom is required
-  doom.wad_1.8:
+  doom.wad?1.8:
     size: 11159840
     md5: 11e1cd216801ea2657723abc86ecb01f
     sha1: 2c8212631b37f21ad06d18b5638c733a75e179ff
@@ -144,7 +132,7 @@ files:
     unsuitable: Doom 1.9 or The Ultimate Doom is required
 
   # doom-wad-shareware
-  doom_wad_shareware:
+  doom_wad?shareware:
     size: 4196020
     md5: f0cefca49926d00903cf57551d901abe
     sha1: 5b2e249b9c5133ec987b3ea77596381dc0d6bc1d
@@ -164,7 +152,7 @@ files:
       - doom bible.pdf
       - manual.pdf
     provides:
-    - doom.wad_1.9ud
+    - doom.wad?1.9ud
     - doom bible.pdf
     - manual.pdf
 
diff --git a/data/doom2.yaml b/data/doom2.yaml
index dfc0cfb..ef4062b 100644
--- a/data/doom2.yaml
+++ b/data/doom2.yaml
@@ -112,59 +112,47 @@ packages:
 files:
   doom2.wad:
     alternatives:
-    - doom2.wad_1.9
-    - doom2.wad_bfg
-    - doom2.wad_xbox360_bfg
-    - doom2.wad_xbla
-    - doom2.wad_xbox_roe
-    - doom2.wad_psn
-    - doom2.wad_tapwave_zodiac
+    - doom2.wad?1.9
+    - doom2.wad?bfg
+    - doom2.wad?xbox360_bfg
+    - doom2.wad?xbla
+    - doom2.wad?xbox_roe
+    - doom2.wad?psn
+    - doom2.wad?tapwave_zodiac
     - doom2f.wad
 
-  doom2.wad_1.9:
+  doom2.wad?1.9:
     size: 14604584
-    look_for: [doom2.wad]
-  doom2.wad_bfg:
+  doom2.wad?bfg:
     size: 14691821
-    look_for: [doom2.wad]
-  doom2.wad_xbox360_bfg:
+  doom2.wad?xbox360_bfg:
     size: 14677988
-    look_for: [doom2.wad]
-  doom2.wad_xbla:
+  doom2.wad?xbla:
     size: 14685034
-    look_for: [doom2.wad]
-  doom2.wad_xbox_roe:
+  doom2.wad?xbox_roe:
     size: 14683458
-    look_for: [doom2.wad]
-  doom2.wad_psn:
+  doom2.wad?psn:
     size: 14599800
-    look_for: [doom2.wad]
-  doom2.wad_tapwave_zodiac:
+  doom2.wad?tapwave_zodiac:
     size: 14639397
-    look_for: [doom2.wad]
   doom2f.wad:
     size: 14607420
     install_as: doom2.wad
 
-  doom2.wad_1.666g:
+  doom2.wad?1.666g:
     size: 14824716
-    look_for: [doom2.wad]
     unsuitable: Doom 2 v1.9 is required
-  doom2.wad_1.666:
+  doom2.wad?1.666:
     size: 14943400
-    look_for: [doom2.wad]
     unsuitable: Doom 2 v1.9 is required
-  doom2.wad_1.7:
+  doom2.wad?1.7:
     size: 14612688
-    look_for: [doom2.wad]
     unsuitable: Doom 2 v1.9 is required
-  doom2.wad_1.7a:
+  doom2.wad?1.7a:
     size: 14612688
-    look_for: [doom2.wad]
     unsuitable: Doom 2 v1.9 is required
-  doom2.wad_1.8:
+  doom2.wad?1.8:
     size: 14612688
-    look_for: [doom2.wad]
     unsuitable: Doom 2 v1.9 is required
 
   attack.txt:
@@ -255,12 +243,8 @@ files:
 
   nerve.wad:
     alternatives:
-    - nerve.wad_pc
-    - nerve.wad_xbox360_bfg
-  nerve.wad_pc:
-    look_for: [nerve.wad]
-  nerve.wad_xbox360_bfg:
-    look_for: [nerve.wad]
+    - nerve.wad?pc
+    - nerve.wad?xbox360_bfg
 
   manual.pdf:
     install_to: $docdir
@@ -270,7 +254,7 @@ files:
       format: innoextract
       suffix: _1.9
     provides:
-    - doom2.wad_1.9
+    - doom2.wad?1.9
     - attack.wad
     - blacktwr.wad
     - bloodsea.wad
@@ -314,31 +298,31 @@ files:
     - manual.pdf
 
 cksums: |
-  _ 3819855   nerve.wad_pc
-  _ 3786293   nerve.wad_xbox360_bfg
-  _ 14824716  nerve.wad_xboxla
+  _ 3819855   nerve.wad?pc
+  _ 3786293   nerve.wad?xbox360_bfg
+  _ 14824716  nerve.wad?xboxla
   _ 1436188   master.exe
 
 md5sums: |
-  c3bea40570c23e511a7ed3ebcd9865f7  doom2.wad_bfg
-  d9153ced9fd5b898b36cc5844e35b520  doom2.wad_1.666g
-  30e3c2d0350b67bfbf47271970b74b2f  doom2.wad_1.666
-  ea74a47a791fdef2e9f2ea8b8a9da13b  doom2.wad_1.7
-  d7a07e5d3f4625074312bc299d7ed33f  doom2.wad_1.7a
-  c236745bb01d89bbb866c8fed81b6f8c  doom2.wad_1.8
-  f617591a6c5d07037eb716dc4863e26b  doom2.wad_xbox360_bfg
-  43c2df32dc6c740cb11f34dc5ab693fa  doom2.wad_xbla
-  a793ebcdd790afad4a1f39cc39a893bd  doom2.wad_xbox_roe
-  4c3db5f23b145fccd24c9b84aba3b7dd  doom2.wad_psn
-  9640fc4b2c8447bbd28f2080725d5c51  doom2.wad_tapwave_zodiac
+  c3bea40570c23e511a7ed3ebcd9865f7  doom2.wad?bfg
+  d9153ced9fd5b898b36cc5844e35b520  doom2.wad?1.666g
+  30e3c2d0350b67bfbf47271970b74b2f  doom2.wad?1.666
+  ea74a47a791fdef2e9f2ea8b8a9da13b  doom2.wad?1.7
+  d7a07e5d3f4625074312bc299d7ed33f  doom2.wad?1.7a
+  c236745bb01d89bbb866c8fed81b6f8c  doom2.wad?1.8
+  f617591a6c5d07037eb716dc4863e26b  doom2.wad?xbox360_bfg
+  43c2df32dc6c740cb11f34dc5ab693fa  doom2.wad?xbla
+  a793ebcdd790afad4a1f39cc39a893bd  doom2.wad?xbox_roe
+  4c3db5f23b145fccd24c9b84aba3b7dd  doom2.wad?psn
+  9640fc4b2c8447bbd28f2080725d5c51  doom2.wad?tapwave_zodiac
   3cb02349b3df649c86290907eed64e7b  doom2f.wad
-  967d5ae23daf45196212ae1b605da3b0  nerve.wad_pc
-  4f47bb32bf5fd06bc1cc0b4a2e8e3910  nerve.wad_xbox360_bfg
-  d4c3cb51899e8c399d0ea48cfcc87c53  nerve.wad_xboxla
+  967d5ae23daf45196212ae1b605da3b0  nerve.wad?pc
+  4f47bb32bf5fd06bc1cc0b4a2e8e3910  nerve.wad?xbox360_bfg
+  d4c3cb51899e8c399d0ea48cfcc87c53  nerve.wad?xboxla
   7c203b03cf052b6b731baec7c42d7ea9  master.exe
 
 size_and_md5: |
-  14604584  25e1459ca71d321525f84628f45ca8cd doom2.wad_1.9
+  14604584  25e1459ca71d321525f84628f45ca8cd doom2.wad?1.9
   1581      b5d81e4014b0e41a977ad837be62015a attack.txt
   185135    cb03fd0cd84b10579c2b2b313199d4c1 attack.wad
   4872      cd05ef340481c80dd866910fb61de078 blacktwr.txt
@@ -383,21 +367,21 @@ size_and_md5: |
   21908760  5915beaf6b0947fc2ec8075e262b4096 setup_doom2_2.0.0.6.exe
 
 sha1sums: |
-  7ec7652fcfce8ddc6e801839291f0e28ef1d5ae7  doom2.wad_1.9
-  79c283b18e61b9a989cfd3e0f19a42ea98fda551  doom2.wad_1.8
-  70192b8d5aba65c7e633a7c7bcfe7e3e90640c97  doom2.wad_1.7a
-  78009057420b792eacff482021db6fe13b370dcc  doom2.wad_1.7
-  6d559b7ceece4f5ad457415049711992370d520a  doom2.wad_1.666
-  a4ce5128d57cb129fdd1441c12b58245be55c8ce  doom2.wad_1.666g
-  a59548125f59f6aa1a41c22f615557d3dd2e85a9  doom2.wad_bfg
-  b7ba1c68631023ea1aab1d7b9f7f6e9afc508f39  doom2.wad_xbox360_bfg
-  55e445badd63d8841ebea887910c26c62c7f525e  doom2.wad_xbla
-  1c91d86cd8a2f3817227986503a6672a5e1613f0  doom2.wad_xbox_roe
-  ca8db908a7c9fbac764f34c148f0bcc78d18553e  doom2.wad_psn
-  2cda310805397ae44059bbcaed3cd602f4864a82  doom2.wad_tapwave_zodiac
+  7ec7652fcfce8ddc6e801839291f0e28ef1d5ae7  doom2.wad?1.9
+  79c283b18e61b9a989cfd3e0f19a42ea98fda551  doom2.wad?1.8
+  70192b8d5aba65c7e633a7c7bcfe7e3e90640c97  doom2.wad?1.7a
+  78009057420b792eacff482021db6fe13b370dcc  doom2.wad?1.7
+  6d559b7ceece4f5ad457415049711992370d520a  doom2.wad?1.666
+  a4ce5128d57cb129fdd1441c12b58245be55c8ce  doom2.wad?1.666g
+  a59548125f59f6aa1a41c22f615557d3dd2e85a9  doom2.wad?bfg
+  b7ba1c68631023ea1aab1d7b9f7f6e9afc508f39  doom2.wad?xbox360_bfg
+  55e445badd63d8841ebea887910c26c62c7f525e  doom2.wad?xbla
+  1c91d86cd8a2f3817227986503a6672a5e1613f0  doom2.wad?xbox_roe
+  ca8db908a7c9fbac764f34c148f0bcc78d18553e  doom2.wad?psn
+  2cda310805397ae44059bbcaed3cd602f4864a82  doom2.wad?tapwave_zodiac
   d510c877031bbd5f3d198581a2c8651e09b9861f  doom2f.wad
-  3451288383fb16e196f273d9f85d58c1fda97bf4  nerve.wad_pc
-  bb78b34dba684cc1ef1eea21f37092c6784d3b6f  nerve.wad_xbox360_bfg
+  3451288383fb16e196f273d9f85d58c1fda97bf4  nerve.wad?pc
+  bb78b34dba684cc1ef1eea21f37092c6784d3b6f  nerve.wad?xbox360_bfg
   139095fcf78349ad570be721d21dd1fa809fb3c8  attack.txt
   e0b93dcb87875544cc57306088983cb21ca45165  attack.wad
   c64e724dda69bd7318b63b9192434edc1bd9dcf7  blacktwr.txt
diff --git a/data/final-doom.yaml b/data/final-doom.yaml
index 7769af5..fa4593c 100644
--- a/data/final-doom.yaml
+++ b/data/final-doom.yaml
@@ -53,30 +53,24 @@ packages:
 files:
   tnt.wad:
     alternatives:
-    - tnt.wad_id_anthology
-    - tnt.wad_1.9
-    - tnt.wad_psn
+    - tnt.wad?id_anthology
+    - tnt.wad?1.9
+    - tnt.wad?psn
 
-  tnt.wad_id_anthology:
+  tnt.wad?id_anthology:
     size: 18654796
     sha1: 4a65c8b960225505187c36040b41a40b152f8f3e
     md5: 1d39e405bf6ee3df69a8d2646c8d5c49
-    look_for:
-    - tnt.wad
 
-  tnt.wad_1.9:
+  tnt.wad?1.9:
     size: 18195736
     sha1: 9fbc66aedef7fe3bae0986cdb9323d2b8db4c9d3
     md5: 4e158d9953c79ccf97bd0663244cc6b6
-    look_for:
-    - tnt.wad
 
-  tnt.wad_psn:
+  tnt.wad?psn:
     size: 18222568
     sha1: 139e26d801a64b404b8d898defca10227a61867b
     md5: be626c12b7c9d94b1dfb9c327566b4ff
-    look_for:
-    - tnt.wad
 
   tnt31.wad:
     size: 282000
@@ -92,7 +86,7 @@ files:
     provides:
     - tnt31.wad
 
-  tnt31fix.zip_repack:
+  tnt31fix.zip?repack:
     look_for: [tnt31fix.zip]
     download: http://doomedsda.us/lmps/944/tnt31fix.zip
     size: 110428
@@ -104,30 +98,24 @@ files:
 
   plutonia.wad:
     alternatives:
-    - plutonia.wad_id_anthology
-    - plutonia.wad_1.9
-    - plutonia.wad_psn
+    - plutonia.wad?id_anthology
+    - plutonia.wad?1.9
+    - plutonia.wad?psn
 
-  plutonia.wad_id_anthology:
+  plutonia.wad?id_anthology:
     size: 18240172
     sha1: f131cbe1946d7fddb3caec4aa258c83399c21e60
     md5: 3493be7e1e2588bc9c8b31eab2587a04
-    look_for:
-    - plutonia.wad
 
-  plutonia.wad_1.9:
+  plutonia.wad?1.9:
     size: 17420824
     sha1: 90361e2a538d2388506657252ae41aceeb1ba360
     md5: 75c8cf89566741fa9d22447604053bd7
-    look_for:
-    - plutonia.wad
 
-  plutonia.wad_psn:
+  plutonia.wad?psn:
     size: 17417800
     sha1: 327f8c41ebd4138354e9fca63cebbbd1b9489749
     md5: b77ca6a809c4fae086162dad8e7a1335
-    look_for:
-    - plutonia.wad
 
   manual.pdf:
     install_to: $docdir
@@ -145,8 +133,8 @@ files:
       - plutonia.wad
       - manual.pdf
     provides:
-    - tnt.wad_id_anthology
-    - plutonia.wad_id_anthology
+    - tnt.wad?id_anthology
+    - plutonia.wad?id_anthology
     - manual.pdf
 ...
 # vim:set sw=2 sts=2 et:

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