From: Axel Beckert <abe@deuxchevaux.org>
Date: Mon, 30 Aug 2010 22:58:54 +0000 (+0200)
Subject: Bump version number to 4.2 RC2 (may become 4.2 "final").
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=fd8f94935a8b6e9ef8942b536ae3ea05d3d43050;p=people%2Fdariof%2Fxen-tools.git

Bump version number to 4.2 RC2 (may become 4.2 "final").

Start new debian/changelog entry, mention Dmitry's fix for #484652.
---

diff --git a/Makefile b/Makefile
index 0b50fea..eb79284 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@
 #
 TMP        ?= /tmp
 DIST_PREFIX = ${TMP}
-VERSION     = 4.2rc1
+VERSION     = 4.2rc2
 DEBVERSION  = $(shell echo $(VERSION)|sed 's/\(rc\|pre\|beta\|alpha\)/~\1/')
 BASE        = xen-tools
 VCS         = $(shell if git ls-files > /dev/null; then echo git; \
diff --git a/bin/xen-create-image b/bin/xen-create-image
index 2147a74..2295a16 100755
--- a/bin/xen-create-image
+++ b/bin/xen-create-image
@@ -801,7 +801,7 @@ my $FAIL = 0;
 #
 # Release number.
 #
-my $RELEASE = '4.2rc1';
+my $RELEASE = '4.2rc2';
 
 
 #
diff --git a/bin/xen-create-nfs b/bin/xen-create-nfs
index 1381157..9d1a607 100755
--- a/bin/xen-create-nfs
+++ b/bin/xen-create-nfs
@@ -131,7 +131,7 @@ $CONFIG{ 'template' } = '/etc/xen-tools/xm-nfs.tmpl';
 #
 # Release number.
 #
-my $RELEASE = '4.2rc1';
+my $RELEASE = '4.2rc2';
 
 
 # store version number away.
diff --git a/bin/xen-delete-image b/bin/xen-delete-image
index 74fe293..e22f46d 100755
--- a/bin/xen-delete-image
+++ b/bin/xen-delete-image
@@ -170,7 +170,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.2rc1';
+my $RELEASE = '4.2rc2';
 
 
 
diff --git a/bin/xen-list-images b/bin/xen-list-images
index 98781ea..e686ed7 100755
--- a/bin/xen-list-images
+++ b/bin/xen-list-images
@@ -102,7 +102,7 @@ $CONFIG{ 'prefix' } = "/etc/xen";
 #
 # Release number.
 #
-my $RELEASE = '4.2rc1';
+my $RELEASE = '4.2rc2';
 
 
 
diff --git a/bin/xen-resize-guest b/bin/xen-resize-guest
index 72a65ad..f9ff713 100755
--- a/bin/xen-resize-guest
+++ b/bin/xen-resize-guest
@@ -116,7 +116,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.2rc1';
+my $RELEASE = '4.2rc2';
 
 
 
diff --git a/bin/xen-update-image b/bin/xen-update-image
index 99bf254..db31469 100755
--- a/bin/xen-update-image
+++ b/bin/xen-update-image
@@ -121,7 +121,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.2rc1';
+my $RELEASE = '4.2rc2';
 
 
 #
diff --git a/bin/xt-create-xen-config b/bin/xt-create-xen-config
index a1b281b..3b94008 100755
--- a/bin/xt-create-xen-config
+++ b/bin/xt-create-xen-config
@@ -157,7 +157,7 @@ $CONFIG{ 'extension' } = '.cfg';
 #
 # Release number.
 #
-my $RELEASE = '4.2rc1';
+my $RELEASE = '4.2rc2';
 
 
 
diff --git a/bin/xt-customize-image b/bin/xt-customize-image
index 56aff13..b7866b2 100755
--- a/bin/xt-customize-image
+++ b/bin/xt-customize-image
@@ -97,7 +97,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.2rc1';
+my $RELEASE = '4.2rc2';
 
 
 
diff --git a/bin/xt-guess-suite-and-mirror b/bin/xt-guess-suite-and-mirror
index eccb61e..6f4acc3 100755
--- a/bin/xt-guess-suite-and-mirror
+++ b/bin/xt-guess-suite-and-mirror
@@ -78,7 +78,7 @@ use strict;
 #
 # Release number.
 #
-my $RELEASE = '4.2rc1';
+my $RELEASE = '4.2rc2';
 
 # Init
 my $mirror = '';
diff --git a/bin/xt-install-image b/bin/xt-install-image
index bbbc47e..c8da5f9 100755
--- a/bin/xt-install-image
+++ b/bin/xt-install-image
@@ -116,7 +116,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.2rc1';
+my $RELEASE = '4.2rc2';
 
 
 #
diff --git a/debian/changelog b/debian/changelog
index 303e5d0..d83fae4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xen-tools (4.2~rc2-1) UNRELEASED; urgency=low
+
+  * New upstream release candidate
+    - Fixes several cases of broken or incomplete config files with
+      unexpected or seldom parameter combinations. (Closes: #484652)
+
+ -- Axel Beckert <abe@debian.org>  Tue, 31 Aug 2010 00:30:04 +0200
+
 xen-tools (4.2~rc1-1) unstable; urgency=low
 
   [Axel Beckert]