[game-data-packager] 02/02: merge package.version & package.debian.version

[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 47f9c043000933b5a8f154d6cf817bf2882b44c6
Author: Alexandre Detiste <alexandre.detiste at gmail.com>
Date:   Sat Apr 25 23:06:28 2015 +0200

    merge package.version & package.debian.version
---
 data/duke3d.yaml               | 2 +-
 data/ja.yaml                   | 3 +--
 data/jk2.yaml                  | 3 +--
 data/rtcw.yaml                 | 5 ++---
 data/sfinx.yaml                | 4 ++--
 data/soltys.yaml               | 6 +++---
 game_data_packager/__init__.py | 8 +++-----
 7 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/data/duke3d.yaml b/data/duke3d.yaml
index 04f206a..66a18af 100644
--- a/data/duke3d.yaml
+++ b/data/duke3d.yaml
@@ -14,8 +14,8 @@ packages:
   duke3d-shareware:
     install_to: usr/share/games/eduke32
     demo_for: duke3d-data
+    version: '1.3d'
     debian:
-      version: '1.3d'
       conflicts: duke3d-data
     install:
     - duke3d.grp_demo
diff --git a/data/ja.yaml b/data/ja.yaml
index 6b3312a..d6bf533 100644
--- a/data/ja.yaml
+++ b/data/ja.yaml
@@ -57,8 +57,7 @@ packages:
       usr/lib/openjk-academy-demo/base/ui/menus.txt: usr/share/games/jedi-academy-demo/base/ui/demo_menus.txt
 
   jedi-academy-data:
-    debian:
-      version: '1.01'
+    version: '1.01'
     install_files_from_cksums: |
       # Jedi Academy CD1 GameData/GameData or installation
       3585517488 561806019 base/assets0.pk3
diff --git a/data/jk2.yaml b/data/jk2.yaml
index 029645a..fbb6841 100644
--- a/data/jk2.yaml
+++ b/data/jk2.yaml
@@ -26,8 +26,7 @@ help_text: |
 
 packages:
   jedi-outcast-data:
-    debian:
-      version: '1.04'
+    version: '1.04'
     # 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
     # heuristic for identifying files
diff --git a/data/rtcw.yaml b/data/rtcw.yaml
index dcac9d1..5f9f364 100644
--- a/data/rtcw.yaml
+++ b/data/rtcw.yaml
@@ -14,9 +14,8 @@ packages:
     steam:
       id: 9010
       path: "common/Return to Castle Wolfenstein"
-    debian:
-      # GDP version will be suffixed to this, e.g. : 1.42b+39
-      version: 1.42b
+    # 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/data/sfinx.yaml b/data/sfinx.yaml
index a980eb8..ef0c66d 100644
--- a/data/sfinx.yaml
+++ b/data/sfinx.yaml
@@ -10,8 +10,8 @@ help_text: |
 
 packages:
   sfinx-en-data:
+    version: '1.1'
     debian:
-      version: '1.1'
       provides: sfinx-data
     section: games
     install:
@@ -22,8 +22,8 @@ packages:
 
   sfinx-pl-data:
     lang: pl
+    version: '1.0'
     debian:
-      version: '1.0'
       provides: sfinx-data
     section: games
     install:
diff --git a/data/soltys.yaml b/data/soltys.yaml
index fb4be95..62f6632 100644
--- a/data/soltys.yaml
+++ b/data/soltys.yaml
@@ -6,8 +6,8 @@ gameid: soltys
 
 packages:
   soltys-en-data:
+    version: '1.0'
     debian:
-      version: '1.0'
       provides: soltys-data
     # instead of non-free/games
     section: games
@@ -19,8 +19,8 @@ packages:
 
   soltys-pl-data:
     lang: pl
+    version: '1.0'
     debian:
-      version: '1.0'
       provides: soltys-data
     section: games
     install:
@@ -31,8 +31,8 @@ packages:
 
   soltys-es-data:
     lang: es
+    version: '1.0'
     debian:
-      version: '1.0'
       provides: soltys-data
     section: games
     install:
diff --git a/game_data_packager/__init__.py b/game_data_packager/__init__.py
index bbdfb8a..b232093 100644
--- a/game_data_packager/__init__.py
+++ b/game_data_packager/__init__.py
@@ -835,6 +835,9 @@ class GameData(object):
                 f.size = int(size)
                 package.install.add(filename)
 
+        if 'version' in d:
+            package.version = d['version'] + '+' + GAME_PACKAGE_VERSION
+
         self._populate_files(d.get('install_files'), install_package=package)
 
     def _populate_files(self, d, install_package=None,
@@ -2022,14 +2025,9 @@ class GameData(object):
         if breaks:
             control['Breaks'] = ', '.join(sorted(breaks))
 
-        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
 

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