[Pkg-virtualbox-commits] r424 - in virtualbox-ose-modules/trunk: . debian debian/bin

[meskes at alioth.debian.org]

Author: meskes
Date: 2009-01-13 11:53:39 +0000 (Tue, 13 Jan 2009)
New Revision: 424

Modified:
   virtualbox-ose-modules/trunk/debian/bin/gencontrol.py
   virtualbox-ose-modules/trunk/debian/changelog
   virtualbox-ose-modules/trunk/defines
Log:
Added versioned build dependency to make sure autobuilder use the right source packages.



Modified: virtualbox-ose-modules/trunk/debian/bin/gencontrol.py
===================================================================
--- virtualbox-ose-modules/trunk/debian/bin/gencontrol.py	2009-01-13 11:20:10 UTC (rev 423)
+++ virtualbox-ose-modules/trunk/debian/bin/gencontrol.py	2009-01-13 11:53:39 UTC (rev 424)
@@ -44,12 +44,14 @@
 
         super(Gencontrol, self).do_flavour(packages, makefile, arch, featureset, flavour, vars, makeflags, extra)
 
+	version = config_entry['version'][0]
         for module in iter(config_entry['modules']):
-            self.do_module(module, packages, makefile, arch, featureset, flavour, vars.copy(), makeflags.copy(), extra)
+            self.do_module(module, packages, makefile, arch, featureset, flavour, vars.copy(), makeflags.copy(), extra, version)
 
-    def do_module(self, module, packages, makefile, arch, featureset, flavour, vars, makeflags, extra):
+    def do_module(self, module, packages, makefile, arch, featureset, flavour, vars, makeflags, extra, version):
         config_entry = self.config['module', 'base', module]
         config_entry_relations = self.config.get(('relations', module), {})
+        
         vars.update(config_entry)
         vars['module'] = module
         makeflags['MODULE'] = module
@@ -70,7 +72,8 @@
         if flavour in config_entry.get('not-flavours', []):
             return
 
-        relations = PackageRelation(config_entry_relations.get('source', '%s-source' % module))
+        relations = PackageRelation(config_entry_relations.get('source', '%s-source (>= %s)' % (module, version)))
+
         if config_entry.get('arches', None) or config_entry.get('not-arches', None):
             for group in relations:
                 for item in group:
@@ -121,6 +124,7 @@
     schemas_base = {
         'base': {
             'modules': SchemaItemList(),
+            'version': SchemaItemList(),
         }
     }
 

Modified: virtualbox-ose-modules/trunk/debian/changelog
===================================================================
--- virtualbox-ose-modules/trunk/debian/changelog	2009-01-13 11:20:10 UTC (rev 423)
+++ virtualbox-ose-modules/trunk/debian/changelog	2009-01-13 11:53:39 UTC (rev 424)
@@ -1,5 +1,13 @@
 virtualbox-ose-modules-2.6 (2.6.26-2) experimental; urgency=low
 
+  * Added amd64 build for guest modules.
+  * Added versioned build dependency to make sure autobuilder picks the right
+    version of the source packages.
+
+ -- Michael Meskes <meskes at debian.org>  Mon, 29 Dec 2008 17:05:19 +0100
+
+virtualbox-ose-modules-2.6 (2.6.26-2) experimental; urgency=low
+
   * Rebuild for virtualbox-ose 2.1.0.
 
  -- Michael Meskes <meskes at debian.org>  Mon, 29 Dec 2008 17:05:19 +0100

Modified: virtualbox-ose-modules/trunk/defines
===================================================================
--- virtualbox-ose-modules/trunk/defines	2009-01-13 11:20:10 UTC (rev 423)
+++ virtualbox-ose-modules/trunk/defines	2009-01-13 11:53:39 UTC (rev 424)
@@ -2,3 +2,5 @@
 modules:
  virtualbox-ose
  virtualbox-ose-guest
+version:
+ 2.1.0-dfsg-1