Your message dated Sun, 21 May 2017 10:14:00 +0000
with message-id <fc1a5a8e-43c2-ed1e-867f-61ba8eeb1...@thykier.net>
and subject line Re: Bug#863029: unblock (pre-approval): game-data-packager/49.1
has caused the Debian Bug report #863029,
regarding unblock (pre-approval): game-data-packager/49.1
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)


-- 
863029: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=863029
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock

game-data-packager in experimental (v51) fixes a non-RC but annoying
regression from jessie (#860998) which we would like to fix in stretch
(currently at v49).

I've prepared a proposed v49.1 version for stretch, with a backport
from v50 of that fix, together with some other unintrusive bug fixes
from v50 and v51. Would this be OK to upload?

Thanks,
    S
diffstat for game-data-packager-49 game-data-packager-49.1

 data/camelot.yaml           |    2 
 data/copyright              |    4 -
 data/doom3.yaml             |   15 ++++--
 data/freddypharkas.yaml     |    2 
 data/gobliiins.yaml         |    2 
 data/gobliins2.yaml         |    2 
 data/goblins3.yaml          |   15 ------
 data/hexen2.yaml            |   19 ++++++--
 data/iceman.yaml            |    2 
 data/icewind-dale-2.yaml    |   11 ++++
 data/ja.yaml                |   11 ++++
 data/jk2.yaml               |   11 ++++
 data/larry1.yaml            |   24 ++++++++++
 data/larry2.yaml            |   10 ++++
 data/larry3.yaml            |   10 ++++
 data/larry5.yaml            |    9 ++++
 data/larry6.yaml            |    9 ++++
 data/last-crusade.yaml      |    2 
 data/laura-bow1.yaml        |    2 
 data/laura-bow2.yaml        |    2 
 data/longbow.yaml           |    2 
 data/t7g.yaml               |    2 
 data/tony.yaml              |    2 
 data/xcom-ufo.yaml          |   98 ++++++++++++++++++++++----------------------
 debian/.gitignore           |    1 
 debian/changelog            |   30 +++++++++++++
 debian/copyright            |    6 +-
 debian/copyright.in         |    6 +-
 game_data_packager/build.py |    3 -
 game_data_packager/data.py  |    2 
 30 files changed, 226 insertions(+), 90 deletions(-)

diff -Nru game-data-packager-49/data/camelot.yaml game-data-packager-49.1/data/camelot.yaml
--- game-data-packager-49/data/camelot.yaml	2017-03-14 11:12:53.000000000 +0000
+++ game-data-packager-49.1/data/camelot.yaml	2016-12-22 16:43:05.000000000 +0000
@@ -4,6 +4,8 @@
 copyright: © 1990 Sierra
 plugin: scummvm_common
 wiki: Conquests_of_Camelot
+gog:
+  url: conquests_of_camelot
 
 packages:
   conquests-of-camelot-data:
diff -Nru game-data-packager-49/data/copyright game-data-packager-49.1/data/copyright
--- game-data-packager-49/data/copyright	2017-03-14 11:12:53.000000000 +0000
+++ game-data-packager-49.1/data/copyright	2016-12-22 16:43:05.000000000 +0000
@@ -18,8 +18,8 @@
 © 2008-2013 Jonathan Dowland
 © 2011-2016 Stephen Kitt
 © 2012-2015 Markus Koschany
-© 2014-2016 Simon McVittie
-© 2015-2016 Alexandre Detiste
+© 2014-2017 Simon McVittie
+© 2015-2017 Alexandre Detiste
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff -Nru game-data-packager-49/data/doom3.yaml game-data-packager-49.1/data/doom3.yaml
--- game-data-packager-49/data/doom3.yaml	2017-03-14 11:12:53.000000000 +0000
+++ game-data-packager-49.1/data/doom3.yaml	2016-12-22 16:43:05.000000000 +0000
@@ -66,6 +66,8 @@
       path: "common/DOOM 3 BFG Edition"
     install:
       - BFG data
+    optional:
+      - BFG CRCs
 
 groups:
   base data: |
@@ -87,20 +89,23 @@
   d3xp patch: |
     99336 06fc9be965e345587064056bf22236d2  d3xp/pak001.pk4
 
-  BFG data: |
+  # Not all versions have these. They don't seem to be mandatory
+  BFG CRCs: |
     9064        00f89dc77d79f015d834019114f5fe74 base/_common.crc
-    80383351    6eea23da08930c4f91415ee005d417ff base/_common.resources
     5360        c6017691bc059f4c460a5df0f6ab5a5a base/_ordered.crc
-    11311441    cedb159596cacb5a8f22bda251475b6a base/_ordered.resources
     19052       0645725e0c5d03cadffc4695e663c233 base/_sound_pc.crc
-    545924092   98ce8ddb7aa83b7f2b39ff9cc6a5064e base/_sound_pc.resources
     3376        27bf2ef54ff3743f8c52e296ad97c037 base/_sound_pc_en.crc
-    133979908   d30d68a061b8771e9730c2a0dd07edbb base/_sound_pc_en.resources
     3316        c13acbb298d4deadfcd06db10cba0d43 base/_sound_pc_fr.crc
     3336        4277451b4cfbcb7b060dedbdaf93b0fd base/_sound_pc_gr.crc
     3336        e8e977b1b58069354da2b05e7e9a54a2 base/_sound_pc_it.crc
     3340        6df877b53293348cb360fe7215d0b18c base/_sound_pc_jp.crc
     3316        4b82286cec8f8ce00f20f35566dc5049 base/_sound_pc_sp.crc
+
+  BFG data: |
+    80383351    6eea23da08930c4f91415ee005d417ff base/_common.resources
+    11311441    cedb159596cacb5a8f22bda251475b6a base/_ordered.resources
+    545924092   98ce8ddb7aa83b7f2b39ff9cc6a5064e base/_sound_pc.resources
+    133979908   d30d68a061b8771e9730c2a0dd07edbb base/_sound_pc_en.resources
     2973        d6dab5e941e5090e99951e521336daeb base/classicmusic/gravis.cfg
     10829       08a0918d039ca1cfb418feaca1fe8983 base/classicmusic/instruments/ACBASS.PAT
     19623       ee71868661463ac9f8bb6b2eede1dbef base/classicmusic/instruments/ACCORDN.PAT
diff -Nru game-data-packager-49/data/freddypharkas.yaml game-data-packager-49.1/data/freddypharkas.yaml
--- game-data-packager-49/data/freddypharkas.yaml	2017-03-14 11:12:53.000000000 +0000
+++ game-data-packager-49.1/data/freddypharkas.yaml	2016-12-22 16:43:05.000000000 +0000
@@ -7,6 +7,8 @@
 packages:
   freddy-pharkas-cd-data:
     version: '1.000'
+    gog:
+      url: freddy_pharkas_frontier_pharmacist
     install:
     - cd assets
     - version
diff -Nru game-data-packager-49/data/gobliiins.yaml game-data-packager-49.1/data/gobliiins.yaml
--- game-data-packager-49/data/gobliiins.yaml	2017-03-14 11:12:53.000000000 +0000
+++ game-data-packager-49.1/data/gobliiins.yaml	2016-12-22 16:43:05.000000000 +0000
@@ -10,8 +10,6 @@
     gog:
       url: gobliiins_pack
       game: gobliiins
-    dotemu:
-      id: 25
     provides: gobliiins-data
     install:
     - gob.lic
diff -Nru game-data-packager-49/data/gobliins2.yaml game-data-packager-49.1/data/gobliins2.yaml
--- game-data-packager-49/data/gobliins2.yaml	2017-03-14 11:12:53.000000000 +0000
+++ game-data-packager-49.1/data/gobliins2.yaml	2016-12-22 16:43:05.000000000 +0000
@@ -13,8 +13,6 @@
     gog:
       url: gobliiins_pack
       game: gobliins_2_the_prince_buffoon
-    dotemu:
-      id: 25
     install:
     - intro.stk
     - gobnew.lic
diff -Nru game-data-packager-49/data/goblins3.yaml game-data-packager-49.1/data/goblins3.yaml
--- game-data-packager-49/data/goblins3.yaml	2017-03-14 11:12:53.000000000 +0000
+++ game-data-packager-49.1/data/goblins3.yaml	2016-12-22 16:43:05.000000000 +0000
@@ -8,13 +8,6 @@
 
 missing_langs: [es,pl]
 
-help_text: |
-  DotEmu claims to sell a Spanish & Polish version of this game too.
-
-  Please provide the output of
-  $ game-data-packager make-template <path>
-  if you own these translations.
-
 packages:
   goblins3-floppy-data:
     longname: "Goblins Quest 3 (floppy)"
@@ -30,8 +23,6 @@
     gog:
       url: gobliiins_pack
       game: goblins_quest_3
-    dotemu:
-      id: 25
     install:
     - ext.stk
     - imd.itk
@@ -51,8 +42,6 @@
     gog:
       url: gobliiins_pack
       game: goblins_quest_3
-    dotemu:
-      id: 25
     install:
     - ext.stk
     - imd.itk
@@ -72,8 +61,6 @@
     gog:
       url: gobliiins_pack
       game: goblins_quest_3
-    dotemu:
-      id: 25
     install:
     - ext.stk
     - imd.itk
@@ -93,8 +80,6 @@
     gog:
       url: gobliiins_pack
       game: goblins_quest_3
-    dotemu:
-      id: 25
     install:
     - ext.stk
     - imd.itk
diff -Nru game-data-packager-49/data/hexen2.yaml game-data-packager-49.1/data/hexen2.yaml
--- game-data-packager-49/data/hexen2.yaml	2017-03-14 11:12:53.000000000 +0000
+++ game-data-packager-49.1/data/hexen2.yaml	2016-12-22 16:43:05.000000000 +0000
@@ -63,7 +63,10 @@
     unpack:
       format: tar.gz
 
-  hexen2demo_nov1997-linux-i586.tgz:
+  # Timestamps comes from here:
+  # tar xzvfO hexen2demo_nov1997-linux-i586.tgz hexen2demo_nov1997/docs/CHANGES | head
+
+  hexen2demo_nov1997-linux-i586.tgz?20160110:
     download: http://sourceforge.net/project/downloading.php?group_id=124987&filename=hexen2demo_nov1997-linux-i586.tgz
     provides:
     - data1/pak0.pak_demo
@@ -71,6 +74,13 @@
     unpack:
       format: tar.gz
 
+  hexen2demo_nov1997-linux-i586.tgz?20130315:
+    unpack:
+      format: tar.gz
+    provides:
+    - data1/pak0.pak_demo
+    - HEXEN II SUBLICENSE.doc
+
   h2demoupd.exe:
     unpack:
       format: zip
@@ -94,7 +104,8 @@
   27750257 8e598d82bf53436ed7a0e133aa4b9f09 data1/pak0.pak_demo
   30208    f610eb93304c4cd2cdce97bdb9140e4e HEXEN II SUBLICENSE.doc
   15334912 d058ecd35e419a5b8bdf17003a006843 h2demoupd.exe
-  19585198 b486f7b7a01b359ad801eac9486ba25f hexen2demo_nov1997-linux-i586.tgz
+  19585198 b486f7b7a01b359ad801eac9486ba25f hexen2demo_nov1997-linux-i586.tgz?20130315
+  13419798 7257d7b5f366c7bbf7328c6fb8160008 hexen2demo_nov1997-linux-i586.tgz?20160110
 
 sha1sums: |
   7c6b19d76ce85771026ea8dbdc397cd1109355b7  data1/pak0.pak
@@ -105,7 +116,7 @@
   a8cfd8790819c47998141adb97c14d1680cf8738  data1/pak0.pak_demo
   1aadeaf00dc72726e03bcfeb2fa0af93107852a7  HEXEN II SUBLICENSE.doc
   dcb5ab7c92352a8af4975151bd089354723d9417  h2demoupd.exe
-  1633010f5c33afcf00931425d7d190eaffeed579  hexen2demo_nov1997-linux-i586.tgz
+  1633010f5c33afcf00931425d7d190eaffeed579  hexen2demo_nov1997-linux-i586.tgz?20130315
 
 sha256sums: |
   57936acc4cd9abed7acb480dd9c6d59c7c98e96e4eca4e2d04f390d2dfa5ffde  data1/pak0.pak
@@ -116,7 +127,7 @@
   0d4aa01a9909771dfa8e5be27db5d6628dc92f1406998c1a89c27d4748aaf151  data1/pak0.pak_demo
   b9841c4b9c2de220d393ab06650779782cdb905f4721367607abf1dd56316da4  HEXEN II SUBLICENSE.doc
   b349824ba09ddf0e95ca8a0f1783640d745c560b67da20a9cc31d1e816e63ab8  h2demoupd.exe
-  f1f5ec95a33ca6a81eb27034b82b3c76d29004585baf6cfa2a1a21ab089b7ae1  hexen2demo_nov1997-linux-i586.tgz
+  f1f5ec95a33ca6a81eb27034b82b3c76d29004585baf6cfa2a1a21ab089b7ae1  hexen2demo_nov1997-linux-i586.tgz?20130315
 
 ...
 # vim:set sw=2 sts=2 et:
diff -Nru game-data-packager-49/data/iceman.yaml game-data-packager-49.1/data/iceman.yaml
--- game-data-packager-49/data/iceman.yaml	2017-03-14 11:12:53.000000000 +0000
+++ game-data-packager-49.1/data/iceman.yaml	2016-12-22 16:43:05.000000000 +0000
@@ -7,6 +7,8 @@
 packages:
   iceman-data:
     version: '1.023'
+    gog:
+      url: codename_iceman
     install:
     - assets
 
diff -Nru game-data-packager-49/data/icewind-dale-2.yaml game-data-packager-49.1/data/icewind-dale-2.yaml
--- game-data-packager-49/data/icewind-dale-2.yaml	2017-03-14 11:12:53.000000000 +0000
+++ game-data-packager-49.1/data/icewind-dale-2.yaml	2016-12-22 16:43:05.000000000 +0000
@@ -40,6 +40,15 @@
     - ddrawfix/readme.html
     - readme.htm
 
+  setup_icewind_dale2_2.1.0.13.exe:
+    unpack:
+      format: innoextract
+    provides:
+    - default group
+    - support.ico
+    - ddrawfix/readme.html
+    - readme.htm
+
 groups:
  default group: |
   7927106   f65059e109226d0dd13e1335c2f249cb cd2/data/anmbarb.bif
@@ -2576,6 +2585,7 @@
   43083     bb4b2a11b0fb92297daf419692af6374 readme.htm
  archives: |
   1365685272 40df734de7f050433fabb91a9f75bde8 setup_icewind_dale2_2.0.0.11.exe
+  1370678024 9a68fdabdaff58bebc67092d47d4174e setup_icewind_dale2_2.1.0.13.exe
 
 sha1sums: |
   18d3b565313373be4777f3a2c643599aef7cd365  cd2/data/anmbarb.bif
@@ -4840,6 +4850,7 @@
   c18a2d771d2487e6c6dc51a2ba1127f4ebb0213a  support.ico
   98fb8771ef45f9f9f8794c410765ed86b8f7f846  readme.htm
   f2cef2f340f7949fb2b960f39a458fbcae579122  setup_icewind_dale2_2.0.0.11.exe
+  990721995c7b9640efc4bc97bff30fba17fc3b5c  setup_icewind_dale2_2.1.0.13.exe
 ...
 # vim:set sw=2 sts=2 et:
 
diff -Nru game-data-packager-49/data/ja.yaml game-data-packager-49.1/data/ja.yaml
--- game-data-packager-49/data/ja.yaml	2017-03-14 11:12:53.000000000 +0000
+++ game-data-packager-49.1/data/ja.yaml	2016-12-22 16:43:05.000000000 +0000
@@ -119,8 +119,17 @@
     196080485 93f4f42338f1479eeb6ef8b6ca2f8e13  GHJediAcademy.zip
     14191104  b58bd4b6ee9ecf32bf36c06468627675  jabonusmaps.exe
     5945344   ea334db95f4436ceab5c6670d1695f67  jasiegedestroyer.exe
+    1317436576 4aa9d8dc65d6d426281b419ac72e804f setup_star_wars_jedi_knight_-_jedi_academy_1.01_(10331).exe
 
 files:
+  setup_star_wars_jedi_knight_-_jedi_academy_1.01_(10331).exe:
+    unpack:
+      format: innoextract
+    provides:
+    - base game
+    - patch
+    - license.txt
+
   jabonusmaps.exe:
     provides:
     - base/bonus.pk3
@@ -199,6 +208,7 @@
   ce92ea7e92c77da09d7a21245699ce56b1923d4e  data2.cab
   93c5a678fc250dacb17be8f09b3a8253d2ec8048  assets0.pk3?demo
   85d35354ac49f102baed51ff67d5f7abe892785b  license.txt
+  4f257c4625f08f612b75bb4b0aa722c00a9902e8  setup_star_wars_jedi_knight_-_jedi_academy_1.01_(10331).exe
 
 sha256sums: |
   ffea9e7489bad7175411d122e0652b4272efb67c0e71805d1f4d8058084b5939  base/assets0.pk3
@@ -217,6 +227,7 @@
   9fe56ac86286847ab5a1dfebc1dd1c6d9001ca9d986da0b223ae53b80815fa5a  data2.cab
   d7d015ef905f7df092eb5b9d011013a80b3eca414aca3e8de50d89a2e8e299ed  assets0.pk3?demo
   60b35b90f168939db20c3e9ab7b72d657f576e56adba65b01bf2ea6d88f1f6f5  license.txt
+  b8b7784757a849fdcbc1294f5f2918e2033a6aae9c8f03932b6cde6f93ea2b92  setup_star_wars_jedi_knight_-_jedi_academy_1.01_(10331).exe
 
 # Not used yet
 sha512sums: |
diff -Nru game-data-packager-49/data/jk2.yaml game-data-packager-49.1/data/jk2.yaml
--- game-data-packager-49/data/jk2.yaml	2017-03-14 11:12:53.000000000 +0000
+++ game-data-packager-49.1/data/jk2.yaml	2016-12-22 16:43:05.000000000 +0000
@@ -32,6 +32,13 @@
     install:
       - required files
 
+files:
+  setup_sw_jedi_outcast_2.0.0.3.exe:
+    unpack:
+      format: innoextract
+    provides:
+    - required files
+
 groups:
   required files: |
     # Jedi Outcast CD-ROM or installation
@@ -41,18 +48,22 @@
     # programatically)
     3764210   88369ad9f959cbe64a6d948f08305d20  base/assets2.pk3
     550829    b7c34a06029798e178c075216ea37a9d  base/assets5.pk3
+  archives: |
+    728458328 62ba89d547a9457e1f5800e234916331  setup_sw_jedi_outcast_2.0.0.3.exe
 
 sha1sums: |
   a8729608364c0ef9fa54173c947f070ecb1fae61  base/assets0.pk3
   a424a76549379a118a1ecb6ea28c111abb1dc351  base/assets1.pk3
   34925afdfddd1c69763ba5ccc404c9cfeb2d224c  base/assets2.pk3
   17d9233a04201ca3edb4afd7f50a6a77e48910f3  base/assets5.pk3
+  230492794fdaa2cae4944d65cea562ac1f00005c  setup_sw_jedi_outcast_2.0.0.3.exe
 
 sha256sums: |
   e8e466f219bb2faed536021bb0d10aa6b7f5cd687302aa43080da2debdae307c  base/assets0.pk3
   c3a9aeaf09c93e57847290e7e5cd6c1a071a560045fa8c5e8c6df3688df841c1  base/assets1.pk3
   aa5bf361f7623f0210473021d73fa1e6c6997f7a5cceb6af19fce951edd43368  base/assets2.pk3
   7dc6bc7e599a32cc882fb2a9b741065f792ef39a129302fbd04d72ef77ee7a07  base/assets5.pk3
+  b7e56004ae16ea19c6953d5ea688807bb463175961a41be26e90cd38b6270971  setup_sw_jedi_outcast_2.0.0.3.exe
 
 # Not used yet
 sha512sums: |
diff -Nru game-data-packager-49/data/larry1.yaml game-data-packager-49.1/data/larry1.yaml
--- game-data-packager-49/data/larry1.yaml	2017-03-14 11:12:53.000000000 +0000
+++ game-data-packager-49.1/data/larry1.yaml	2016-12-22 16:43:05.000000000 +0000
@@ -66,6 +66,17 @@
   Leisure Suit Larrys Greatest Hits and Misses - Manual.pdf:
     install_to: $pkgdocdir
 
+  setup_leisure_suit_larry_2.2.0.19.exe:
+    unpack:
+      format: innoextract
+    provides:
+    - ega english assets
+    - LSL1 Answers.txt
+    - Leisure Suit Larry 1 - Manual.pdf
+    - Leisure Suit Larrys Greatest Hits and Misses - Manual.pdf
+  Leisure Suit Larrys Greatest Hits and Misses - Manual.pdf:
+    install_to: $pkgdocdir
+
   setup_leisure_suit_larry_vga_2.2.0.20.exe:
     unpack:
       format: innoextract
@@ -75,6 +86,15 @@
     - Leisure Suit Larry 1 - Manual.pdf
     - Leisure Suit Larrys Greatest Hits and Misses - Manual.pdf
 
+  setup_leisure_suit_larry_vga_2.2.0.21.exe:
+    unpack:
+      format: innoextract
+    provides:
+    - vga english assets
+    - LSL1 VGA Answers.txt
+    - Leisure Suit Larry 1 - Manual.pdf
+    - Leisure Suit Larrys Greatest Hits and Misses - Manual.pdf
+
 groups:
  ega english assets: |
   177       1fe764e66857e7f305a5f03ca3f4971d logdir
@@ -96,7 +116,9 @@
 
  archives: |
   23768496  bd8e0429499febf5dc0bf1df5790c520 setup_leisure_suit_larry_2.2.0.18.exe
+  25963136  f99018e5cb4caccd5271def3ff35ce92 setup_leisure_suit_larry_2.2.0.19.exe
   26725608  22c1089852291ce42af2715c88f53e55 setup_leisure_suit_larry_vga_2.2.0.20.exe
+  28915848  6c717c16ac591ceceaf2eeb146bd69e3 setup_leisure_suit_larry_vga_2.2.0.21.exe
 
  documentation: |
   7211      9e7eb68fa7836217b2b000f09fa3e1d9 LSL1 VGA Answers.txt
@@ -115,6 +137,7 @@
   6d711d5a8e836d46e552e8acdc72f7d44c33bd42  vol.2
   9fd64e7d57a707afa4f834adc7ee6affd9b7d940  words.tok
   6c1ac0d49ff1ccc043605c2471534635fda851dc  setup_leisure_suit_larry_2.2.0.18.exe
+  63b6d5b7f9a9a75350ad08d6bc8f463a86f51078  setup_leisure_suit_larry_2.2.0.19.exe
   104728bd0cbaba43b4399a0c94c4b0cbe82df0f5  LSL1 Answers.txt
   addcb935efef34c53b956b0420bbd72256b1722a  Leisure Suit Larry 1 - Manual.pdf
   f99b52b8f43c6928f9a620e48ced09859221f5ad  Leisure Suit Larrys Greatest Hits and Misses - Manual.pdf
@@ -125,6 +148,7 @@
   3e7b8ea9694d1abdd07e4f0a650828e8c528bcad  resource.map
   78c92c927672a09170d668650b6cdba405fd038a  version
   8221455d825c65df09ec80af0394767a15ae799a  setup_leisure_suit_larry_vga_2.2.0.20.exe
+  9a44e7454bee6f32d384cba66360b3fc0e5ccf87  setup_leisure_suit_larry_vga_2.2.0.21.exe
   b9533fe27cb6e9b8b86ece1287f0e5ec2f0a7ca0  LSL1 VGA Answers.txt
 ...
 
diff -Nru game-data-packager-49/data/larry2.yaml game-data-packager-49.1/data/larry2.yaml
--- game-data-packager-49/data/larry2.yaml	2017-03-14 11:12:53.000000000 +0000
+++ game-data-packager-49.1/data/larry2.yaml	2016-12-22 16:43:05.000000000 +0000
@@ -39,6 +39,14 @@
     - LSL2 phone numbers.pdf
     - Leisure Suit Larry 2 - Manual.pdf
     - Leisure Suit Larrys Greatest Hits and Misses - Manual.pdf
+  setup_leisure_suit_larry2_2.2.0.19.exe:
+    unpack:
+      format: innoextract
+    provides:
+    - english assets
+    - LSL2 phone numbers.pdf
+    - Leisure Suit Larry 2 - Manual.pdf
+    - Leisure Suit Larrys Greatest Hits and Misses - Manual.pdf
 
 groups:
  english assets: |
@@ -48,6 +56,7 @@
   4758      2c9c3b0923e3764f5ab999bcb71c2d47 resource.map
  gog archive: |
   25312072  383cd5482b83c97cdb51abf610fa34b9 setup_leisure_suit_larry2_2.2.0.18.exe
+  27424392  4a512171d5d7480adbd3125d2a09fda7 setup_leisure_suit_larry2_2.2.0.19.exe
   1229890   d2b3be2c462d969d88c646c52a573a61 Leisure Suit Larry 2 - Manual.pdf
   8230209   bcc1974851f3d79ab57358a78d84c13c Leisure Suit Larrys Greatest Hits and Misses - Manual.pdf
   247730    d441f643c2cfe2732e48fe27c32814a5 LSL2 phone numbers.pdf
@@ -59,6 +68,7 @@
   e840e7db8c06f815529638d3206b1e8424110a05  resource.map
 
   d5165ab2bc57e80e883ea257af31bfe8d2f70a89  setup_leisure_suit_larry2_2.2.0.18.exe
+  fd95f4861bde2b64661a5126e43682a7e31b40da  setup_leisure_suit_larry2_2.2.0.19.exe
   33bffd02156c73b9b55684fc3eb230ebd55f93bd  Leisure Suit Larry 2 - Manual.pdf
   f99b52b8f43c6928f9a620e48ced09859221f5ad  Leisure Suit Larrys Greatest Hits and Misses - Manual.pdf
   d3c6e816511379b96d51489b8c81f8f3eb36bdda  LSL2 phone numbers.pdf
diff -Nru game-data-packager-49/data/larry3.yaml game-data-packager-49.1/data/larry3.yaml
--- game-data-packager-49/data/larry3.yaml	2017-03-14 11:12:53.000000000 +0000
+++ game-data-packager-49.1/data/larry3.yaml	2016-12-22 16:43:05.000000000 +0000
@@ -41,6 +41,14 @@
     - Leisure Suit Larry 3 - Manual.pdf
     - Leisure Suit Larrys Greatest Hits and Misses - Manual.pdf
     - lsl3 answers.txt
+  setup_leisure_suit_larry3_2.2.0.20.exe:
+    unpack:
+      format: innoextract
+    provides:
+    - assets english
+    - Leisure Suit Larry 3 - Manual.pdf
+    - Leisure Suit Larrys Greatest Hits and Misses - Manual.pdf
+    - lsl3 answers.txt
 
 groups:
  assets english: |
@@ -51,6 +59,7 @@
   5916      b7a2fb642614dd76d10d1ad5e0625044 resource.map
  gog archive: |
   31554032  50cf0a52dfa9b78d033ac67b90a16ef3 setup_leisure_suit_larry3_2.2.0.19.exe
+  33732200  991e91595db3a16c89ece2b8155abb76 setup_leisure_suit_larry3_2.2.0.20.exe
   3982554   609d5c0936321757058e2c5593218c7d Leisure Suit Larry 3 - Manual.pdf
   8230209   bcc1974851f3d79ab57358a78d84c13c Leisure Suit Larrys Greatest Hits and Misses - Manual.pdf
   20580     014441a515d58fd2d527716412993a82 lsl3 answers.txt
@@ -63,6 +72,7 @@
   0fa62170cd442ccbb131b8b4e33f8f6eb155fd5b  resource.map
 
   71b21dd8913695acd616208b49a23c0f24f07e46  setup_leisure_suit_larry3_2.2.0.19.exe
+  33e43bde85ea95d0bafd2c274afd090b8878d8a2  setup_leisure_suit_larry3_2.2.0.20.exe
   b51b526633c4c0759fa6893ba576af58bd0a5383  Leisure Suit Larry 3 - Manual.pdf
   f99b52b8f43c6928f9a620e48ced09859221f5ad  Leisure Suit Larrys Greatest Hits and Misses - Manual.pdf
   b4f7ca8b25d3f25ff761e3b4f7ffd04096ac2ef9  lsl3 answers.txt
diff -Nru game-data-packager-49/data/larry5.yaml game-data-packager-49.1/data/larry5.yaml
--- game-data-packager-49/data/larry5.yaml	2017-03-14 11:12:53.000000000 +0000
+++ game-data-packager-49.1/data/larry5.yaml	2016-12-22 16:43:05.000000000 +0000
@@ -59,6 +59,13 @@
     - assets english
     - Leisure Suit Larry 5 - Manual.pdf
     - Leisure Suit Larrys Greatest Hits and Misses - Manual.pdf
+  setup_leisure_suit_larry5_2.2.0.21.exe:
+    unpack:
+      format: innoextract
+    provides:
+    - assets english
+    - Leisure Suit Larry 5 - Manual.pdf
+    - Leisure Suit Larrys Greatest Hits and Misses - Manual.pdf
 
 groups:
  assets english: |
@@ -103,6 +110,7 @@
   47        46193f01af607c4ae9fed96054f8c3c2 version?fr
  default group: |
   33177424  601f55e4904852acbc0c7292f8969231 setup_leisure_suit_larry5_2.2.0.20.exe
+  35337288  8ec88e4cc5ce340fb873ff52000c3c3c setup_leisure_suit_larry5_2.2.0.21.exe
   3549212   a0c5b6ddca5b8a4a1f38cef21d45913c Leisure Suit Larry 5 - Manual.pdf
   8230209   bcc1974851f3d79ab57358a78d84c13c Leisure Suit Larrys Greatest Hits and Misses - Manual.pdf
   1514      56462f66091cc0da0fed8074603a8824 readme?fr
@@ -137,6 +145,7 @@
   0610b81f0dbce0496ff9fcf8edb115a54696f34a  version
 
   bbeac2d5ca5de991fa90efb8b1d2635b48e048cc  setup_leisure_suit_larry5_2.2.0.20.exe
+  3a40a1d5fb5329fdbd25e8c782c9a4f714780d31  setup_leisure_suit_larry5_2.2.0.21.exe
   369fc95e873d1ac9edf9e2cf5877b34d932f0d13  Leisure Suit Larry 5 - Manual.pdf
   f99b52b8f43c6928f9a620e48ced09859221f5ad  Leisure Suit Larrys Greatest Hits and Misses - Manual.pdf
 ...
diff -Nru game-data-packager-49/data/larry6.yaml game-data-packager-49.1/data/larry6.yaml
--- game-data-packager-49/data/larry6.yaml	2017-03-14 11:12:53.000000000 +0000
+++ game-data-packager-49.1/data/larry6.yaml	2016-12-22 16:43:05.000000000 +0000
@@ -56,6 +56,13 @@
     - vga assets
     - Leisure Suit Larry 6 - Manual.pdf
     - Leisure Suit Larrys Greatest Hits and Misses - Manual.pdf
+  setup_leisure_suit_larry6_vga_2.2.0.19.exe:
+    unpack:
+      format: innoextract
+    provides:
+    - vga assets
+    - Leisure Suit Larry 6 - Manual.pdf
+    - Leisure Suit Larrys Greatest Hits and Misses - Manual.pdf
 
 groups:
  vga assets: |
@@ -140,6 +147,7 @@
   964895    bcf41711544685c9b5365311f839619f Leisure Suit Larry 6 - Manual.pdf
   8230209   bcc1974851f3d79ab57358a78d84c13c Leisure Suit Larrys Greatest Hits and Misses - Manual.pdf
   404934784 373cc731980938602a79bd9220a56040 setup_leisure_suit_larry6_vga_2.2.0.18.exe
+  407138320 2acfe2b839162036710b6759e66da9ac setup_leisure_suit_larry6_vga_2.2.0.19.exe
   415305696 49b574db89248fa813505bc1aee216a3 setup_leisure_suit_larry6_2.2.0.18.exe
 
 sha1sums: |
@@ -214,6 +222,7 @@
   72f39aa29c220db4bd53a4a2833ef8e0db08d7de  version
 
   d0f08649e3f890550b62476f1c7ca39557f22745  setup_leisure_suit_larry6_vga_2.2.0.18.exe
+  53739296cee3bc44ccb489cfdbf5830eae9939b4  setup_leisure_suit_larry6_vga_2.2.0.19.exe
   f007409ce463da8a1355850570becc2a1761c24e  Leisure Suit Larry 6 - Manual.pdf
   f99b52b8f43c6928f9a620e48ced09859221f5ad  Leisure Suit Larrys Greatest Hits and Misses - Manual.pdf
 
diff -Nru game-data-packager-49/data/last-crusade.yaml game-data-packager-49.1/data/last-crusade.yaml
--- game-data-packager-49/data/last-crusade.yaml	2017-03-14 11:12:53.000000000 +0000
+++ game-data-packager-49.1/data/last-crusade.yaml	2016-12-22 16:43:05.000000000 +0000
@@ -15,6 +15,8 @@
       id: 32310
       path: "common/Indiana Jones and the Last Crusade"
       #XXX: 00.lfl is included in "Indiana Jones and the Last Crusade.exe"
+    gog:
+      url: indiana_jones_and_the_last_crusade
     install:
     - 00.lfl
     - 01.lfl
diff -Nru game-data-packager-49/data/laura-bow1.yaml game-data-packager-49.1/data/laura-bow1.yaml
--- game-data-packager-49/data/laura-bow1.yaml	2017-03-14 11:12:53.000000000 +0000
+++ game-data-packager-49.1/data/laura-bow1.yaml	2016-12-22 16:43:05.000000000 +0000
@@ -5,6 +5,8 @@
 plugin: scummvm_common
 gameid: laurabow
 wiki: Laura_Bow:_The_Colonel%27s_Bequest
+gog:
+    url: the_colonels_bequest
 
 packages:
   laura-bow1-data:
diff -Nru game-data-packager-49/data/laura-bow2.yaml game-data-packager-49.1/data/laura-bow2.yaml
--- game-data-packager-49/data/laura-bow2.yaml	2017-03-14 11:12:53.000000000 +0000
+++ game-data-packager-49.1/data/laura-bow2.yaml	2016-12-22 16:43:05.000000000 +0000
@@ -9,6 +9,8 @@
 packages:
   laura-bow2-data:
     version: '1.1'
+    gog:
+      url: the_colonels_bequest
     optional:
     # squareish picture, could be converted in a .png icon
     - laurt.bmp
diff -Nru game-data-packager-49/data/longbow.yaml game-data-packager-49.1/data/longbow.yaml
--- game-data-packager-49/data/longbow.yaml	2017-03-14 11:12:53.000000000 +0000
+++ game-data-packager-49.1/data/longbow.yaml	2016-12-22 16:43:05.000000000 +0000
@@ -18,6 +18,8 @@
   conquests-of-the-longbow-v11-data:
     provides: conquests-of-the-longbow-data
     version: '1.1'
+    gog:
+      url: conquests_of_the_longbow
     install:
     - assets v1.1
 
diff -Nru game-data-packager-49/data/t7g.yaml game-data-packager-49.1/data/t7g.yaml
--- game-data-packager-49/data/t7g.yaml	2017-03-14 11:12:53.000000000 +0000
+++ game-data-packager-49.1/data/t7g.yaml	2016-12-22 16:43:05.000000000 +0000
@@ -19,8 +19,6 @@
       native: true
     gog:
       url: the_7th_guest
-    dotemu:
-      id: 2788
     install:
     - at.gjd
     - assets
diff -Nru game-data-packager-49/data/tony.yaml game-data-packager-49.1/data/tony.yaml
--- game-data-packager-49/data/tony.yaml	2017-03-14 11:12:53.000000000 +0000
+++ game-data-packager-49.1/data/tony.yaml	2016-12-22 16:43:05.000000000 +0000
@@ -9,8 +9,6 @@
   id: 356210
   path: common/TonyTough
   native: true
-dotemu:
-  id: 4602
 
 packages:
   tony-tough-en-data:
diff -Nru game-data-packager-49/data/xcom-ufo.yaml game-data-packager-49.1/data/xcom-ufo.yaml
--- game-data-packager-49/data/xcom-ufo.yaml	2017-03-14 11:12:53.000000000 +0000
+++ game-data-packager-49.1/data/xcom-ufo.yaml	2016-12-22 16:43:05.000000000 +0000
@@ -11,6 +11,8 @@
     steam:
       id: 7760
       path: "common/XCom UFO Defense/XCOM"
+    gog:
+      url: xcom_ufo_defense
     install:
     - GEODATA/BACKPALS.DAT
     - GEODATA/BIGLETS.DAT
@@ -1523,10 +1525,10 @@
   96        4feb37704727e6d7a400174baa8fe81f ROUTES/MARS05.RMP
   48        0e6ea23d00bb9daffb7fd538f43169c5 ROUTES/MARS06.RMP
   48        18c58c1970a1c6b94b27e3b68b7c84e0 ROUTES/MARS07.RMP
-  144       024926ee91ce5458bc7a1a8e0e441ebe ROUTES/MARS08.RMP_orig
-  144       d5b42dc7cc2fa2576bdb1f28f132eacb ROUTES/MARS08.RMP
-  192       ba4ce40e0da05ed9c27a004f9afdf46e ROUTES/MARS09.RMP_orig
-  192       3be43fc22ed43524194f75c166586007 ROUTES/MARS09.RMP
+  144       024926ee91ce5458bc7a1a8e0e441ebe ROUTES/MARS08.RMP
+  144       d5b42dc7cc2fa2576bdb1f28f132eacb ROUTES/MARS08.RMP_orig
+  192       ba4ce40e0da05ed9c27a004f9afdf46e ROUTES/MARS09.RMP
+  192       3be43fc22ed43524194f75c166586007 ROUTES/MARS09.RMP_orig
   72        edd8b42866211ada5791bd29d91a2407 ROUTES/MARS10.RMP
   24        b022be6fda2eca980323fbb371626636 ROUTES/MOUNT00.RMP
   24        b022be6fda2eca980323fbb371626636 ROUTES/MOUNT01.RMP
@@ -1551,8 +1553,8 @@
   96        cb2690dd23e073a351e5e869cc8b193b ROUTES/POLAR05.RMP
   24        234c35d1b32e921ec55e00f0bbe8df7c ROUTES/POLAR06.RMP
   24        234c35d1b32e921ec55e00f0bbe8df7c ROUTES/POLAR07.RMP
-  96        85cb41dabfe48723e29c8dff0e861b20 ROUTES/POLAR08.RMP_orig
-  96        1e5be485cee2f132bd6f26c3b4275fc6 ROUTES/POLAR08.RMP
+  96        85cb41dabfe48723e29c8dff0e861b20 ROUTES/POLAR08.RMP
+  96        1e5be485cee2f132bd6f26c3b4275fc6 ROUTES/POLAR08.RMP_orig
   24        e164c38ad902f847b64e92c57ff40cdc ROUTES/POLAR09.RMP
   24        87de5f59b5af11ef518f1859ee2b985b ROUTES/POLAR10.RMP
   24        d7f446dad5814bff85fb4249b1ad14a1 ROUTES/POLAR11.RMP
@@ -1562,10 +1564,10 @@
   0         d41d8cd98f00b204e9800998ecf8427e ROUTES/TEMP1.RMP
   0         d41d8cd98f00b204e9800998ecf8427e ROUTES/TEMP2.RMP
   0         d41d8cd98f00b204e9800998ecf8427e ROUTES/TEMP3.RMP
-  600       f28eac9c68153edf44b43849d7469eb1 ROUTES/UBASE_00.RMP_orig
-  600       a8ffe3dccc9732b78f8ee59484a3447d ROUTES/UBASE_00.RMP
-  336       7aeae3ee761f574fd8f1eea673b18723 ROUTES/UBASE_01.RMP
-  336       b02d7c26e334f95e72adcbc87b78f4b8 ROUTES/UBASE_01.RMP_orig
+  600       f28eac9c68153edf44b43849d7469eb1 ROUTES/UBASE_00.RMP
+  600       a8ffe3dccc9732b78f8ee59484a3447d ROUTES/UBASE_00.RMP_orig
+  336       7aeae3ee761f574fd8f1eea673b18723 ROUTES/UBASE_01.RMP_orig
+  336       b02d7c26e334f95e72adcbc87b78f4b8 ROUTES/UBASE_01.RMP
   336       d2091cb6b82323f12782bd48766959df ROUTES/UBASE_02.RMP
   360       ac48e98509f7a5e30e2d1ff162fa218c ROUTES/UBASE_03.RMP
   264       61ba564e6725eab7489eea4742c7402a ROUTES/UBASE_04.RMP_orig
@@ -1576,28 +1578,28 @@
   144       8c0325a3496f14b3c824b96796ef9d29 ROUTES/UBASE_08.RMP
   96        b7683d2e1d93a5ba3aed7fd7ef788ec9 ROUTES/UBASE_09.RMP
   24        c682dad0f2d78c1a3f734924e23a3609 ROUTES/UBASE_10.RMP
-  48        f7d738c5b7f8b45e985ded9b240ef5bd ROUTES/UBASE_11.RMP_orig
-  48        a03b0a6ed6a3671ee6fa65fd572e5c9a ROUTES/UBASE_11.RMP
+  48        f7d738c5b7f8b45e985ded9b240ef5bd ROUTES/UBASE_11.RMP
+  48        a03b0a6ed6a3671ee6fa65fd572e5c9a ROUTES/UBASE_11.RMP_orig
   120       73ff8de52d8a7477759f21b7b2a2d8f6 ROUTES/UBASE_12.RMP
   96        27fe63dcf876471fa81c783eb7160cbd ROUTES/UBASE_13.RMP
   120       aa421eb10ce3d31673c8aa35e5ed1ae8 ROUTES/UBASE_14.RMP
   504       745b841b6257eaaf5f319e8dd3da8e49 ROUTES/UBASE_15.RMP
-  144       70d281feb86e6507c29546958a2d2f2a ROUTES/UFO1A.RMP_orig
-  144       ad77aa4d36af5956b0784282af6f1eb6 ROUTES/UFO1A.RMP
+  144       70d281feb86e6507c29546958a2d2f2a ROUTES/UFO1A.RMP
+  144       ad77aa4d36af5956b0784282af6f1eb6 ROUTES/UFO1A.RMP_orig
   140       d6333341333cb7b345660a3d78d091aa ROUTES/UFO_000.RMP
   520       f89f84efeeaf236e540e3dcdf8009640 ROUTES/UFO_010.RMP
   192       1cd42cfa0791de4fa3916668596ece6a ROUTES/UFO_110.RMP_orig
   264       fb649ac61013c2fb43d5b40d20440a6b ROUTES/UFO_110.RMP
-  504       815608ae39e07310e5ef4add65465cde ROUTES/UFO_120.RMP_orig
-  504       1a28a777f75f42a958a86b1bc9a81ffe ROUTES/UFO_120.RMP
-  1056      6de67adc7272215219c6babb6f85d77e ROUTES/UFO_130.RMP_orig
-  1056      b1352cbc4404333f68200f136077850d ROUTES/UFO_130.RMP
-  936       2a805fcef92b52edbaf0dcce6ae60c49 ROUTES/UFO_140.RMP_orig
-  936       6bb716b25ebc210b77529fbe5104efc4 ROUTES/UFO_140.RMP
-  1128      6a51f929ee88021c1666abae4176ef3c ROUTES/UFO_150.RMP_orig
-  1128      57b45421d17591786b1ab0bc51597c5e ROUTES/UFO_150.RMP
-  2136      f6138cae721bdca610b81afa9c6655af ROUTES/UFO_160.RMP_orig
-  2136      afe77b9e23560721c60e9656e8e5cfeb ROUTES/UFO_160.RMP
+  504       815608ae39e07310e5ef4add65465cde ROUTES/UFO_120.RMP
+  504       1a28a777f75f42a958a86b1bc9a81ffe ROUTES/UFO_120.RMP_orig
+  1056      6de67adc7272215219c6babb6f85d77e ROUTES/UFO_130.RMP
+  1056      b1352cbc4404333f68200f136077850d ROUTES/UFO_130.RMP_orig
+  936       2a805fcef92b52edbaf0dcce6ae60c49 ROUTES/UFO_140.RMP
+  936       6bb716b25ebc210b77529fbe5104efc4 ROUTES/UFO_140.RMP_orig
+  1128      6a51f929ee88021c1666abae4176ef3c ROUTES/UFO_150.RMP
+  1128      57b45421d17591786b1ab0bc51597c5e ROUTES/UFO_150.RMP_orig
+  2136      f6138cae721bdca610b81afa9c6655af ROUTES/UFO_160.RMP
+  2136      afe77b9e23560721c60e9656e8e5cfeb ROUTES/UFO_160.RMP_orig
   1536      ad43c825834a43d793fa814883054939 ROUTES/UFO_170.RMP_orig
   1560      011a644ead33a84d6869a26cc514ba0f ROUTES/UFO_170.RMP
   24        6f1b520a0a6e4c60940f714ec23110a6 ROUTES/URBAN00.RMP
@@ -1676,8 +1678,8 @@
   436432    670c10f725d92b8261606289d97e4195 SOUND/SAMPLE3.CAT
   401148    0bc607f9a03cac159c36846f95e74ef2 SOUND/SOUND1.CAT
   103614    322deccf4813bac7e0b7d968c5083ebb SOUND/SOUND2.CAT
-  3658      7744671eaddf60fce32c4970083c1b6e TERRAIN/AVENGER.MCD_orig
-  3658      0a8d6a67cfd2dcd13af5ef41c5faa760 TERRAIN/AVENGER.MCD
+  3658      7744671eaddf60fce32c4970083c1b6e TERRAIN/AVENGER.MCD
+  3658      0a8d6a67cfd2dcd13af5ef41c5faa760 TERRAIN/AVENGER.MCD_orig
   27196     7a64fa43bb6dc0f968d4705938062556 TERRAIN/AVENGER.PCK
   124       072682538fb00704259e1836609583a4 TERRAIN/AVENGER.TAB
   1798      598267ab2faf15b472ba2f04520e2809 TERRAIN/BARN.MCD
@@ -1713,12 +1715,12 @@
   2232      f9339369d3e6f691e9c0a9b2aa1da093 TERRAIN/MARS.MCD
   16394     d4c17c51cc54791884da993327f0d092 TERRAIN/MARS.PCK
   74        a1e7e8335b01db5d6a0bdf44fb1a475b TERRAIN/MARS.TAB
-  4836      0f6e19eea4f61cf1b36d07e24790e5f3 TERRAIN/MOUNT.MCD_orig
-  4836      33f8f0087d1b10090d5b0fac89ab12cd TERRAIN/MOUNT.MCD
+  4836      0f6e19eea4f61cf1b36d07e24790e5f3 TERRAIN/MOUNT.MCD
+  4836      33f8f0087d1b10090d5b0fac89ab12cd TERRAIN/MOUNT.MCD_orig
   23093     44247f3ff65b00250ed609b53369dd94 TERRAIN/MOUNT.PCK
   108       2d7fc8e86739aab81c2739117f36caa2 TERRAIN/MOUNT.TAB
-  4030      f49d19729e0cb4358a3e43c60659b6c2 TERRAIN/PLANE.MCD_orig
-  4030      82c5fd2952bca4af240550bddf7d8167 TERRAIN/PLANE.MCD
+  4030      f49d19729e0cb4358a3e43c60659b6c2 TERRAIN/PLANE.MCD
+  4030      82c5fd2952bca4af240550bddf7d8167 TERRAIN/PLANE.MCD_orig
   21467     6c0778d0e70b741025061e0a4ddb7a2c TERRAIN/PLANE.PCK
   126       a76a9155538079db8fa5ce08bd3b56de TERRAIN/PLANE.TAB
   5022      e6b2193442aa7dbb86482ea91ab53605 TERRAIN/POLAR.MCD
@@ -1730,49 +1732,49 @@
   1240      81a728e828948f1b11476cbecb7a79f3 TERRAIN/UFO1.MCD
   10085     c7d3920937cd53dbf1195b3f536b7431 TERRAIN/UFO1.PCK
   54        09f2fcc240f0b1306e7031602f8aeb82 TERRAIN/UFO1.TAB
-  6944      453a83994f7aa2fa66c060e05c51883c TERRAIN/URBAN.MCD_orig
-  6944      cbc94ba50d8a9d2ec4e66e0a14abc338 TERRAIN/URBAN.MCD
+  6944      453a83994f7aa2fa66c060e05c51883c TERRAIN/URBAN.MCD
+  6944      cbc94ba50d8a9d2ec4e66e0a14abc338 TERRAIN/URBAN.MCD_orig
   53430     d28f2bacab7cdaae1628772ac19f6650 TERRAIN/URBAN.PCK
   232       4508f0368b79ed657160bd18c3b17e42 TERRAIN/URBAN.TAB
-  1550      d620671da507cb009f10474c5cb738ec TERRAIN/URBITS.MCD_orig
-  1550      d41cd66452242356ae0650ac74143d92 TERRAIN/URBITS.MCD
+  1550      d620671da507cb009f10474c5cb738ec TERRAIN/URBITS.MCD
+  1550      d41cd66452242356ae0650ac74143d92 TERRAIN/URBITS.MCD_orig
   8427      f621866489565f905b9e4e11faed6be4 TERRAIN/URBITS.PCK
   50        6adf5ce34ff333f53ac4c69c90ba7264 TERRAIN/URBITS.TAB
-  4154      49efb237839f5e395a4014c5a0bb71ac TERRAIN/U_BASE.MCD_orig
-  4154      fbee54fb6b73b126adb8b67fb1df5417 TERRAIN/U_BASE.MCD
+  4154      49efb237839f5e395a4014c5a0bb71ac TERRAIN/U_BASE.MCD
+  4154      fbee54fb6b73b126adb8b67fb1df5417 TERRAIN/U_BASE.MCD_orig
   39760     02ec6086b2faf463c43575c3b07294e0 TERRAIN/U_BASE.PCK
   142       5a24f33315de0a37d22842c626cf1320 TERRAIN/U_BASE.TAB
-  496       b0b9483903b51d800f8a1ac29905f5b3 TERRAIN/U_BITS.MCD_orig
-  496       3986072b72f002414df8a63809f6de55 TERRAIN/U_BITS.MCD
+  496       b0b9483903b51d800f8a1ac29905f5b3 TERRAIN/U_BITS.MCD
+  496       3986072b72f002414df8a63809f6de55 TERRAIN/U_BITS.MCD_orig
   2386      9ce4c7302703c6bc26f1b5de6bcc2bbc TERRAIN/U_BITS.PCK
   16        d66a99d8f035f5daf308736890c01af5 TERRAIN/U_BITS.TAB
   1054      8636c03eefa7fa13a396b249c56926af TERRAIN/U_DISEC2.MCD
   10426     132b961823a904495377cc64a5a59bc1 TERRAIN/U_DISEC2.PCK
   44        8ed97009271a570d2c744b16a12652c3 TERRAIN/U_DISEC2.TAB
-  2108      4180376126cb26bd1122bcffff829e27 TERRAIN/U_EXT02.MCD_orig
-  2108      3d58690b0eec4fca9715874c7c8cd4c3 TERRAIN/U_EXT02.MCD
+  2108      4180376126cb26bd1122bcffff829e27 TERRAIN/U_EXT02.MCD
+  2108      3d58690b0eec4fca9715874c7c8cd4c3 TERRAIN/U_EXT02.MCD_orig
   17841     71bf136d986fb08144913ee5127cc002 TERRAIN/U_EXT02.PCK
   80        db0aebbab0c974ae51ac06a412d5b4cf TERRAIN/U_EXT02.TAB
   930       eb83339691a37dd38a1e6119148b99b3 TERRAIN/U_OPER2.MCD
   6801      f3362cd1f32e328f7e896883a98b94b0 TERRAIN/U_OPER2.PCK
   30        e22fe746c2cb64583f6e05ec058979c5 TERRAIN/U_OPER2.TAB
-  682       cd4be7e125f9a5f6392eafd47e055e2b TERRAIN/U_PODS.MCD_orig
-  682       851af2e34dda839274f2079d8043d348 TERRAIN/U_PODS.MCD
+  682       cd4be7e125f9a5f6392eafd47e055e2b TERRAIN/U_PODS.MCD
+  682       851af2e34dda839274f2079d8043d348 TERRAIN/U_PODS.MCD_orig
   15178     7307fb6be65849c083780da5c1eae254 TERRAIN/U_PODS.PCK
   54        b29ded3981248ac95a67385ec1ec644f TERRAIN/U_PODS.TAB
-  2914      c526b841de778214a59bf8685bc1a9a6 TERRAIN/U_WALL02.MCD_orig
-  2914      50e14b2d6c66e48b88664b1d672775c4 TERRAIN/U_WALL02.MCD
+  2914      c526b841de778214a59bf8685bc1a9a6 TERRAIN/U_WALL02.MCD
+  2914      50e14b2d6c66e48b88664b1d672775c4 TERRAIN/U_WALL02.MCD_orig
   28517     4490a90b4d75c85fd0137b65e8400f33 TERRAIN/U_WALL02.PCK
   132       6359e88eb0b166890811f5cfac291d52 TERRAIN/U_WALL02.TAB
   6014      e235e91e52a4201e5f0a7284447f3111 TERRAIN/XBASE1.MCD
   47341     2e672139e6ed879bfafa24efc4d7f128 TERRAIN/XBASE1.PCK
   210       b9c4584344ea42460f0ef9da9aa376e3 TERRAIN/XBASE1.TAB
-  3844      0c2ddb58db06b70b513bae3b049a3e9a TERRAIN/XBASE2.MCD_orig
-  3844      64282325a447e2dbb81de34a7cb2adb0 TERRAIN/XBASE2.MCD
+  3844      0c2ddb58db06b70b513bae3b049a3e9a TERRAIN/XBASE2.MCD
+  3844      64282325a447e2dbb81de34a7cb2adb0 TERRAIN/XBASE2.MCD_orig
   24718     eabaec8d66e95981855489b88b2f0ca8 TERRAIN/XBASE2.PCK_orig
   24703     a58bf0dccd6938cf7751733904b51deb TERRAIN/XBASE2.PCK
-  126       cf7f5d0aa294b514e40ce935fefd6ffa TERRAIN/XBASE2.TAB_orig
-  126       817b7673dafc722187a25cd48905d24d TERRAIN/XBASE2.TAB
+  126       cf7f5d0aa294b514e40ce935fefd6ffa TERRAIN/XBASE2.TAB
+  126       817b7673dafc722187a25cd48905d24d TERRAIN/XBASE2.TAB_orig
   522       205dd6a3dd72ce2725d722eb9d202ce7 UFOGRAPH/BIGOB_00.PCK
   495       777b72e47f209e757ab3c1b16e820da4 UFOGRAPH/BIGOB_01.PCK
   96        be045ca7c1d58f63d1a53a497805efe5 UFOGRAPH/BIGOB_02.PCK
diff -Nru game-data-packager-49/debian/changelog game-data-packager-49.1/debian/changelog
--- game-data-packager-49/debian/changelog	2017-03-14 11:12:53.000000000 +0000
+++ game-data-packager-49.1/debian/changelog	2016-12-22 16:43:05.000000000 +0000
@@ -1,3 +1,33 @@
+game-data-packager (49.1) UNRELEASED; urgency=medium
+
+  * Support for new languages and versions:
+    - Support for GOG packages of Jedi games (Closes: #784913) [adetiste]
+    - Support for new GOG packages of Leisure Suit Larry series [adetiste]
+    - Support for new GOG package of Icewind Dale 2 [Edward Allcutt]
+    - Cope with hexen2demo_nov1997-linux-i586.tgz having been modified on
+      the server. The changes do not affect the parts we repackage.
+      [adetiste]
+    - Add GOG metadata for several more games [adetiste]
+  * Bug fixes:
+    - Fix a crash when packaging music by ripping CD tracks from Quake
+      and Quake II, fixing a regression somewhere around v42
+      (Closes: #860998) [adetiste]
+    - xcom-ufo: Fix swapped file definitions for original and patched
+      resource files (Closes: #856253) [R1dO]
+    - If a downloadable file does not have the expected content, do not
+      try to download it from the same URL again [adetiste]
+    - Make .crc files in Doom 3 BFG optional. Not all versions have them
+      (Closes: #862432) [smcv]
+    - Remove metadata pointing to the DotEmu online store, which has
+      now closed [adetiste]
+    - Fix a potential crash during data loading by initializing
+      WantedFile.provides_files correctly [smcv]
+  * Internal changes:
+    - debian/copyright.in: Update [smcv]
+    - debian/.gitignore: Update for game-data-packager-runtime [smcv]
+
+ -- Simon McVittie <s...@debian.org>  Thu, 22 Dec 2016 16:43:05 +0000
+
 game-data-packager (49) unstable; urgency=medium
 
   * d/gbp.conf: Switch git branch to debian/stretch for updates
diff -Nru game-data-packager-49/debian/copyright game-data-packager-49.1/debian/copyright
--- game-data-packager-49/debian/copyright	2017-03-14 11:12:53.000000000 +0000
+++ game-data-packager-49.1/debian/copyright	2016-12-22 16:43:05.000000000 +0000
@@ -7,10 +7,10 @@
 Files: *
 Copyright:
  © 2005-2014 Jonathan Dowland <j...@debian.org>
- © 2009-2016 Simon McVittie
+ © 2009-2017 Simon McVittie
  © 2011-2016 Stephen Kitt
  © 2012-2015 Markus Koschany
- © 2014-2016 Alexandre Detiste
+ © 2014-2017 Alexandre Detiste
 License: GPL-2
 
 Files:
@@ -25,7 +25,7 @@
  © 2006 Damien Laniel
  © 2008 Jack Coulter
  © 2008 Peter Eisentraut
- © 2010-2016 Simon McVittie
+ © 2010-2017 Simon McVittie
  © 2011-2013 David Banks
  © 2015-2016 Alexandre Detiste
  © 2016 Stephen Kitt
diff -Nru game-data-packager-49/debian/copyright.in game-data-packager-49.1/debian/copyright.in
--- game-data-packager-49/debian/copyright.in	2017-03-14 11:12:53.000000000 +0000
+++ game-data-packager-49.1/debian/copyright.in	2016-12-22 16:43:05.000000000 +0000
@@ -5,10 +5,10 @@
 Files: *
 Copyright:
  © 2005-2014 Jonathan Dowland <j...@debian.org>
- © 2009-2016 Simon McVittie
+ © 2009-2017 Simon McVittie
  © 2011-2016 Stephen Kitt
  © 2012-2015 Markus Koschany
- © 2014-2016 Alexandre Detiste
+ © 2014-2017 Alexandre Detiste
 License: GPL-2
 
 Files:
@@ -23,7 +23,7 @@
  © 2006 Damien Laniel
  © 2008 Jack Coulter
  © 2008 Peter Eisentraut
- © 2010-2016 Simon McVittie
+ © 2010-2017 Simon McVittie
  © 2011-2013 David Banks
  © 2015-2016 Alexandre Detiste
  © 2016 Stephen Kitt
diff -Nru game-data-packager-49/debian/.gitignore game-data-packager-49.1/debian/.gitignore
--- game-data-packager-49/debian/.gitignore	2017-03-14 11:12:53.000000000 +0000
+++ game-data-packager-49.1/debian/.gitignore	2016-12-22 16:43:05.000000000 +0000
@@ -6,6 +6,7 @@
 /doom2-masterlevels/
 /etqw/
 /etqw-server/
+/game-data-packager-runtime/
 /game-data-packager/
 /files
 /quake/
diff -Nru game-data-packager-49/game_data_packager/build.py game-data-packager-49.1/game_data_packager/build.py
--- game-data-packager-49/game_data_packager/build.py	2017-03-14 11:12:53.000000000 +0000
+++ game-data-packager-49.1/game_data_packager/build.py	2016-12-22 16:43:05.000000000 +0000
@@ -773,6 +773,7 @@
                             logger.warning("File doesn't have expected size"
                                            " (%s vs %s), skipping %s",
                                            size, wanted.size, url)
+                            self.download_failed.add(url)
                             continue
 
                         if self.save_downloads is not None:
@@ -1725,7 +1726,7 @@
         possible_with_steamcmd = set()
 
         if self.cd_device is not None:
-            rip_cd_packages = self.rip_cd_packages & packages
+            rip_cd_packages = self.game.rip_cd_packages & packages
             if rip_cd_packages:
                 if len(rip_cd_packages) > 1:
                     logger.error('cannot rip the same CD for more than one ' +
diff -Nru game-data-packager-49/game_data_packager/data.py game-data-packager-49.1/game_data_packager/data.py
--- game-data-packager-49/game_data_packager/data.py	2017-03-14 11:12:53.000000000 +0000
+++ game-data-packager-49.1/game_data_packager/data.py	2016-12-22 16:43:05.000000000 +0000
@@ -180,7 +180,7 @@
         self.license = False
         self._look_for = None
         self._provides = set()
-        self.provides_files = None
+        self.provides_files = set()
         self._size = None
         self.unpack = None
         self.unsuitable = None

--- End Message ---
--- Begin Message ---
Simon McVittie:
> Control: tags -1 - moreinfo
> 
> On Sat, 20 May 2017 at 12:20:00 +0000, Niels Thykier wrote:
>> On Sat, 20 May 2017 13:10:03 +0100 Simon McVittie <s...@debian.org> wrote:
>>> game-data-packager in experimental (v51) fixes a non-RC but annoying
>>> regression from jessie (#860998) which we would like to fix in stretch
>>> (currently at v49).
>>
>> Ack, please go ahead.
> 
> Uploaded and built everywhere. No diff since what you preapproved,
> other than the suite and release date for the changelog entry.
> 
> (One small correction, this is a backport of selected changes from
> versions 50 to 52 in experimental, not 50 to 51 as I said before.)
> 
>     S
> 

Unblocked, thanks.

~Niels

--- End Message ---

Reply via email to