Merge changes in 4.2 branch back into master branch

2026-02-05 07:24:49 +00:00 · 2011-03-17 03:05:13 +01:00
parent 09a6adce29 d61d55baef
commit 5aad123429
12 changed files with 19 additions and 13 deletions
--- a/2
+++ b/2
@@ -14,7 +14,7 @@
 #
 TMP        ?= /tmp
 DIST_PREFIX = ${TMP}
-VERSION     = 4.2+dev
+VERSION     = 4.2.1+dev
 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; \
--- a/bin/xen-create-image
+++ b/bin/xen-create-image
@@ -806,7 +806,7 @@ my $FAIL = 0;
 #
 # Release number.
 #
-my $RELEASE = '4.2+dev';
+my $RELEASE = '4.2.1+dev';


 #
--- 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.2+dev';
+my $RELEASE = '4.2.1+dev';


 # store version number away.
--- a/bin/xen-delete-image
+++ b/bin/xen-delete-image
@@ -171,7 +171,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.2+dev';
+my $RELEASE = '4.2.1+dev';



--- a/bin/xen-list-images
+++ b/bin/xen-list-images
@@ -101,7 +101,7 @@ $CONFIG{ 'prefix' } = "/etc/xen";
 #
 # Release number.
 #
-my $RELEASE = '4.2+dev';
+my $RELEASE = '4.2.1+dev';



--- a/bin/xen-resize-guest
+++ b/bin/xen-resize-guest
@@ -116,7 +116,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.2+dev';
+my $RELEASE = '4.2.1+dev';



--- a/bin/xen-update-image
+++ b/bin/xen-update-image
@@ -120,7 +120,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.2+dev';
+my $RELEASE = '4.2.1+dev';


 #
--- a/bin/xt-create-xen-config
+++ b/bin/xt-create-xen-config
@@ -156,7 +156,7 @@ $CONFIG{ 'extension' } = '.cfg';
 #
 # Release number.
 #
-my $RELEASE = '4.2+dev';
+my $RELEASE = '4.2.1+dev';



--- a/bin/xt-customize-image
+++ b/bin/xt-customize-image
@@ -98,7 +98,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.2+dev';
+my $RELEASE = '4.2.1+dev';



--- a/bin/xt-guess-suite-and-mirror
+++ b/bin/xt-guess-suite-and-mirror
@@ -80,7 +80,7 @@ use strict;
 #
 # Release number.
 #
-my $RELEASE = '4.2+dev';
+my $RELEASE = '4.2.1+dev';

 # Init
 my $mirror = '';
--- a/bin/xt-install-image
+++ b/bin/xt-install-image
@@ -117,7 +117,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.2+dev';
+my $RELEASE = '4.2.1+dev';


 #
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,12 @@
-xen-tools (4.2+dev-1) UNRELEASED; urgency=low
+xen-tools (4.2.1+dev-1) UNRELEASED; urgency=low

  * New upstream snapshot
+
+ -- Axel Beckert <abe@debian.org>  Thu, 17 Mar 2011 02:56:41 +0100
+
+xen-tools (4.2.1-1) unstable; urgency=low
+
+  * New upstream release
    - Fixes bashism in "editor" roles script. Thanks Raphaël Halimi for
      the patch! (Closes: #605203)
    - Fixes missing architecture check in Sarge amd64 special case. Thanks
@@ -10,7 +16,7 @@ xen-tools (4.2+dev-1) UNRELEASED; urgency=low
    - Unmounts /proc and /dev/pts of the freshly installed DomU just
      before unmounting the disk image. (Closes: #588783)

- -- Axel Beckert <abe@debian.org>  Tue, 08 Mar 2011 23:24:06 +0100
+ -- Axel Beckert <abe@debian.org>  Thu, 17 Mar 2011 01:00:47 +0100

 xen-tools (4.2-1) unstable; urgency=low