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 313d9ecd38bb4892a708757f892e99017a1c2b5e Author: Simon McVittie <[email protected]> Date: Wed Jul 5 08:34:46 2017 +0100 Avoid file collisions within a package drbrain2, morrowind, ut99: Do not try to install two files to the same destination in the same package. This would result in one of them being included and the other being omitted. --- data/drbrain2.yaml | 2 +- data/morrowind.yaml | 37 ++++++++++++++++++++++--------------- data/ut99.yaml | 3 ++- debian/changelog | 9 +++++++++ 4 files changed, 34 insertions(+), 17 deletions(-) diff --git a/data/drbrain2.yaml b/data/drbrain2.yaml index 06f5be8..513a32c 100644 --- a/data/drbrain2.yaml +++ b/data/drbrain2.yaml @@ -48,7 +48,6 @@ groups: 1100 e3462ec245809772e2c39747de9f8dce 365.hep 7806 8918b70f20bc8805b51a3b7c0c0c8411 365.scr 3170 ce8e5509354cf2b8cb96ddfa31dba830 420.hep - 5698 89de857a5b46bc14ce16b75ef08a4656 420.scr 632 6c0248d3c97ec96fd334be388482aa58 65535.map 2103560 5a73b058d74a3f4bb9ba631c941cafdd resource.000 1880696 c787e0f3c777a7624b98ab7fe6ea09b7 resource.aud @@ -58,6 +57,7 @@ groups: overwritten files: | 21780 5722e41e35ce1746fa93d8098a15c4df 300.msg 8794 5aac18cdb85a57db9ef6bf44cdbbb006 350.scr + 5698 89de857a5b46bc14ce16b75ef08a4656 420.scr archives: | 76174 82648d006bc128a3c9aaa2ab373fac4c IslandofDrBrain(DB2PAT).zip diff --git a/data/morrowind.yaml b/data/morrowind.yaml index 85d6550..ea9f511 100644 --- a/data/morrowind.yaml +++ b/data/morrowind.yaml @@ -51,7 +51,7 @@ packages: - Morrowind.bsa?en_goty - Morrowind.esm?en_goty - Morrowind.ini?en_goty - - Sound/Fx/REGN/rocks8.wav?morrowind + - Fx/REGN/rocks8.wav?morrowind morrowind-tribunal-en-data: better_versions: @@ -69,6 +69,8 @@ packages: - Morrowind.bsa?tribunal_goty - Morrowind.esm?en_goty - Morrowind.ini?en_goty + - Textures/Tx_metal_strip_02.dds?tribunal + - Textures/tx_rough_stone_wall.dds?tribunal - Tribunal.bsa?tribunal_goty - Tribunal.esm?tribunal_goty @@ -88,7 +90,7 @@ packages: - Morrowind.bsa?en_goty - Morrowind.esm?en_goty - Morrowind.ini?en_goty - - Sound/Fx/REGN/rocks8.wav?morrowind + - Fx/REGN/rocks8.wav?morrowind morrowind-complete-en-data: provides: morrowind-data @@ -123,7 +125,7 @@ packages: - Morrowind French assets from unshield - Morrowind French videos - - Sound/Fx/REGN/rocks8.wav?morrowind + - Fx/REGN/rocks8.wav?morrowind doc: - Morrowind French documentation license: @@ -166,7 +168,7 @@ files: - Morrowind.bsa?en_goty - Morrowind.esm?en_goty - Morrowind.ini?en_goty - - Sound/Fx/REGN/rocks8.wav?morrowind + - Fx/REGN/rocks8.wav?morrowind # adetiste's French copy data1.cab?fr: @@ -217,13 +219,12 @@ files: - Bloodmoon.esm?bloodmoon_goty # There is a copy of this in Morrowind, and a different copy in Tribunal - # under a different name. Adjust look_for to avoid warnings. + # under a different name. The one in Tribunal is in a different subdirectory. # # We should install the Morrowind version if and only if we don't have # Tribunal. - Sound/Fx/REGN/rocks8.wav?morrowind: - look_for: - - Fx/REGN/rocks8.wav + Fx/REGN/rocks8.wav?morrowind: + install_to: $install_to/Sound groups: archives: @@ -252,13 +253,21 @@ groups: 118425318 f6b5657c5dcf77aa24a1f1ac39456834 Bloodmoon.bsa?bloodmoon_goty 9631798 13f1de00f34c4df2fce9253b0356f5c5 Bloodmoon.esm?bloodmoon_goty 310420368 d3167c6124c11bb75bc380c93266052c Morrowind.bsa?en_goty - 310459500 00ab6ebedb911b0846d605f1ebb5b749 Morrowind.bsa?tribunal_goty 79837557 8bb62fbd41ce4563fa7961f03a5f43ee Morrowind.esm?en_goty 24824 633f76484142abc219786acca14178d5 Morrowind.ini?en_goty 64986032 5b0bb58ce1b6696a053802c39ca082e9 Tribunal.bsa?tribunal_goty - 4565686 a4af4712efd0a184c2a91305f5fde672 Tribunal.esm?bloodmoon_goty 4554200 29397a80329bf998c0c1a3c522396b51 Tribunal.esm?tribunal_goty - 188792 bf150f14dae9688800dd92729cbca0dd Sound/Fx/REGN/rocks8.wav?morrowind + + # Would be in "Morrowind assets from unshield" group, but superseded by + # a file of the same name in Tribunal + 188792 bf150f14dae9688800dd92729cbca0dd Fx/REGN/rocks8.wav?morrowind + + # Would be in "Tribunal GOTY on-disc data" group, but superseded by + # files of the same name in Bloodmoon + 310459500 00ab6ebedb911b0846d605f1ebb5b749 Morrowind.bsa?tribunal_goty + 2816 a1437a696689a594fd148fb89ef5e168 Textures/Tx_metal_strip_02.dds?tribunal + 43832 7df93620f60b1bbcf3192cec981d9e28 Textures/tx_rough_stone_wall.dds?tribunal + 4565686 a4af4712efd0a184c2a91305f5fde672 Tribunal.esm?bloodmoon_goty Morrowind French licenses: license: true @@ -12502,7 +12511,6 @@ groups: 2176 8d5c67d26ec802841474a83340a59806 Textures/Tx_menubook_quests_pressed.dds 87536 8156f05913d13c75d90deeadaab76b72 Textures/Tx_metal_iron_rusty.dds?tribunal 5568 3f3fb984ed85201bfce9f8ed4eede288 Textures/Tx_metal_silver.dds?tribunal - 2816 a1437a696689a594fd148fb89ef5e168 Textures/Tx_metal_strip_02.dds?tribunal 87536 c2a62a2d3fedb7d68491b47df0f86329 Textures/Tx_oil_crust.dds?tribunal 2888 6ab02e73b0cc4188845e98ab2b6883d5 Textures/Tx_plant_01.dds?tribunal 2888 f3987c7e073deb57ec2f2929152fce63 Textures/Tx_plant_02.dds?tribunal @@ -12644,7 +12652,6 @@ groups: 11088 bea318a2f5adb328fbba807a9b6a07dd Textures/tx_rawsteel_trim00.dds?tribunal 22000 4c759d3bd669c3b91963836e379dcb7e Textures/tx_rawsteel_trim01.dds?tribunal 22000 c366f296dd9145ab13f843d5b6681277 Textures/tx_rough_rubber.dds?tribunal - 43832 7df93620f60b1bbcf3192cec981d9e28 Textures/tx_rough_stone_wall.dds?tribunal 43832 b3f1c7cda2f05d5e14a7bfc381a3bc9d Textures/tx_rough_stone_wall02.dds?tribunal 43808 63bda080e8a89cbacb90bb7654017d37 Textures/tx_sand_mosaic02.dds?tribunal 43808 791a432c928ad809cf72655f50131c5a Textures/tx_sandstone02.dds?tribunal @@ -15611,6 +15618,7 @@ sha1sums: | b2b3511b3f95db31a2b81f86ae9199472f14da6d Fx/FabBossClank.wav?tribunal 4ab870926c9a566556feec9b07ea5dfc7acab53d Fx/FabBossGryo.wav?tribunal 1ced32151d2fd1d88f4d54c846f0093efe59fe90 Fx/FabBossWhir.wav?tribunal + c9ef08495753164b14a1a0f8a6e0804d2082b7c5 Fx/REGN/rocks8.wav?morrowind 9a87f3e572e9723503acec7c2cf464c53c372466 Fx/REGN/rocks8.wav?tribunal 5687036f434467439155325ce3f6613257f963ea Fx/boo.wav?tribunal 0b675c74ba24f89fc613f12f6dbb69006639db89 Fx/envrn/Dwemer_Fan.wav?tribunal @@ -17770,7 +17778,6 @@ sha1sums: | 7bc94465b68fd25dec224ec7f6418b05a8600183 Sound/Fx/REGN/rocks5.wav baee107486468643e241b8c0ddf5c2067e3ddd87 Sound/Fx/REGN/rocks6.wav 411d73595f5f70f5dda4b8fff6d5cbe7e34d2830 Sound/Fx/REGN/rocks7.wav - c9ef08495753164b14a1a0f8a6e0804d2082b7c5 Sound/Fx/REGN/rocks8.wav?morrowind ba05e17e9ec2fa73409ef4a17a811b5527a24f1a Sound/Fx/REGN/rumble.wav 5cb9423a8a9c012e79f4d31462ec5677cf783f8a Sound/Fx/REGN/rumble2.wav 8e793273c4625b7c2bccf9a378ddc90a057b16cf Sound/Fx/REGN/rumble3.wav @@ -30879,6 +30886,7 @@ sha256sums: | 9e281b375cf37ea31b50d57b9c271ac07ef42f5077d4a153756338b7d3501005 Fx/FabBossClank.wav?tribunal 55956fb8ced64a8bc1872dec1ee319c8ea579f8d3c62b7109a3b86a01efc507b Fx/FabBossGryo.wav?tribunal 7a423fd51fccc5f832343316b40c4fb1176959df60e760459a4a88cf1545afd5 Fx/FabBossWhir.wav?tribunal + bbb7496d7ec6f4cd9e60a6280405f40474a44a4de03218fb8012518969dabde5 Fx/REGN/rocks8.wav?morrowind cdca79c0abe09bcea36052b34ce7d406f3d7ce4f59079073450d9986ec3b53bf Fx/REGN/rocks8.wav?tribunal 486d1f2deafdb7b243af01022cf39389acab59ac7a1dd499a2c0a8638a3460a9 Fx/boo.wav?tribunal 6c89236c16f98f40963c3b2ec716271fc622d9a4fc238dd35e5e92a45a67e101 Fx/envrn/Dwemer_Fan.wav?tribunal @@ -33037,7 +33045,6 @@ sha256sums: | 7d5735b9f743178a60970a397a1ac431a10d847c2b22372c4203ef5cdf619315 Sound/Fx/REGN/rocks5.wav 7e7012fb17c6d7b35e0c903037bcf308c49332399b6d1c924007cdcf1020291c Sound/Fx/REGN/rocks6.wav a76051fecf1d91d81932e29541ae68a5df095741cb897f3c99f8fbddc0912312 Sound/Fx/REGN/rocks7.wav - bbb7496d7ec6f4cd9e60a6280405f40474a44a4de03218fb8012518969dabde5 Sound/Fx/REGN/rocks8.wav?morrowind dcba95d28f9b5fd1b2c3677848621c78054c5d41cbd5d4e47745216b7964b5be Sound/Fx/REGN/rumble.wav cf8626d9df0987a19cd56f03559d039fde5ead38d6ad70f0c592d9ccfdf5453b Sound/Fx/REGN/rumble2.wav 884f87cfbcc626aa21bb41dc1ff4da2cd9ac7a111b0cbf3894e4c2b48dfc33d1 Sound/Fx/REGN/rumble3.wav diff --git a/data/ut99.yaml b/data/ut99.yaml index 0a3c92a..14ba753 100644 --- a/data/ut99.yaml +++ b/data/ut99.yaml @@ -196,6 +196,7 @@ files: - System/Editor.int?436 - System/IpDrv.int?436 - System/IpServer.int?gold + - System/UTMenu.int?400 data.tar.gz?436Linux-goty: unpack: @@ -212,6 +213,7 @@ files: - System/IpServer.int?gold # with ".PATCH" extension - System/UnrealTournament.ini?436LinuxGL + - System/UTMenu.int?400 - System/opengldrv.int?ut99 Credits.tar.gz?436Linux: unpack: @@ -768,7 +770,6 @@ groups: _ _ System/SoldierSkins.int _ _ System/Startup.int?ut99 _ _ System/UMenu.int?ut99 - _ _ System/UTMenu.int?400 95 0eccd8818ae3f3ffc97111794461d5f6 System/Unreal.int _ _ System/UnrealI.int?ut99 88 782125b22dddaabaf07c1ff44b482683 System/UnrealIOrder.int?ut99 diff --git a/debian/changelog b/debian/changelog index 3a69045..297f49d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +game-data-packager (54) UNRELEASED; urgency=medium + + * Enhancements and bug fixes: + - drbrain2, morrowind, ut99: Do not try to install two files to the + same destination in the same package. This would result in one + of them being included and the other being omitted. [smcv] + + -- Simon McVittie <[email protected]> Wed, 05 Jul 2017 08:31:13 +0100 + game-data-packager (53) unstable; urgency=medium * Support for new languages and versions: -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/game-data-packager.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
