The following commit has been merged in the master branch: commit f6bfb1d7ac9f874d90a441eaf30d2cdc56e7a47d Author: Marco Nelles <marco.nel...@credativ.de> Date: Fri Jun 1 12:17:33 2012 +0200
Adapted line offsets of fix-oot-builds.patch diff --git a/debian/patches/fix-oot-builds.patch b/debian/patches/fix-oot-builds.patch index 34a5efa..a756256 100644 --- a/debian/patches/fix-oot-builds.patch +++ b/debian/patches/fix-oot-builds.patch @@ -6,7 +6,7 @@ Index: lustre/build/autoconf/lustre-build.m4 =================================================================== --- lustre.orig/build/autoconf/lustre-build.m4 2011-12-02 13:55:25.637462571 +0100 +++ lustre/build/autoconf/lustre-build.m4 2011-12-02 13:56:45.649859332 +0100 -@@ -864,7 +864,7 @@ +@@ -685,7 +685,7 @@ CC="$CC -m64" fi @@ -19,7 +19,7 @@ Index: lustre/lustre/autoMakefile.am =================================================================== --- lustre.orig/lustre/autoMakefile.am 2011-12-02 13:55:25.637462571 +0100 +++ lustre/lustre/autoMakefile.am 2011-12-02 13:56:45.649859332 +0100 -@@ -85,7 +85,7 @@ +@@ -87,7 +87,7 @@ BUILD_VER_H=$(top_builddir)/lustre/include/lustre/lustre_build_version.h lustre_build_version: -- Lustre Debian Packaging _______________________________________________ Pkg-lustre-svn-commit mailing list Pkg-lustre-svn-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-lustre-svn-commit