4.3.1 release candidate 1

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

.gitignore

@@ -5,7 +5,6 @@
 .*
 # but we _wan't_ those dot-files
 !.gitignore
-!.hgignore
 !.mailmap
 
 # ChangeLog is generated during make

.hgignore

@@ -1,5 +0,0 @@
-(^|/)CVS($|/)
-(^|/)\.hg($|/)
-(^|/)\.hgtags($|/)
-ChangeLog
-~$

Makefile

@@ -14,12 +14,10 @@
 #
 TMP        ?= /tmp
 DIST_PREFIX = ${TMP}
-VERSION     = 4.3rc1
+VERSION     = 4.3.1rc1
 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; \
-                    elif hg st  > /dev/null; then echo hg; \
-                    else                          echo cannot-determine-used-vcs; fi)
+VCS         = git
 
 #
 #  Installation prefix, useful for the Debian package.
@@ -70,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
 
 
 #
@@ -240,7 +239,6 @@ release: tidy fixup-perms update-version update-modules clean changelog
 	rm -f $(DIST_PREFIX)/$(BASE)-$(VERSION).tar.gz
 	cp -R . $(DIST_PREFIX)/$(BASE)-$(VERSION)
 	rm -rf $(DIST_PREFIX)/$(BASE)-$(VERSION)/debian
-	rm -rf $(DIST_PREFIX)/$(BASE)-$(VERSION)/.hg*
 	rm -rf $(DIST_PREFIX)/$(BASE)-$(VERSION)/.git*
 	cd $(DIST_PREFIX) && tar -cvf $(DIST_PREFIX)/$(BASE)-$(VERSION).tar $(BASE)-$(VERSION)/
 	gzip $(DIST_PREFIX)/$(BASE)-$(VERSION).tar

NEWS

@@ -1,3 +1,18 @@
+xen-tools 4.3rc2 (released TODO)
+=======================================
+
+Bug Fixes
+---------
+
+* Fix several testuite failures depending on the build host's
+  installation.
+
+Other Changes
+-------------
+
+* Remove most Mercurial traces
+
+
 xen-tools 4.3rc1 (released 08 Jun 2012)
 =======================================
 

bin/xen-create-image

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

bin/xen-create-nfs

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

bin/xen-delete-image

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

bin/xen-list-images

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

bin/xen-resize-guest

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

bin/xen-update-image

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

bin/xt-create-xen-config

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

bin/xt-customize-image

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

bin/xt-guess-suite-and-mirror

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

bin/xt-install-image

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

debian/changelog

@@ -1,3 +1,31 @@
+xen-tools (4.3.1~rc1-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:05:55 +0200
+
+xen-tools (4.3-1) unstable; urgency=low
+
+  * New upstream release
+    - Remove most Mercurial traces
+  * Fixes FTBFS due to testsuite failures (Closes: #676681)
+    - Disable tests of not yet used Xen::Tools. Fixes FTBFS in test suite
+      due to not satisifed Moose dependency in Xen::Tools::Log.
+    - Added build-dependencies on libmoose-perl, git, and
+      libtest-pod-coverage-perl for t/perl-syntax.t, t/gitignore.t, and
+      t/pod-coverage.t.
+    - Skip t/hook-inittab.t if /etc/inittab is not present on the build
+      host. Fixes FTBFS on Ubuntu.
+  * Switch to source format to "3.0 (quilt)"
+  * Don't remove stamp files manually, dh_clean does that already
+  * Remove generated file t/modules.t in clean target to be able to build
+    twice in a row.
+
+ -- Axel Beckert <abe@debian.org>  Tue, 26 Jun 2012 22:23:59 +0200
+
 xen-tools (4.3~rc1-1) unstable; urgency=low
 
   * New upstream release candidate

debian/control

@@ -2,7 +2,7 @@ Source: xen-tools
 Section: utils
 Priority: extra
 Maintainer: Axel Beckert <abe@debian.org>
-Build-Depends: debhelper (>= 7.0.0), libtest-pod-perl, libtext-template-perl, libfile-slurp-perl, devscripts
+Build-Depends: debhelper (>= 7.0.0), libtest-pod-perl, libtext-template-perl, libfile-slurp-perl, devscripts, libmoose-perl, libtest-pod-coverage-perl, git
 Standards-Version: 3.9.3
 Homepage: http://xen-tools.org/software/xen-tools
 Vcs-Browser: http://gitorious.org/xen-tools/xen-tools

debian/rules

@@ -20,7 +20,6 @@ clean:
 	dh_testdir
 	dh_testroot
 	make clean
-	rm -f build-stamp configure-stamp
 	dh_clean 
 
 install: build

debian/source/format

@@ -1 +1 @@
-1.0
+3.0 (quilt)

t/Makefile

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

t/hook-inittab.t

@@ -7,39 +7,38 @@
 #
 
 use strict;
-use Test::More qw( no_plan );
+use Test::More 'no_plan', skip_all => '/etc/inittab not present';
 use File::Temp;
 use File::Copy;
 
 
 #
-#  Sanity check.
+#  Check if build system has /etc/inittab.
 #
-ok( -e "/etc/inittab", "/etc/inittab exists." );
-
-
+SKIP: {
+    skip '/etc/inittab not present' unless -e "/etc/inittab";
 
 #
 #  Rather than having a hardwired list of distributions to test
 # against we look for subdirectories beneath hooks/ and test each
 # one.
 #
-foreach my $dir ( glob( "hooks/*" ) )
-{
-    next if ( $dir =~ /CVS/i );
-    next if ( $dir =~ /common/i );
-    next if ( ! -d $dir );
-
-    if ( $dir =~ /hooks\/(.*)/ )
+    foreach my $dir ( glob( "hooks/*" ) )
     {
-        my $dist = $1;
+        next if ( $dir =~ /CVS/i );
+        next if ( $dir =~ /common/i );
+        next if ( ! -d $dir );
 
-        next if ( $dist =~ /(edgy|dapper|ubuntu)/i );
+        if ( $dir =~ /hooks\/(.*)/ )
+        {
+            my $dist = $1;
 
-        testHook( $dist );
+            next if ( $dist =~ /(edgy|dapper|ubuntu)/i );
+
+            testHook( $dist );
+        }
     }
-}
-
+} # SKIP
 
 
 

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( -x "hooks/$dist/10-disable-tls", "TLS Disabling hook is executable" );
+    ok( -e "hooks/$dist/10-disable-tls", "TLS Disabling hook exists ($dist)" );
+    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.disabled/foo", "The fake library ended up in /lib/tls.disabled" );
-    ok( -d "$dir/lib/tls", "There is a new /lib/tls directory" );
+    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 ($dist)" );
+    ok( -d "$dir/lib/tls", "There is a new /lib/tls directory ($dist)" );
 }