[Pkg-xen-changes] r240 - in trunk/xen-3.0/debian: . bin patches

[Bastian Blank]

Author: waldi
Date: Mon Aug 21 06:33:46 2006
New Revision: 240

Modified:
   trunk/xen-3.0/debian/bin/gencontrol.py
   trunk/xen-3.0/debian/changelog
   trunk/xen-3.0/debian/patches/prefix-utils.dpatch
   trunk/xen-3.0/debian/rules.real
   trunk/xen-3.0/debian/templates/control.utils.in

Log:
* debian/bin/gencontrol.py: Update to new versioning schema.
* debian/changelog: Set version to 3.0.2-3+hg9762-1.
* debian/patches/prefix-utils.dpatch: Don't clash namespace.
* debian/rules.real, debian/templates/control.utils.in: Generate new version
  for ioemu package.


Modified: trunk/xen-3.0/debian/bin/gencontrol.py
==============================================================================
--- trunk/xen-3.0/debian/bin/gencontrol.py	(original)
+++ trunk/xen-3.0/debian/bin/gencontrol.py	Mon Aug 21 06:33:46 2006
@@ -16,6 +16,7 @@
         makeflags.update({
             'MAJOR': self.version['xen']['major'],
             'VERSION': self.version['xen']['version'],
+            'SHORT_VERSION': self.version['xen']['short_version'],
             'ABINAME': self.abiname,
         })
 
@@ -105,6 +106,7 @@
         self.vars = {
             'major': self.version['xen']['major'],
             'version': self.version['xen']['version'],
+            'short_version': self.version['xen']['short_version'],
             'abiname': self.abiname,
         }
 
@@ -115,7 +117,12 @@
     (?P<upstream>
         (?P<version>
             (?P<major>\d+\.\d+)
-            (\.\d+)?
+            (
+                (?P<minor>\.\d+)
+                -\d+
+                |
+                (?P<unstable>-unstable)
+            )
         )
         (?:
             \+hg
@@ -132,7 +139,14 @@
     match = re.match(version_re, version, re.X)
     if match is None:
         raise ValueError
-    return match.groupdict()
+    ret = match.groupdict()
+    if ret['unstable'] is not None:
+        ret['major'] = unstable
+        ret['short_version'] = ret['version']
+    else:
+        ret['version'] = ret['major'] + ret['minor']
+        ret['short_version'] = ret['major']
+    return ret
 
 if __name__ == '__main__':
     gencontrol()()

Modified: trunk/xen-3.0/debian/changelog
==============================================================================
--- trunk/xen-3.0/debian/changelog	(original)
+++ trunk/xen-3.0/debian/changelog	Mon Aug 21 06:33:46 2006
@@ -1,4 +1,4 @@
-xen-3.0 (3.0.2+hg9762-1) UNRELEASED; urgency=low
+xen-3.0 (3.0.2-3+hg9762-1) UNRELEASED; urgency=low
 
   * 
 

Modified: trunk/xen-3.0/debian/patches/prefix-utils.dpatch
==============================================================================
--- trunk/xen-3.0/debian/patches/prefix-utils.dpatch	(original)
+++ trunk/xen-3.0/debian/patches/prefix-utils.dpatch	Mon Aug 21 06:33:46 2006
@@ -18,7 +18,7 @@
 -else
 -LIBDIR = lib
 -endif
-+PREFIX = lib/xen-$(XEN_VERSION)
++PREFIX = lib/xen-$(XEN_VERSION_TOOLS)
 +BINDIR = $(PREFIX)/bin
 +LIBDIR = $(PREFIX)/lib
 +SBINDIR = $(PREFIX)/sbin

Modified: trunk/xen-3.0/debian/rules.real
==============================================================================
--- trunk/xen-3.0/debian/rules.real	(original)
+++ trunk/xen-3.0/debian/rules.real	Mon Aug 21 06:33:46 2006
@@ -54,7 +54,7 @@
 
 $(STAMPS_DIR)/build-utils_$(ARCH): DIR=$(BUILD_DIR)/build-utils_$(ARCH)
 $(STAMPS_DIR)/build-utils_$(ARCH): $(STAMPS_DIR)/setup-utils_$(ARCH)
-	$(MAKE) -C $(DIR)/tools XEN_COMPILE_ARCH=$(XEN_ARCH) XEN_TARGET_ARCH=$(XEN_ARCH) XEN_VERSION=$(VERSION)$(ABINAME) XEN_VERSION_IOEMU=$(MAJOR)
+	$(MAKE) -C $(DIR)/tools XEN_COMPILE_ARCH=$(XEN_ARCH) XEN_TARGET_ARCH=$(XEN_ARCH) XEN_VERSION_TOOLS=$(VERSION)$(ABINAME) XEN_VERSION_IOEMU=$(SHORT_VERSION)
 	touch $@
 
 install-base:
@@ -101,7 +101,7 @@
 	install -D -m644 debian/xen-utils.README.Debian debian/$(PACKAGE_NAME_UTILS)/usr/share/doc/$(PACKAGE_NAME_UTILS)/README.Debian
 	# TODO: move to xen-common
 	install -D debian/scripts/network-dummy debian/$(PACKAGE_NAME_UTILS)/etc/xen/scripts/network-dummy
-	$(MAKE) -C $(DIR)/tools install DESTDIR=$(CURDIR)/debian/tmp DISTDIR=$(CURDIR)/debian/tmp XEN_COMPILE_ARCH=$(XEN_ARCH) XEN_TARGET_ARCH=$(XEN_ARCH) XEN_VERSION=$(VERSION)$(ABINAME) XEN_VERSION_IOEMU=$(MAJOR)
+	$(MAKE) -C $(DIR)/tools install DESTDIR=$(CURDIR)/debian/tmp DISTDIR=$(CURDIR)/debian/tmp XEN_COMPILE_ARCH=$(XEN_ARCH) XEN_TARGET_ARCH=$(XEN_ARCH) XEN_VERSION_TOOLS=$(VERSION)$(ABINAME) XEN_VERSION_IOEMU=$(SHORT_VERSION)
 	# TODO: move to xen-common
 	DH_OPTIONS= dh_install -p$(PACKAGE_NAME_UTILS) --sourcedir=debian/tmp etc/udev/*.rules etc/udev
 	# TODO: move to xen-common

Modified: trunk/xen-3.0/debian/templates/control.utils.in
==============================================================================
--- trunk/xen-3.0/debian/templates/control.utils.in	(original)
+++ trunk/xen-3.0/debian/templates/control.utils.in	Mon Aug 21 06:33:46 2006
@@ -8,7 +8,7 @@
  The userspace tools to manage a system virtualized through the XEN virtual
  machine monitor.
 
-Package: xen-ioemu- at major@
+Package: xen-ioemu- at short_version@
 Depends: ${shlibs:Depends}, xen-utils- at version@@abiname@ (= ${Source-Version})
 Description: XEN administrative tools
  The userspace tools to manage a system virtualized through the XEN virtual