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 0b50feae8d2f9c23954d182b9c0a5a3a73f31919..eb79284a3ca8916759a29c679a56861b36a1c125 100644 (file)
--- 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 2147a74e561b0c4f164fd4cd83fc527910aa8a07..2295a1673a9f24c4ca8aaf54aeaee816429833de 100755 (executable)
--- 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 1381157cf25b12d7552e81fb4b13b7aa2050f61e..9d1a607ec0fef21792ad1edf2e70a6837637dae2 100755 (executable)
--- 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 74fe2936c5f6d726b99790fff932fcd72020ae34..e22f46d64b1a431f478082fb6881bd1a994708db 100755 (executable)
--- 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 98781ea35cefa30eaced5f13ad01d385f39eff57..e686ed7c8144114beb441396ee8005fa13cef018 100755 (executable)
--- 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 72a65ad058323ac6a06aa7e7ab3676c6378eb888..f9ff7136acb38f268045465b93ae24a3ceef2737 100755 (executable)
--- 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 99bf25468ac8d0f20c2d3be972e3daf048dd401a..db314694b7d18396a0dd06cf2f3762646a442974 100755 (executable)
--- 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 a1b281bbb2ac568acb9623faa1be1aadb31ee14a..3b9400865606364d872c59fbf4ee51046139c9a3 100755 (executable)
--- 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 56aff134b877e8b853ef34ac23b1497c366d5943..b7866b26bf36e2ccc289845522e9854be7378944 100755 (executable)
--- 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 eccb61e73326a80fd750590622d843d19ca63154..6f4acc3e550f8327c520f058ea5235581f601af8 100755 (executable)
--- 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 bbbc47ec1c989c9d1649da6ef8677b5adc5ff4eb..c8da5f9e55d775cc7d3c877697eaf63c3f8888f7 100755 (executable)
--- 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 303e5d08bac175535953af635cdf1f139cbd016d..d83fae4daca871fd94fb7147a6f2233510f142e1 100644 (file)
--- 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]