[Pkg-lustre-svn-commit] updated: [4250680] temp commit for build test

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit 42506807bd305d0aa81eda8556aeb33201436df0
Author: Patrick Winnertz <winnie at debian.org>
Date:   Wed Nov 16 14:16:40 2011 +0100

    temp commit for build test
    
    Signed-off-by: Patrick Winnertz <winnie at debian.org>

diff --git a/debian/changelog b/debian/changelog
index 124a76d..bfed398 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+lustre (1.8.7-wc1+dfsg-1~2.gbpd80fe2) UNRELEASED; urgency=low
+
+  ** SNAPSHOT build @d80fe227553f110cd9755f6cd4640de0e58d94d2 **
+
+  * [a7396a3] Imported Upstream version 1.8.7-wc1+dfsg
+  * [50cd7c2] Remove autogen.sh patch as autogen.sh is provided by source
+  * [65422a6] Fix some patches to apply to the newest upstream release of 1.8
+  * [d80fe22] Bump automake version to 1.11 (Closes: #648585)
+
+ -- Patrick Winnertz <winnie at debian.org>  Wed, 16 Nov 2011 14:16:27 +0100
+
 lustre (1.8.5+dfsg-3) unstable; urgency=low
 
   * [9194f2d] Build ldiskfs kernel module also on plain 
diff --git a/debian/patches/fix-oot-builds.patch b/debian/patches/fix-oot-builds.patch
index 62fd7d8..63a9ef4 100644
--- a/debian/patches/fix-oot-builds.patch
+++ b/debian/patches/fix-oot-builds.patch
@@ -4,8 +4,8 @@
 
 Index: lustre/build/autoconf/lustre-build.m4
 ===================================================================
---- lustre.orig/build/autoconf/lustre-build.m4	2011-11-16 13:56:06.000000000 +0100
-+++ lustre/build/autoconf/lustre-build.m4	2011-11-16 14:05:34.568439809 +0100
+--- lustre.orig/build/autoconf/lustre-build.m4	2011-11-16 14:47:46.916997055 +0100
++++ lustre/build/autoconf/lustre-build.m4	2011-11-16 15:16:57.297676717 +0100
 @@ -864,7 +864,7 @@
  	CC="$CC -m64"
  fi
@@ -17,8 +17,8 @@ Index: lustre/build/autoconf/lustre-build.m4
  AC_SUBST(LLCPPFLAGS)
 Index: lustre/lustre/autoMakefile.am
 ===================================================================
---- lustre.orig/lustre/autoMakefile.am	2011-11-16 13:56:07.000000000 +0100
-+++ lustre/lustre/autoMakefile.am	2011-11-16 14:05:34.568439809 +0100
+--- lustre.orig/lustre/autoMakefile.am	2011-11-16 14:47:46.924997088 +0100
++++ lustre/lustre/autoMakefile.am	2011-11-16 15:16:57.297676717 +0100
 @@ -85,7 +85,7 @@
  BUILD_VER_H=$(top_builddir)/lustre/include/lustre/lustre_build_version.h
  
@@ -30,16 +30,16 @@ Index: lustre/lustre/autoMakefile.am
                  $(RM) tmpver tmpdiff ||					\
 Index: lustre/lustre/scripts/version_tag.pl
 ===================================================================
---- lustre.orig/lustre/scripts/version_tag.pl	2011-11-16 13:56:07.000000000 +0100
-+++ lustre/lustre/scripts/version_tag.pl	2011-11-16 14:10:27.209890939 +0100
+--- lustre.orig/lustre/scripts/version_tag.pl	2011-11-16 14:47:46.936997153 +0100
++++ lustre/lustre/scripts/version_tag.pl	2011-11-16 15:32:18.422244336 +0100
 @@ -47,17 +47,19 @@
          !$ver->open("$objdir/include/linux/version.h") &&
          !$ver->open("$dir/include/linux/utsrelease.h") &&
          !$ver->open("$dir/include/linux/version.h")) {
 -            die "Run make dep on '$dir'\n";
 -    }
-+         #   die "Run make dep on '$dir'\n";
-+	$kernver= "UNKOWN-KERNEL";
++            #die "Run make dep on '$dir'\n";
++	    $kernver = "UNKOWN-KERNEL";
 +    } else {
  
 -    while(defined($line = <$ver>)) {
@@ -48,25 +48,34 @@ Index: lustre/lustre/scripts/version_tag.pl
 -            $kernver = $1;
 -            last;
 -        }
-+    	while(defined($line = <$ver>)) {
-+        	$line =~ /\#define UTS_RELEASE "(.*)"/;
-+        	if ($1) {
-+            		$kernver = $1;
-+            		last;
-+        	}
-+    	}
-+    	$ver->close();
++	while(defined($line = <$ver>)) {
++    	    $line =~ /\#define UTS_RELEASE "(.*)"/;
++    	    if ($1) {
++        	$kernver = $1;
++        	last;
++    	    }
++	}
++	$ver->close();
      }
 -    $ver->close();
      chomp($kernver);
      return $kernver;
  
+@@ -132,7 +134,7 @@
+ } else {
+     die("a tree status can only be determined in an source code control system checkout\n")
+         if ($progname eq "make_META.pl");
+-    require "version_tag-none.pl";
++    #require "version_tag-none.pl";
+ }
+ 
+ ($am_linuxdir, $am_linuxobjdir, $am_modules, $am_version, $local_version,
 @@ -143,6 +145,8 @@
  my $buildid = get_buildid();
  
  if ($progname eq "version_tag.pl") {
 +    chdir($cwd);
-+    chdir($ARGV[1]);
++    chdir($ARG[1]);
      my $kernver = "";
      $kernver = get_kernver($am_linuxdir, $am_linuxobjdir)
          if ($am_linuxdir ne "");

-- 
Lustre Debian Packaging