[Pkg-lustre-svn-commit] updated: [632c4f6] Fix location of .pl script

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit 632c4f6173b05f009f2949ac56e316f2f1ba95ab
Author: Patrick Winnertz <winnie at debian.org>
Date:   Wed Aug 12 15:27:55 2009 +0200

    Fix location of .pl script
    
    Signed-off-by: Patrick Winnertz <winnie at debian.org>

diff --git a/debian/patches/version_tag-pl-path.dpatch b/debian/patches/version_tag-pl-path.dpatch
index 7e36bc8..7be0729 100755
--- a/debian/patches/version_tag-pl-path.dpatch
+++ b/debian/patches/version_tag-pl-path.dpatch
@@ -5,9 +5,21 @@
 ## DP: don't depend on utsrelease.h and version.h while building the modules
 
 @DPATCH@
+diff -urNad lustre~/lustre/autoMakefile.am lustre/lustre/autoMakefile.am
+--- lustre~/lustre/autoMakefile.am	2009-08-12 12:14:14.000000000 +0200
++++ lustre/lustre/autoMakefile.am	2009-08-12 15:27:31.000000000 +0200
+@@ -85,7 +85,7 @@
+ BUILD_VER_H=$(top_builddir)/lustre/include/lustre/lustre_build_version.h
+ 
+ lustre_build_version:
+-	perl $(top_builddir)/lustre/scripts/version_tag.pl $(top_srcdir) $(top_builddir) > tmpver
++	perl $(top_srcdir)/lustre/scripts/version_tag.pl $(top_srcdir) $(top_builddir) > tmpver
+ 	echo "#define LUSTRE_RELEASE @RELEASE@" >> tmpver
+ 	cmp -s $(BUILD_VER_H) tmpver > tmpdiff 2> /dev/null &&		\
+                 $(RM) tmpver tmpdiff ||					\
 diff -urNad lustre~/lustre/scripts/version_tag.pl lustre/lustre/scripts/version_tag.pl
 --- lustre~/lustre/scripts/version_tag.pl	2009-08-11 15:19:03.000000000 +0200
-+++ lustre/lustre/scripts/version_tag.pl	2009-08-12 15:17:47.000000000 +0200
++++ lustre/lustre/scripts/version_tag.pl	2009-08-12 15:26:58.000000000 +0200
 @@ -163,16 +163,18 @@
          !$ver->open("$objdir/include/linux/version.h") &&
          !$ver->open("$dir/include/linux/utsrelease.h") &&

-- 
Lustre Debian Packaging