[Pkg-xen-changes] r483 - in trunk/xen-unstable/debian: . bin

[Bastian Blank]

Author: waldi
Date: Sat Nov 24 18:22:39 2007
New Revision: 483

Log:
* debian/bin/genorig.py: Pull version from source tree.
* debian/changelog: Update.


Modified:
   trunk/xen-unstable/debian/bin/genorig.py
   trunk/xen-unstable/debian/changelog

Modified: trunk/xen-unstable/debian/bin/genorig.py
==============================================================================
--- trunk/xen-unstable/debian/bin/genorig.py	(original)
+++ trunk/xen-unstable/debian/bin/genorig.py	Sat Nov 24 18:22:39 2007
@@ -41,14 +41,28 @@
         if self.version is not None:
             return
 
+        f = file('%s/xen/Makefile' % self.repo)
+        for l in f:
+            l = l.strip().split()
+            if not l:
+                continue
+            if l[0] == 'export':
+                l.pop(0)
+            if l[0] == 'XEN_VERSION':
+                xen_version = l[-1]
+            elif l[0] == 'XEN_SUBVERSION':
+                xen_subversion = l[-1]
+        f.close()
+        if xen_version is None or xen_subversion is None:
+            raise RuntimeError("Can't find version in Xen source")
+
         f = os.popen("cd '%s'; hg id" % self.repo)
         id = f.read().strip().split()[0]
         f.close()
         f = os.popen("cd '%s'; hg log -r %s" % (self.repo, id))
         changeset = f.read().strip().split()[1].split(':')[0]
 
-        a = self.changelog_entry.version.upstream.split('+')[0]
-        self.version = '%s+hg%s' % (a, changeset)
+        self.version = '%s.%s-unstable+hg%s' % (xen_version, xen_subversion, changeset)
 
         self.log("Use version %s.\n" % self.version)
 

Modified: trunk/xen-unstable/debian/changelog
==============================================================================
--- trunk/xen-unstable/debian/changelog	(original)
+++ trunk/xen-unstable/debian/changelog	Sat Nov 24 18:22:39 2007
@@ -1,4 +1,4 @@
-xen-unstable (3.0-unstable+hg16439-1) UNRELEASED; urgency=low
+xen-unstable (3.2-unstable+hg16439-1) UNRELEASED; urgency=low
 
   * New upstream snapshot.
   * Don't longer try to maintain binary compatibility between unstable