[Pkg-xen-changes] r486 - in trunk/xen-unstable/debian: . bin lib/python/debian_xen

[Bastian Blank]

Author: waldi
Date: Sat Nov 24 19:11:38 2007
New Revision: 486

Log:
debian/bin/gencontrol.py, debian/lib/python/debian_xen/debian.py,
debian/rules.real: Fix version.


Modified:
   trunk/xen-unstable/debian/bin/gencontrol.py
   trunk/xen-unstable/debian/lib/python/debian_xen/debian.py
   trunk/xen-unstable/debian/rules.real

Modified: trunk/xen-unstable/debian/bin/gencontrol.py
==============================================================================
--- trunk/xen-unstable/debian/bin/gencontrol.py	(original)
+++ trunk/xen-unstable/debian/bin/gencontrol.py	Sat Nov 24 19:11:38 2007
@@ -15,8 +15,9 @@
 
     def do_main_setup(self, vars, makeflags, extra):
         makeflags.update({
-            'MAJOR': self.version.xen_major,
+            'MAJOR': 'unstable',
             'VERSION': 'unstable',
+            'UPSTREAMVERSION': self.version.xen_version,
             'EXTRAVERSION': '-unstable',
         })
 
@@ -113,7 +114,7 @@
         changelog = Changelog(version = VersionXenUnstable)
         self.version = changelog[0].version
         self.vars = {
-            'major': self.version.xen_major,
+            'major': 'unstable',
             'version': 'unstable',
             'abiname': '',
         }

Modified: trunk/xen-unstable/debian/lib/python/debian_xen/debian.py
==============================================================================
--- trunk/xen-unstable/debian/lib/python/debian_xen/debian.py	(original)
+++ trunk/xen-unstable/debian/lib/python/debian_xen/debian.py	Sat Nov 24 19:11:38 2007
@@ -26,7 +26,6 @@
         if match is None:
             raise ValueError("Invalid debian xen version")
         d = match.groupdict()
-        self.xen_major = 'unstable'
         self.xen_version = d['version']
 
 if __name__ == '__main__':

Modified: trunk/xen-unstable/debian/rules.real
==============================================================================
--- trunk/xen-unstable/debian/rules.real	(original)
+++ trunk/xen-unstable/debian/rules.real	Sat Nov 24 19:11:38 2007
@@ -64,7 +64,7 @@
 install-utils_$(ARCH): CONFIG = \
 		XEN_COMPILE_ARCH=$(XEN_ARCH) \
 		XEN_TARGET_ARCH=$(XEN_ARCH) \
-		XEN_VERSION=$(VERSION)$(ABINAME)
+		XEN_VERSION=$(UPSTREAMVERSION)$(ABINAME)
 
 $(STAMPS_DIR)/build-utils_$(ARCH): DIR=$(BUILD_DIR)/build-utils_$(ARCH)
 $(STAMPS_DIR)/build-utils_$(ARCH): $(STAMPS_DIR)/setup-utils_$(ARCH)
@@ -100,7 +100,7 @@
 	dh_testroot
 	dh_clean -k
 	dh_installdirs boot
-	cp $(DIR)/xen/xen.gz debian/$(PACKAGE_NAME)/boot/xen-$(VERSION)$(ABINAME)-$(FLAVOUR).gz
+	cp $(DIR)/xen/xen.gz debian/$(PACKAGE_NAME)/boot/xen-$(UPSTREAMVERSION)$(ABINAME)-$(FLAVOUR).gz
 	$(MAKE) -f debian/rules.real install-base
 
 install-utils_$(ARCH): SOURCE_DIR = $(BUILD_DIR)/build-utils_$(ARCH)
@@ -117,7 +117,7 @@
 	install -D -m644 debian/xen-utils.NEWS $(PACKAGE_DIR)/usr/share/doc/$(PACKAGE_NAME)/NEWS
 	install -D -m644 debian/xen-utils.README.Debian $(PACKAGE_DIR)/usr/share/doc/$(PACKAGE_NAME)/README.Debian
 	dh_install --sourcedir=$(DIR) usr/lib
-	dh_install --sourcedir=$(DIR) usr/share/xen-$(VERSION)$(ABINAME)
+	dh_install --sourcedir=$(DIR) usr/share/xen-$(UPSTREAMVERSION)$(ABINAME)
 	dh_pycentral
 	dh_strip
 	dh_shlibdeps