Release 4.3.1 RC1 unmodified as 4.3.1

Will likely just appear in the Ubuntu PPA to check if it finally build
for Ubuntu again

Makefile

@@ -14,7 +14,7 @@
 #
 TMP        ?= /tmp
 DIST_PREFIX = ${TMP}
-VERSION     = 4.3
+VERSION     = 4.3.1
 DEBVERSION  = $(shell echo $(VERSION)|sed 's/\(rc\|pre\|beta\|alpha\)/~\1/')
 BASE        = xen-tools
 VCS         = git
@@ -68,6 +68,7 @@ clean:
 	@if [ -d debian/xen-tools ]; then rm -rf ./debian/xen-tools; fi
 	@if [ -e $(BASE)-$(VERSION).tar.gz ]; then rm $(BASE)-$(VERSION).tar.gz ; fi
 	@if [ -e $(BASE)-$(VERSION).tar.gz.asc ]; then rm $(BASE)-$(VERSION).tar.gz.asc ; fi
+	cd t; $(MAKE) clean
 
 
 #

bin/xen-create-image

@@ -822,7 +822,7 @@ my $FAIL = 0;
 #
 # Release number.
 #
-my $RELEASE = '4.3';
+my $RELEASE = '4.3.1';
 
 
 #

bin/xen-create-nfs

@@ -131,7 +131,7 @@ $CONFIG{ 'template' } = '/etc/xen-tools/xm-nfs.tmpl';
 #
 # Release number.
 #
-my $RELEASE = '4.3';
+my $RELEASE = '4.3.1';
 
 
 # store version number away.

bin/xen-delete-image

@@ -171,7 +171,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.3';
+my $RELEASE = '4.3.1';
 
 
 

bin/xen-list-images

@@ -101,7 +101,7 @@ $CONFIG{ 'prefix' } = "/etc/xen";
 #
 # Release number.
 #
-my $RELEASE = '4.3';
+my $RELEASE = '4.3.1';
 
 
 

bin/xen-resize-guest

@@ -116,7 +116,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.3';
+my $RELEASE = '4.3.1';
 
 
 

bin/xen-update-image

@@ -120,7 +120,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.3';
+my $RELEASE = '4.3.1';
 
 
 #

bin/xt-create-xen-config

@@ -156,7 +156,7 @@ $CONFIG{ 'extension' } = '.cfg';
 #
 # Release number.
 #
-my $RELEASE = '4.3';
+my $RELEASE = '4.3.1';
 
 
 

bin/xt-customize-image

@@ -98,7 +98,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.3';
+my $RELEASE = '4.3.1';
 
 
 

bin/xt-guess-suite-and-mirror

@@ -81,7 +81,7 @@ use strict;
 #
 # Release number.
 #
-my $RELEASE = '4.3';
+my $RELEASE = '4.3.1';
 
 # Init
 my $mirror = '';

bin/xt-install-image

@@ -118,7 +118,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.3';
+my $RELEASE = '4.3.1';
 
 
 #

debian/changelog

@@ -1,3 +1,12 @@
+xen-tools (4.3.1-1) unstable; urgency=low
+
+  * Remove t/modules.t in upstream's t/Makefile instead of debian/rules'
+    clean target.
+  * Run t/hook-tls.t only if distribution actually has
+    10-disable-tls. Fixes test suite failure on 32 bit architectures.
+
+ -- Axel Beckert <abe@debian.org>  Sat, 30 Jun 2012 16:44:50 +0200
+
 xen-tools (4.3-1) unstable; urgency=low
 
   * New upstream release

debian/clean

@@ -1 +0,0 @@
-t/modules.t

t/Makefile

@@ -10,4 +10,4 @@ modules: modules.sh
 	./modules.sh > modules.t
 
 clean:
-	-rm *~
+	rm -vf *~ modules.t

t/hook-tls.t

@@ -27,14 +27,14 @@ else
 #
 foreach my $dir ( glob( "hooks/*" ) )
 {
-    next if ( $dir =~ /CVS/i );
+    next if ( $dir =~ /CVS|common/i );
     next if ( ! -d $dir );
 
     if ( $dir =~ /hooks\/(.*)/ )
     {
         my $dist = $1;
 
-        testTLSDisabling( $dist ) unless ( $dist =~ /(dapper|edgy|ubuntu|debian)/i );
+        testTLSDisabling( $dist ) if -e "hooks/$dist/10-disable-tls";
     }
 }
 
@@ -69,8 +69,8 @@ sub testTLSDisabling
     #
     ok( -d "hooks/$dist", "There is a hook directory for the distro $dist" );
 
-    ok( -e "hooks/$dist/10-disable-tls", "TLS Disabling hook exists" );
+    ok( -e "hooks/$dist/10-disable-tls", "TLS Disabling hook exists ($dist)" );
-    ok( -x "hooks/$dist/10-disable-tls", "TLS Disabling hook is executable" );
+    ok( -x "hooks/$dist/10-disable-tls", "TLS Disabling hook is executable ($dist)" );
 
     #
     #  Call the hook
@@ -80,7 +80,7 @@ sub testTLSDisabling
     #
     # Make sure the the TLS directory is empty
     #
-    ok( ! -e "$dir/lib/tls/foo", "The fake library from /lib/tls is gone" );
+    ok( ! -e "$dir/lib/tls/foo", "The fake library from /lib/tls is gone ($dist)" );
-    ok( -e "$dir/lib/tls.disabled/foo", "The fake library ended up in /lib/tls.disabled" );
+    ok( -e "$dir/lib/tls.disabled/foo", "The fake library ended up in /lib/tls.disabled ($dist)" );
-    ok( -d "$dir/lib/tls", "There is a new /lib/tls directory" );
+    ok( -d "$dir/lib/tls", "There is a new /lib/tls directory ($dist)" );
 }