[game-data-packager] 06/24: add debian/version support to yaml

[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 fa4a9f4245805c60c8d990b47b3a18f202d3f3ef
Author: Alexandre Detiste <alexandre.detiste at gmail.com>
Date:   Sat Jan 17 21:39:44 2015 +0100

    add debian/version support to yaml
---
 data/rtcw-data.control.in          |  9 ---------
 data/rtcw.yaml                     |  4 ++++
 lib/game_data_packager/__init__.py | 11 +++++++++--
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/data/rtcw-data.control.in b/data/rtcw-data.control.in
index 1ded88d..74b2c7d 100644
--- a/data/rtcw-data.control.in
+++ b/data/rtcw-data.control.in
@@ -1,12 +1,3 @@
-Package: rtcw-data
-Version: 1.42b+VERSION
-Section: non-free/games
-Priority: optional
-Architecture: all
-Multi-Arch: foreign
-Recommends: rtcw
-Installed-Size: 500000
-Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Description: Return to Castle Wolfenstein data files
  Return to Castle Wolfenstein requires an engine and game data to play. This
  package contains the data from the full version of Return to Castle
diff --git a/data/rtcw.yaml b/data/rtcw.yaml
index c3c0dc0..dd4f99e 100644
--- a/data/rtcw.yaml
+++ b/data/rtcw.yaml
@@ -11,6 +11,10 @@ packages:
     steam:
       id: 9010
       path: "common/Return to Castle Wolfenstein"
+    debian:
+      engine: rtcw
+      # GDP version will be suffixed to this, e.g. : 1.42b+39
+      version: 1.42b
 
     # cksums(1) is pretty useless as a checksumming tool, but it's a convenient
     # way to get exact file sizes in bytes (second column), which are a nice
diff --git a/lib/game_data_packager/__init__.py b/lib/game_data_packager/__init__.py
index e64be8d..061f50f 100644
--- a/lib/game_data_packager/__init__.py
+++ b/lib/game_data_packager/__init__.py
@@ -1522,8 +1522,15 @@ class GameData(object):
         if suggests:
             control['Suggests'] = ', '.join(suggests)
 
-        package.version = control['Version'].replace('VERSION',
-                GAME_PACKAGE_VERSION)
+        version = package.debian.get('version')
+        if 'Version' in control:
+            package.version = control['Version'].replace('VERSION',
+                    GAME_PACKAGE_VERSION)
+        elif version:
+            package.version = version + '+' + GAME_PACKAGE_VERSION
+        else:
+            package.version = GAME_PACKAGE_VERSION
+
         control['Version'] = package.version
 
     def get_control_template(self, package):

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