[Pkg-xen-changes] r708 - in trunk/xen-3/debian: bin lib/python/debian_xen templates

[Bastian Blank]

Author: waldi
Date: Wed Feb 24 14:16:53 2010
New Revision: 708

Log:
Drop usage of major version.

* debian/bin/gencontrol.py: Don't define major replacement.
* debian/lib/python/debian_xen/debian.py: Don't parse major part.
* debian/templates/control.hypervisor.in, debian/templates/control.source.in:
  Remove all usage of major version.

Modified:
   trunk/xen-3/debian/bin/gencontrol.py
   trunk/xen-3/debian/lib/python/debian_xen/debian.py
   trunk/xen-3/debian/templates/control.hypervisor.in
   trunk/xen-3/debian/templates/control.source.in

Modified: trunk/xen-3/debian/bin/gencontrol.py
==============================================================================
--- trunk/xen-3/debian/bin/gencontrol.py	Wed Feb 24 14:13:50 2010	(r707)
+++ trunk/xen-3/debian/bin/gencontrol.py	Wed Feb 24 14:16:53 2010	(r708)
@@ -107,7 +107,6 @@
         self.version = changelog[0].version
         self.abiname = 'abiname' in self.config['abi',] and '-%s' % self.config['abi',]['abiname'] or ''
         self.vars = {
-            'major': self.version.xen_major,
             'version': self.version.xen_version,
             'abiname': self.abiname,
         }

Modified: trunk/xen-3/debian/lib/python/debian_xen/debian.py
==============================================================================
--- trunk/xen-3/debian/lib/python/debian_xen/debian.py	Wed Feb 24 14:13:50 2010	(r707)
+++ trunk/xen-3/debian/lib/python/debian_xen/debian.py	Wed Feb 24 14:16:53 2010	(r708)
@@ -5,8 +5,7 @@
     _version_xen_rules = ur"""
 ^
 (?P<version>
-    (?P<major>\d+)
-    \.\d+
+    \d+\.\d+
 )
 \.\d+
 (?:
@@ -27,7 +26,6 @@
         if match is None:
             raise ValueError("Invalid debian xen version")
         d = match.groupdict()
-        self.xen_major = d['major']
         self.xen_version = d['version']
 
 if __name__ == '__main__':

Modified: trunk/xen-3/debian/templates/control.hypervisor.in
==============================================================================
--- trunk/xen-3/debian/templates/control.hypervisor.in	Wed Feb 24 14:13:50 2010	(r707)
+++ trunk/xen-3/debian/templates/control.hypervisor.in	Wed Feb 24 14:16:53 2010	(r708)
@@ -1,5 +1,5 @@
 Package: xen-hypervisor- at version@@abiname@@localversion@
-Provides: xen-hypervisor, xen-hypervisor- at major@, xen-hypervisor- at version@@abiname@, xen-hypervisor at localversion@
+Provides: xen-hypervisor, xen-hypervisor- at version@@abiname@, xen-hypervisor at localversion@
 Recommends: xen-utils- at version@@abiname@
 Suggests: xen-docs- at version@
 Description: The Xen Hypervisor on @class@

Modified: trunk/xen-3/debian/templates/control.source.in
==============================================================================
--- trunk/xen-3/debian/templates/control.source.in	Wed Feb 24 14:13:50 2010	(r707)
+++ trunk/xen-3/debian/templates/control.source.in	Wed Feb 24 14:16:53 2010	(r708)
@@ -1,4 +1,3 @@
-Source: xen- at major@
 Section: misc
 Priority: extra
 Maintainer: Debian Xen Team <pkg-xen-devel at lists.alioth.debian.org>