[Pkg-lustre-svn-commit] r277 - /trunk/debian/patches/autogen.sh.dpatch

[goswin-guest at users.alioth.debian.org]

Author: goswin-guest
Date: Thu Sep  6 12:29:49 2007
New Revision: 277

URL: http://svn.debian.org/wsvn/pkg-lustre/?sc=1&rev=277
Log:
Remove backup file from patch


Modified:
    trunk/debian/patches/autogen.sh.dpatch

Modified: trunk/debian/patches/autogen.sh.dpatch
URL: http://svn.debian.org/wsvn/pkg-lustre/trunk/debian/patches/autogen.sh.dpatch?rev=277&op=diff
==============================================================================
--- trunk/debian/patches/autogen.sh.dpatch (original)
+++ trunk/debian/patches/autogen.sh.dpatch Thu Sep  6 12:29:49 2007
@@ -5,9 +5,9 @@
 ## DP: autogen.sh script from lustre upstream
 
 @DPATCH@
-diff -urNad lustre-1.6.1~/autogen.sh lustre-1.6.1/autogen.sh
---- lustre-1.6.1~/autogen.sh	1970-01-01 01:00:00.000000000 +0100
-+++ lustre-1.6.1/autogen.sh	2007-08-15 18:25:42.078366316 +0200
+diff -urNad lustre-1.6.2~/autogen.sh lustre-1.6.2/autogen.sh
+--- lustre-1.6.2~/autogen.sh	1970-01-01 01:00:00.000000000 +0100
++++ lustre-1.6.2/autogen.sh	2007-09-06 14:17:31.856256909 +0200
 @@ -0,0 +1,128 @@
 +#!/bin/bash
 +
@@ -137,124 +137,3 @@
 +#    sh autogen.sh
 +#    popd >/dev/null
 +#fi
-diff -urNad lustre-1.6.1~/autogen.sh~ lustre-1.6.1/autogen.sh~
---- lustre-1.6.1~/autogen.sh~	1970-01-01 01:00:00.000000000 +0100
-+++ lustre-1.6.1/autogen.sh~	2007-08-15 18:23:17.000000000 +0200
-@@ -0,0 +1,117 @@
-+#!/bin/bash
-+
-+# taken from gnome-common/macros2/autogen.sh
-+compare_versions() {
-+    ch_min_version=$1
-+    ch_actual_version=$2
-+    ch_status=0
-+    IFS="${IFS=         }"; ch_save_IFS="$IFS"; IFS="."
-+    set $ch_actual_version
-+    for ch_min in $ch_min_version; do
-+        ch_cur=`echo $1 | sed 's/[^0-9].*$//'`; shift # remove letter suffixes
-+        if [ -z "$ch_min" ]; then break; fi
-+        if [ -z "$ch_cur" ]; then ch_status=1; break; fi
-+        if [ $ch_cur -gt $ch_min ]; then break; fi
-+        if [ $ch_cur -lt $ch_min ]; then ch_status=1; break; fi
-+    done
-+    IFS="$ch_save_IFS"
-+    return $ch_status
-+}
-+
-+error_msg() {
-+	echo "$cmd is $1.  version $required is required to build Lustre."
-+
-+	if [ -e /usr/lib/autolustre/bin/$cmd ]; then
-+		cat >&2 <<-EOF
-+		You apparently already have Lustre-specific autoconf/make RPMs
-+		installed on your system at /usr/lib/autolustre/share/$cmd.
-+		Please set your PATH to point to those versions:
-+
-+		export PATH="/usr/lib/autolustre/bin:\$PATH"
-+		EOF
-+	else
-+		cat >&2 <<-EOF
-+		CFS provides RPMs which can be installed alongside your
-+		existing autoconf/make RPMs, if you are nervous about
-+		upgrading.  See
-+
-+		ftp://ftp.lustre.org/pub/other/autolustre/README.autolustre
-+
-+		You may be able to download newer version from:
-+
-+		http://ftp.gnu.org/gnu/$tool/$tool-$required.tar.gz
-+	EOF
-+	fi
-+	[ "$cmd" = "autoconf" -a "$required" = "2.57" ] && cat >&2 <<EOF
-+
-+or for RH9 systems you can use:
-+
-+ftp://fr2.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/autoconf-2.57-3.noarch.rpm
-+EOF
-+	[ "$cmd" = "automake-1.7" -a "$required" = "1.7.8" ] && cat >&2 <<EOF
-+
-+or for RH9 systems you can use:
-+
-+ftp://fr2.rpmfind.net/linux/fedora/core/1/i386/os/Fedora/RPMS/automake-1.7.8-1.noarch.rpm
-+EOF
-+	exit 1
-+}
-+
-+check_version() {
-+    local tool
-+    local cmd
-+    local required
-+    local version
-+
-+    tool=$1
-+    cmd=$2
-+    required=$3
-+    echo -n "checking for $cmd $required... "
-+    if ! $cmd --version >/dev/null ; then
-+	error_msg "missing"
-+    fi
-+    version=$($cmd --version | awk "/$tool \(GNU/ { print \$4 }")
-+    echo "found $version"
-+    if ! compare_versions "$required" "$version" ; then
-+	error_msg "too old"
-+    fi
-+}
-+
-+echo "Checking for a complete tree..."
-+# required directories
-+for dir in build lnet lustre ; do
-+    if [ ! -d "$dir" ] ; then
-+        pwd
-+	cat >&2 <<EOF
-+Your tree seems to be missing $dir.
-+Please read README.lustrecvs for details.
-+EOF
-+	exit 1
-+    fi
-+    ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I $PWD/$dir/autoconf"
-+done
-+# some are optional
-+for dir in snmp portals; do
-+    if [ -d "$dir" ] ; then
-+	ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I $PWD/$dir/autoconf"
-+    fi
-+done
-+
-+check_version automake automake-1.7 "1.7.8"
-+check_version autoconf autoconf "2.57"
-+
-+echo "Running aclocal-1.7 $ACLOCAL_FLAGS..."
-+aclocal-1.7 $ACLOCAL_FLAGS
-+echo "Running autoheader..."
-+autoheader
-+echo "Running automake-1.7..."
-+automake-1.7 -a -c
-+echo "Running autoconf..."
-+autoconf
-+
-+#if [ -d libsysio ] ; then
-+#    pushd libsysio >/dev/null
-+#    echo "Running autogen for libsysio..."
-+#    sh autogen.sh
-+#    popd >/dev/null
-+#fi