[game-data-packager] 03/03: doom3: Accept an alternative version of english.lang

[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 eec120dcdfcf840309bebcd9c82d2f89ccbf00c2
Author: Simon McVittie <smcv at debian.org>
Date:   Tue Jul 25 11:25:00 2017 +0100

    doom3: Accept an alternative version of english.lang
    
    Also part of #862432. Thanks: Max
---
 data/doom3.yaml  | 21 ++++++++++++++++++---
 debian/changelog |  2 ++
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/data/doom3.yaml b/data/doom3.yaml
index 6367e25..5d43fab 100644
--- a/data/doom3.yaml
+++ b/data/doom3.yaml
@@ -67,6 +67,7 @@ packages:
       path: "common/DOOM 3 BFG Edition"
     install:
       - BFG data
+      - base/strings/english.lang
     optional:
       - BFG CRCs
 
@@ -443,7 +444,6 @@ groups:
     8923828     2c84eeda28ab80493d2ca51bfadb4f97 base/sound/VO/video/video_soulcube.bik
     10925312    0712f07602c2ed95c5ecda40b20f877b base/sound/VO/video/video_tablets.bik
     7563896     c551fcd420081f8542decdc03265df38 base/sound/VO/video/video_uac_welcome.bik
-    564165      97edda4321c179507708695e9505471c base/strings/english.lang
     353912      f5b0544be30f1c7b579c70e31073ea3f base/video/admin/betruger.bik
     1393180     c5f6b652709d305324e35501c4b6acb5 base/video/comm1/swann_vidphone1.bik
     1398308     92a75b1d68ce944f9209191f97a7d5b8 base/video/comm1/swann_vidphone2.bik
@@ -537,6 +537,14 @@ groups:
       18129 148d5da64fe41c4709f3f83aaddb1f25  License.txt?d3xp
       954   9db62a73aea3db208194bb4a2c1944b1  cdoom/docs/License.txt
 
+  files with alternatives: |
+    group_members: |
+      564165    97edda4321c179507708695e9505471c  base/strings/english.lang?steam
+
+      # "a BFG installation from an old computer", presumably a CD/DVD release
+      # or an older version?
+      563876    a31a937d3697adaade8af07c1f192640  base/strings/english.lang?bug862432
+
 files:
   doom3-linux-1.3.1.1304.x86.run:
     distinctive_size: true
@@ -580,6 +588,11 @@ files:
       - Classic Doom source
       - cdoom/docs/License.txt
 
+  base/strings/english.lang:
+    alternatives:
+      - base/strings/english.lang?steam
+      - base/strings/english.lang?bug862432
+
 sha1sums: |
   028dd18e5bada1e563c2a0d3bf5e77572d78e6b9  doom3-linux-1.3.1.1304.x86.run
   3b3cdd19ec394fb5c1ae271993f181097e5c6085  base/pak000.pk4
@@ -985,7 +998,8 @@ sha1sums: |
   4554e6c46f017965b079d8629910d54cb3e5bd36  base/sound/VO/video/video_soulcube.bik
   3d79cb3940759ef62ef66f84a9182622b92d176f  base/sound/VO/video/video_tablets.bik
   961fa1a8bcf31376a36c469c634a2a99174ab7e1  base/sound/VO/video/video_uac_welcome.bik
-  2c0448b7059c273aebcd1c772fd9661b783659c4  base/strings/english.lang
+  6afee176c624b127e2f185b0d6ff9bc4dcf28c2f  base/strings/english.lang?bug862432
+  2c0448b7059c273aebcd1c772fd9661b783659c4  base/strings/english.lang?steam
   73f002bae7a4cbe3ffbeeb2912a5e19008cb3c05  base/video/admin/betruger.bik
   e49dae706f2077ec8e9e84a78c7149a4c5311088  base/video/comm1/swann_vidphone1.bik
   5020d05a4fe7c916657c491c83a9676a040c7ab7  base/video/comm1/swann_vidphone2.bik
@@ -1423,7 +1437,8 @@ sha256sums: |
   5bf05f96334fe28f85c234463fdf056e9b617069c79ccf2dff6d7f0fa1cad0a0  base/sound/VO/video/video_soulcube.bik
   50c21014b5f21c4c816acaa361876e8d63f85e60631cc95ced629cd1a83eeb39  base/sound/VO/video/video_tablets.bik
   7ec8200c0c37d8f1e5122dddbafcb316d07110d193f472fe87f956f57d92dc6d  base/sound/VO/video/video_uac_welcome.bik
-  532dd9637fb045937cdd9e2c1b5291934f454398922722070a7e36b074b137d9  base/strings/english.lang
+  8ee7c5ba50b6321dd6cd44d882221bd5575e9591fc9fdd443214ddc37a58b0ca  base/strings/english.lang?bug862432
+  532dd9637fb045937cdd9e2c1b5291934f454398922722070a7e36b074b137d9  base/strings/english.lang?steam
   715c65e1342a799fb73e3c74aa49515b8e37684ade0bf9dba18636969a3465cf  base/video/admin/betruger.bik
   86443fbcd25f9146084be8ce89b1a60738a36b177ce01eac5abbca546b4e624e  base/video/comm1/swann_vidphone1.bik
   5568a407a3719889f0082efe6aa74709c1fdac6d971b2e83f8cbed29d1a5b489  base/video/comm1/swann_vidphone2.bik
diff --git a/debian/changelog b/debian/changelog
index 91e7eef..83f6fe1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ game-data-packager (54) UNRELEASED; urgency=medium
       and so is hopefully clearly not intended to be human-readable, let
       alone editable) indicating what to do instead of editing them. [smcv]
     - doom3: Make all .crc files optional (really Closes: #862432) [smcv]
+    - doom3: Accept an alternative version of english.lang (also part of
+      #862432). Thanks, Max [smcv]
   * Internal changes:
     - Skip some of the more elaborate consistency checks when running a
       packaged version [smcv]

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