From 7584bac3803484350d2a9453f91c8164a234d960 Mon Sep 17 00:00:00 2001 From: Axel Beckert Date: Sat, 30 Oct 2010 17:39:10 +0200 Subject: [PATCH 01/12] Bump version to 4.2+dev for now, not sure if there will be a 4.2.1 or 4.3 next, maybe both --- Makefile | 2 +- bin/xen-create-image | 2 +- bin/xen-create-nfs | 2 +- bin/xen-delete-image | 2 +- bin/xen-list-images | 2 +- bin/xen-resize-guest | 2 +- bin/xen-update-image | 2 +- bin/xt-create-xen-config | 2 +- bin/xt-customize-image | 2 +- bin/xt-guess-suite-and-mirror | 2 +- bin/xt-install-image | 2 +- debian/changelog | 6 ++++++ 12 files changed, 17 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index bb70cdf..b380478 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ # TMP ?= /tmp DIST_PREFIX = ${TMP} -VERSION = 4.2 +VERSION = 4.2+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; \ diff --git a/bin/xen-create-image b/bin/xen-create-image index 3f7b072..5c4b74b 100755 --- a/bin/xen-create-image +++ b/bin/xen-create-image @@ -806,7 +806,7 @@ my $FAIL = 0; # # Release number. # -my $RELEASE = '4.2'; +my $RELEASE = '4.2+dev'; # diff --git a/bin/xen-create-nfs b/bin/xen-create-nfs index 1e226e6..2f1e7b6 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.2'; +my $RELEASE = '4.2+dev'; # store version number away. diff --git a/bin/xen-delete-image b/bin/xen-delete-image index 3f88bbf..8230c10 100755 --- a/bin/xen-delete-image +++ b/bin/xen-delete-image @@ -171,7 +171,7 @@ my %CONFIG; # # Release number. # -my $RELEASE = '4.2'; +my $RELEASE = '4.2+dev'; diff --git a/bin/xen-list-images b/bin/xen-list-images index 1f1118f..c38f116 100755 --- a/bin/xen-list-images +++ b/bin/xen-list-images @@ -101,7 +101,7 @@ $CONFIG{ 'prefix' } = "/etc/xen"; # # Release number. # -my $RELEASE = '4.2'; +my $RELEASE = '4.2+dev'; diff --git a/bin/xen-resize-guest b/bin/xen-resize-guest index 43ce5df..7690e44 100755 --- a/bin/xen-resize-guest +++ b/bin/xen-resize-guest @@ -116,7 +116,7 @@ my %CONFIG; # # Release number. # -my $RELEASE = '4.2'; +my $RELEASE = '4.2+dev'; diff --git a/bin/xen-update-image b/bin/xen-update-image index 1eb1473..da91240 100755 --- a/bin/xen-update-image +++ b/bin/xen-update-image @@ -120,7 +120,7 @@ my %CONFIG; # # Release number. # -my $RELEASE = '4.2'; +my $RELEASE = '4.2+dev'; # diff --git a/bin/xt-create-xen-config b/bin/xt-create-xen-config index dba7fa4..7dd7aec 100755 --- 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'; +my $RELEASE = '4.2+dev'; diff --git a/bin/xt-customize-image b/bin/xt-customize-image index 6321aa6..e0e0295 100755 --- a/bin/xt-customize-image +++ b/bin/xt-customize-image @@ -98,7 +98,7 @@ my %CONFIG; # # Release number. # -my $RELEASE = '4.2'; +my $RELEASE = '4.2+dev'; diff --git a/bin/xt-guess-suite-and-mirror b/bin/xt-guess-suite-and-mirror index fa1ceae..a2eb1d2 100755 --- 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'; +my $RELEASE = '4.2+dev'; # Init my $mirror = ''; diff --git a/bin/xt-install-image b/bin/xt-install-image index e93edd0..ac3bdd9 100755 --- a/bin/xt-install-image +++ b/bin/xt-install-image @@ -117,7 +117,7 @@ my %CONFIG; # # Release number. # -my $RELEASE = '4.2'; +my $RELEASE = '4.2+dev'; # diff --git a/debian/changelog b/debian/changelog index 2c4b092..4dec5b4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xen-tools (4.2+dev-1) UNRELEASED; urgency=low + + * New upstream snapshot + + -- Axel Beckert Sat, 30 Oct 2010 17:31:40 +0200 + xen-tools (4.2-1) unstable; urgency=low * New upstream release From 47bdce47d46a60bae0d0cb007d6a8ee5ff457828 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Jourdois?= Date: Sat, 30 Oct 2010 16:03:41 +0200 Subject: [PATCH 02/12] 4.2 has been released Move KNOWN_BUGS items to 4.3 --- KNOWN_BUGS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/KNOWN_BUGS b/KNOWN_BUGS index 4a74830..41b4acb 100644 --- a/KNOWN_BUGS +++ b/KNOWN_BUGS @@ -1,6 +1,6 @@ KNOWN BUGS in xen-tools -Bugs to fix before a 4.2 release +Bugs to fix before a 4.3 release -------------------------------- * xen-delete-image doesn't remove all logical volumes if --partitions is used. From 754e1c7c0cd4a13a5dfb96ac009a2bb53fd51318 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20HALIMI?= Date: Tue, 8 Mar 2011 23:21:23 +0100 Subject: [PATCH 03/12] Fix role script editor crashes with dash (Closes: #605203) --- roles/editor | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/roles/editor b/roles/editor index 67ada89..97c13af 100755 --- a/roles/editor +++ b/roles/editor @@ -61,8 +61,7 @@ for i in `find ${source} -name '*.sed' -print`; do # # Get the name of the file, minus the source prefix # - sourcelen=${#source} - file=/${i:$sourcelen} + file=${i#$source} # # Strip the .sed suffix From c2b16e9a50ad13b95874dd17b33f4c6e3146e83f Mon Sep 17 00:00:00 2001 From: Axel Beckert Date: Tue, 8 Mar 2011 23:37:46 +0100 Subject: [PATCH 04/12] =?UTF-8?q?Mention=20Rapha=C3=ABl=20Halimi=20and=20h?= =?UTF-8?q?is=20fix=20in=20AUTHORS=20and=20debian/changelog?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AUTHORS | 3 +++ debian/changelog | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/AUTHORS b/AUTHORS index cdbfe08..332ecd0 100644 --- a/AUTHORS +++ b/AUTHORS @@ -33,6 +33,9 @@ Contributions Stefan Fritsch - Contributed the policy-rc.d fixups for common.sh + Raphaël Halimi + - Contribute bashism fix + Sven Hertge - Bugfix for Debian/Gentoo package installation. diff --git a/debian/changelog b/debian/changelog index 4dec5b4..f2ec5c5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ xen-tools (4.2+dev-1) UNRELEASED; urgency=low * New upstream snapshot + - Fixes bashism in "editor" roles script. Thanks Raphaël Halimi for + the patch! (Closes: #605203) - -- Axel Beckert Sat, 30 Oct 2010 17:31:40 +0200 + -- Axel Beckert Tue, 08 Mar 2011 23:24:06 +0100 xen-tools (4.2-1) unstable; urgency=low From bfc8051b10ebfb5651edbd652edd1683d12527dd Mon Sep 17 00:00:00 2001 From: Guillaume Pernot Date: Tue, 8 Mar 2011 23:40:33 +0100 Subject: [PATCH 05/12] Fix installation of Sarge i386 on amd64 host (Closes: #611397) --- bin/xen-create-image | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/xen-create-image b/bin/xen-create-image index 5c4b74b..a12716d 100755 --- a/bin/xen-create-image +++ b/bin/xen-create-image @@ -1918,6 +1918,7 @@ sub checkArguments # Sarge amd64 needs different default mirror # if ( $CONFIG{ 'dist' } =~ /sarge/ and + $CONFIG{ 'arch' } =~ /amd64/ and $CONFIG{ 'mirror_sarge' } eq 'http://archive.debian.org/debian' ) { $CONFIG{ 'mirror_sarge' } = 'http://amd64.debian.net/debian'; From 0ba1ec6f557bf340bd2c4f004d49a37a383e0839 Mon Sep 17 00:00:00 2001 From: Axel Beckert Date: Tue, 8 Mar 2011 23:42:57 +0100 Subject: [PATCH 06/12] Fix sarge amd64 mirror URL (it's now on archive.debian.org, too) --- bin/xen-create-image | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/xen-create-image b/bin/xen-create-image index a12716d..98dd948 100755 --- a/bin/xen-create-image +++ b/bin/xen-create-image @@ -1921,7 +1921,7 @@ sub checkArguments $CONFIG{ 'arch' } =~ /amd64/ and $CONFIG{ 'mirror_sarge' } eq 'http://archive.debian.org/debian' ) { - $CONFIG{ 'mirror_sarge' } = 'http://amd64.debian.net/debian'; + $CONFIG{ 'mirror_sarge' } = 'http://archive.debian.org/debian-amd64'; } # From 423ea8157d54be0b4b0b6e18d0218cb266795c72 Mon Sep 17 00:00:00 2001 From: Axel Beckert Date: Tue, 8 Mar 2011 23:51:14 +0100 Subject: [PATCH 07/12] Mention Guillaume Pernot and his fix in AUTHORS and debian/changelog --- AUTHORS | 3 +++ debian/changelog | 3 +++ 2 files changed, 6 insertions(+) diff --git a/AUTHORS b/AUTHORS index 332ecd0..8db37c1 100644 --- a/AUTHORS +++ b/AUTHORS @@ -65,6 +65,9 @@ Contributions Nathan O'Sullivan - New features wrt. options and helper functions + Guillaume Pernot + - Fixed Sarge amd64 special case + Walter Reiner - Provided --image-dev + --swap-dev patch. diff --git a/debian/changelog b/debian/changelog index f2ec5c5..1b03674 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,9 @@ xen-tools (4.2+dev-1) UNRELEASED; urgency=low * New upstream snapshot - 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 + to Guillaume Pernot! (Closes: #611397) Also changes default Sarge + amd64 mirror to http://archive.debian.org/debian-amd64/. -- Axel Beckert Tue, 08 Mar 2011 23:24:06 +0100 From cf9b356e6d826425aa0d0558fa21b9ad48c15cc4 Mon Sep 17 00:00:00 2001 From: Axel Beckert Date: Wed, 9 Mar 2011 00:05:26 +0100 Subject: [PATCH 08/12] tab -> 8 blanks --- bin/xen-create-image | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/xen-create-image b/bin/xen-create-image index 98dd948..bb7e964 100755 --- a/bin/xen-create-image +++ b/bin/xen-create-image @@ -1918,7 +1918,7 @@ sub checkArguments # Sarge amd64 needs different default mirror # if ( $CONFIG{ 'dist' } =~ /sarge/ and - $CONFIG{ 'arch' } =~ /amd64/ and + $CONFIG{ 'arch' } =~ /amd64/ and $CONFIG{ 'mirror_sarge' } eq 'http://archive.debian.org/debian' ) { $CONFIG{ 'mirror_sarge' } = 'http://archive.debian.org/debian-amd64'; From 5bace3a7e2aa2400fcd7f2c0b1cfe35040597ea0 Mon Sep 17 00:00:00 2001 From: Axel Beckert Date: Wed, 9 Mar 2011 00:11:58 +0100 Subject: [PATCH 09/12] Add new commandline option syntax check ipv4_or_auto (Closes: #611407) --- bin/xen-create-image | 6 +++++- debian/changelog | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/bin/xen-create-image b/bin/xen-create-image index bb7e964..b90db1a 100755 --- a/bin/xen-create-image +++ b/bin/xen-create-image @@ -1560,6 +1560,10 @@ sub checkOption check => qr/^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/, message => "must be valid IPv4.\n", }, + ipv4_or_auto => { + check => qr/^(?:auto|(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?))$/, + message => "must be valid IPv4 or the keyword 'auto'.\n", + }, hostname => { check => qr/^[a-z0-9][a-z0-9.-]{0,254}$/i, message => "must be a valid hostname.\n", @@ -1624,7 +1628,7 @@ sub checkOption output => 'existingDir', extension => 'filename', mac => 'mac', - ip => 'ipv4', + ip => 'ipv4_or_auto', hash_method => 'hashMethod', ); diff --git a/debian/changelog b/debian/changelog index 1b03674..4f782bc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ xen-tools (4.2+dev-1) UNRELEASED; urgency=low - Fixes missing architecture check in Sarge amd64 special case. Thanks to Guillaume Pernot! (Closes: #611397) Also changes default Sarge amd64 mirror to http://archive.debian.org/debian-amd64/. + - Allows --ip=auto again (Closes: #611407) -- Axel Beckert Tue, 08 Mar 2011 23:24:06 +0100 From 8bd3206eff65b310f68f1f148de33e54c3aa9c1b Mon Sep 17 00:00:00 2001 From: Axel Beckert Date: Wed, 9 Mar 2011 00:56:14 +0100 Subject: [PATCH 10/12] Unmount /proc and /dev/pts just before unmounting the disk image (Closes: #588783) --- bin/xen-create-image | 12 ++++++------ debian/changelog | 2 ++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/bin/xen-create-image b/bin/xen-create-image index b90db1a..57585bb 100755 --- a/bin/xen-create-image +++ b/bin/xen-create-image @@ -3732,12 +3732,6 @@ sub runCustomisationHooks } else { unlink "$MOUNT_POINT/etc/resolv.conf"; } - - # - # Unmount /proc and /dev/pts in the guest install. - # - runCommand("umount $MOUNT_POINT/proc"); - runCommand("umount $MOUNT_POINT/dev/pts"); } @@ -4266,6 +4260,12 @@ sub unMountImage { my ($point) = (@_); + # + # First we unmount /proc and /dev/pts in the guest install. + # + runCommand("umount $MOUNT_POINT/proc"); + #runCommand("umount $MOUNT_POINT/dev/pts"); + # # Open /proc/mount and get a list of currently mounted paths # which begin with our mount point. diff --git a/debian/changelog b/debian/changelog index 4f782bc..6551aa5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ xen-tools (4.2+dev-1) UNRELEASED; urgency=low to Guillaume Pernot! (Closes: #611397) Also changes default Sarge amd64 mirror to http://archive.debian.org/debian-amd64/. - Allows --ip=auto again (Closes: #611407) + - Unmounts /proc and /dev/pts of the freshly installed DomU just + before unmounting the disk image. (Closes: #588783) -- Axel Beckert Tue, 08 Mar 2011 23:24:06 +0100 From 870ec1adacb9300897a18d5ec74149c5a5067b7d Mon Sep 17 00:00:00 2001 From: Axel Beckert Date: Thu, 17 Mar 2011 01:01:50 +0100 Subject: [PATCH 11/12] Call it a release (4.2.1) --- Makefile | 2 +- bin/xen-create-image | 2 +- bin/xen-create-nfs | 2 +- bin/xen-delete-image | 2 +- bin/xen-list-images | 2 +- bin/xen-resize-guest | 2 +- bin/xen-update-image | 2 +- bin/xt-create-xen-config | 2 +- bin/xt-customize-image | 2 +- bin/xt-guess-suite-and-mirror | 2 +- bin/xt-install-image | 2 +- debian/changelog | 6 +++--- 12 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index b380478..5bf33cc 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ # TMP ?= /tmp DIST_PREFIX = ${TMP} -VERSION = 4.2+dev +VERSION = 4.2.1 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 57585bb..888a1b7 100755 --- 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'; # diff --git a/bin/xen-create-nfs b/bin/xen-create-nfs index 2f1e7b6..c0d9cb4 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.2+dev'; +my $RELEASE = '4.2.1'; # store version number away. diff --git a/bin/xen-delete-image b/bin/xen-delete-image index 8230c10..35f4304 100755 --- 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'; diff --git a/bin/xen-list-images b/bin/xen-list-images index c38f116..b61856f 100755 --- 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'; diff --git a/bin/xen-resize-guest b/bin/xen-resize-guest index 7690e44..a59be55 100755 --- 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'; diff --git a/bin/xen-update-image b/bin/xen-update-image index da91240..be5485e 100755 --- 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'; # diff --git a/bin/xt-create-xen-config b/bin/xt-create-xen-config index 7dd7aec..2ee1150 100755 --- 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'; diff --git a/bin/xt-customize-image b/bin/xt-customize-image index e0e0295..9f1d627 100755 --- 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'; diff --git a/bin/xt-guess-suite-and-mirror b/bin/xt-guess-suite-and-mirror index a2eb1d2..67aae32 100755 --- 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'; # Init my $mirror = ''; diff --git a/bin/xt-install-image b/bin/xt-install-image index ac3bdd9..e00d2dd 100755 --- 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'; # diff --git a/debian/changelog b/debian/changelog index 6551aa5..aee0031 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ -xen-tools (4.2+dev-1) UNRELEASED; urgency=low +xen-tools (4.2.1-1) unstable; urgency=low - * New upstream snapshot + * 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 +10,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 Tue, 08 Mar 2011 23:24:06 +0100 + -- Axel Beckert Thu, 17 Mar 2011 01:00:47 +0100 xen-tools (4.2-1) unstable; urgency=low From d61d55baefd0dbc2734f26ec0662b867d72417b9 Mon Sep 17 00:00:00 2001 From: Axel Beckert Date: Thu, 17 Mar 2011 02:59:28 +0100 Subject: [PATCH 12/12] Bump version to 4.2.1+dev for now --- Makefile | 2 +- bin/xen-create-image | 2 +- bin/xen-create-nfs | 2 +- bin/xen-delete-image | 2 +- bin/xen-list-images | 2 +- bin/xen-resize-guest | 2 +- bin/xen-update-image | 2 +- bin/xt-create-xen-config | 2 +- bin/xt-customize-image | 2 +- bin/xt-guess-suite-and-mirror | 2 +- bin/xt-install-image | 2 +- debian/changelog | 6 ++++++ 12 files changed, 17 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 5bf33cc..9c9284e 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ # TMP ?= /tmp DIST_PREFIX = ${TMP} -VERSION = 4.2.1 +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; \ diff --git a/bin/xen-create-image b/bin/xen-create-image index 888a1b7..af4d4f5 100755 --- a/bin/xen-create-image +++ b/bin/xen-create-image @@ -806,7 +806,7 @@ my $FAIL = 0; # # Release number. # -my $RELEASE = '4.2.1'; +my $RELEASE = '4.2.1+dev'; # diff --git a/bin/xen-create-nfs b/bin/xen-create-nfs index c0d9cb4..6969c74 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.2.1'; +my $RELEASE = '4.2.1+dev'; # store version number away. diff --git a/bin/xen-delete-image b/bin/xen-delete-image index 35f4304..da58417 100755 --- a/bin/xen-delete-image +++ b/bin/xen-delete-image @@ -171,7 +171,7 @@ my %CONFIG; # # Release number. # -my $RELEASE = '4.2.1'; +my $RELEASE = '4.2.1+dev'; diff --git a/bin/xen-list-images b/bin/xen-list-images index b61856f..d54abf4 100755 --- a/bin/xen-list-images +++ b/bin/xen-list-images @@ -101,7 +101,7 @@ $CONFIG{ 'prefix' } = "/etc/xen"; # # Release number. # -my $RELEASE = '4.2.1'; +my $RELEASE = '4.2.1+dev'; diff --git a/bin/xen-resize-guest b/bin/xen-resize-guest index a59be55..95acf56 100755 --- a/bin/xen-resize-guest +++ b/bin/xen-resize-guest @@ -116,7 +116,7 @@ my %CONFIG; # # Release number. # -my $RELEASE = '4.2.1'; +my $RELEASE = '4.2.1+dev'; diff --git a/bin/xen-update-image b/bin/xen-update-image index be5485e..004ee81 100755 --- a/bin/xen-update-image +++ b/bin/xen-update-image @@ -120,7 +120,7 @@ my %CONFIG; # # Release number. # -my $RELEASE = '4.2.1'; +my $RELEASE = '4.2.1+dev'; # diff --git a/bin/xt-create-xen-config b/bin/xt-create-xen-config index 2ee1150..1cdcefb 100755 --- 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.1'; +my $RELEASE = '4.2.1+dev'; diff --git a/bin/xt-customize-image b/bin/xt-customize-image index 9f1d627..c65ac59 100755 --- a/bin/xt-customize-image +++ b/bin/xt-customize-image @@ -98,7 +98,7 @@ my %CONFIG; # # Release number. # -my $RELEASE = '4.2.1'; +my $RELEASE = '4.2.1+dev'; diff --git a/bin/xt-guess-suite-and-mirror b/bin/xt-guess-suite-and-mirror index 67aae32..4e437e1 100755 --- 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.1'; +my $RELEASE = '4.2.1+dev'; # Init my $mirror = ''; diff --git a/bin/xt-install-image b/bin/xt-install-image index e00d2dd..cdac40a 100755 --- a/bin/xt-install-image +++ b/bin/xt-install-image @@ -117,7 +117,7 @@ my %CONFIG; # # Release number. # -my $RELEASE = '4.2.1'; +my $RELEASE = '4.2.1+dev'; # diff --git a/debian/changelog b/debian/changelog index aee0031..ea73ec4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xen-tools (4.2.1+dev-1) UNRELEASED; urgency=low + + * New upstream snapshot + + -- Axel Beckert Thu, 17 Mar 2011 02:56:41 +0100 + xen-tools (4.2.1-1) unstable; urgency=low * New upstream release