[game-data-packager] 01/01: RTCW: finally found official French patch, drop repack trick

[Alexandre Detiste]

This is an automated email from the git hooks/post-receive script.

detiste-guest pushed a commit to branch master
in repository game-data-packager.

commit 1f90b5fde1c3c8471c961d8f18128b4e9062b41b
Author: Alexandre Detiste <alexandre.detiste at gmail.com>
Date:   Wed Oct 28 21:48:22 2015 +0100

    RTCW: finally found official French patch, drop repack trick
---
 data/rtcw.yaml                   | 13 +++++++----
 game_data_packager/games/rtcw.py | 49 ----------------------------------------
 2 files changed, 9 insertions(+), 53 deletions(-)

diff --git a/data/rtcw.yaml b/data/rtcw.yaml
index 3e14512..ad7de1f 100644
--- a/data/rtcw.yaml
+++ b/data/rtcw.yaml
@@ -171,9 +171,6 @@ packages:
       replaces: rtcw-data
     version: 1.42b
     install_to: usr/share/games/rtcw
-    symlinks:
-      usr/lib/rtcw/main/sp_pak3_fr.pk3:
-        usr/share/games/rtcw/main/sp_pak3_fr.pk3
     install:
     - main/mp_bin.pk3
     - main/mp_pak0.pk3
@@ -193,7 +190,8 @@ packages:
     - main/scripts/translation.cfg?141_unix
     - main/sp_pak1.pk3?fr
     - main/sp_pak2.pk3
-    - main/sp_pak3.pk3
+    # From "Edición especial"
+    - main/sp_pak3.pk3?fr
     # From GOTY edition
     - main/sp_pak4.pk3
     # From iortcw
@@ -226,6 +224,11 @@ files:
       spear-of-destiny-mirrors:
         path: .
         name: sp_pak3.pk3.SP
+  main/sp_pak3.pk3?fr:
+    download:
+      spear-of-destiny-mirrors:
+        path: .
+        name: sp_pak3.pk3.FR
 
   wolf-linux-1.4-full.x86.run:
     download:
@@ -359,6 +362,7 @@ size_and_md5: |
   11026123  330b272d5261fe19fcf3c3fbc943c7f3 main/sp_pak2.pk3
   152544    cf25d6731ed29c80303febbb177aa585 main/sp_pak3.pk3
   152039    d26f576768793a046b4e03c7d0617fdf main/sp_pak3.pk3?es
+  151931    00cee7ee80cdb2920322cf37a5f65a11 main/sp_pak3.pk3?fr
   15532040  4223cc6588594ec0ceee186f0e73a6e9 main/sp_pak4.pk3
   148374118 98a612b5861e030d9d1f0c3adb1df940 main/sp_pakG.pk3
   159375    f7b2003ef7499f2a6e750c2925c870ad main/scripts/translation.cfg?141_unix
@@ -402,6 +406,7 @@ sha1sums: |
   feee8ecadb551a769dfb1ee97eff4c7ed7f93495  main/sp_pak2.pk3
   94539eded69eb99a86d752808c5e029d5915fde7  main/sp_pak3.pk3
   f5dbd82fb2e5d489cd90868472cd47afa5c4966d  main/sp_pak3.pk3?es
+  4958f2172cb37cd11d49119ef4895f1e6fb6c428  main/sp_pak3.pk3?fr
   76b1074a350616bd8942005c4eabda06199e81f2  main/sp_pak4.pk3
   61f8f83f25001d3ee5c1c367c5d7cf7d6c118c32  main/sp_pakG.pk3
   7994040e61a234e284c730287ea6d098878cbfea  main/scripts/translation.cfg?141_unix
diff --git a/game_data_packager/games/rtcw.py b/game_data_packager/games/rtcw.py
deleted file mode 100644
index 1e89893..0000000
--- a/game_data_packager/games/rtcw.py
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/usr/bin/python3
-# encoding=utf-8
-#
-# Copyright © 2015 Alexandre Detiste <alexandre at detiste.be>
-#           © 2015 Simon McVittie <smcv at debian.org>
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License version 2
-# as published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-#
-# You can find the GPL license text on a Debian system under
-# /usr/share/common-licenses/GPL-2.
-
-import logging
-import os
-import zipfile
-
-from .. import (GameData)
-from ..build import (PackagingTask, mkdir_p)
-
-logger = logging.getLogger('game-data-packager.games.rtcw')
-
-class RTCWGameData(GameData):
-    def construct_task(self, **kwargs):
-        return RTCWTask(self, **kwargs)
-
-class RTCWTask(PackagingTask):
-    def fill_dest_dir(self, package, destdir):
-        if not super(RTCWTask, self).fill_dest_dir(package, destdir):
-            return False
-
-        if package.name != 'rtcw-fr-data':
-            return True
-
-        zip_in = os.path.join(destdir, 'usr/share/games/rtcw/main', 'sp_pak1.pk3')
-        zip_out = os.path.join(destdir, 'usr/share/games/rtcw/main', 'sp_pak3_fr.pk3')
-
-        with zipfile.ZipFile(zip_in, 'r') as zf_in:
-            txt = zf_in.open('text/EnglishUSA/escape1.txt').read()
-        with zipfile.ZipFile(zip_out, 'w') as zf_out:
-            zf_out.writestr('text/EnglishUSA/escape1.txt', txt)
-
-        return True
-
-GAME_DATA_SUBCLASS = RTCWGameData

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