The following commit has been merged in the master branch:
commit 6dcac553847b688d37ed7f3e906fe8316e33d5ab
Author: Patrick Winnertz <win...@debian.org>
Date:   Wed Mar 3 14:56:38 2010 +0100

    Remove patches as they aren't needed with 1.8.2:
     -2.6.21-mds-orphan_link
     -lustre-snmp-missing-include
     -lnet-missing-prototypes
     -fix_various_typecasts
     -build-fixes-for_2.6.18_servers
     -autogen-run.dpatch
     -remove-set_tunables
     -OST_read_cache_data_corruption
    
    Updated patches which didn't apply cleanly:
     -fix_oot_builds
    
    Signed-off-by: Patrick Winnertz <win...@debian.org>

diff --git a/debian/patches/00list b/debian/patches/00list
index 701436a..b12e84d 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -2,12 +2,12 @@
 page-size-undef-fixes.dpatch
 inode-no-i_blksize-2.6.20.dpatch
 posix_acl.dpatch
-2.6.21-mds-orphan_link.dpatch
+#2.6.21-mds-orphan_link.dpatch
 ldiskfs-detect-2.6.20-2.6.22.dpatch
 no_default_debugging.dpatch
 autogen.sh.dpatch
 no-darwin.dpatch
-remove-set_tunables.dpatch
+#remove-set_tunables.dpatch
 libsysio.dpatch
 bug12769-ql-fix.dpatch
 # Debian patches
@@ -22,11 +22,9 @@ enable-quota.dpatch
 fix-symlink-attack.dpatch
 use_bash_instead_of_sh.dpatch
 #hotfixes for 1.8.1:
-lustre-snmp-missing-include.dpatch
+#lustre-snmp-missing-include.dpatch
 fix-oot-builds.dpatch
-lnet-missing-prototypes.dpatch
-fix_various_typecasts.dpatch
-build-fixes-for_2.6.18_servers.dpatch
-autogen-run.dpatch
-##obsolete with 1.8.1.1
-OST_read_cache_data_corruption.dpatch
+#lnet-missing-prototypes.dpatch
+#fix_various_typecasts.dpatch
+#build-fixes-for_2.6.18_servers.dpatch
+#autogen-run.dpatch
diff --git a/debian/patches/fix-oot-builds.dpatch 
b/debian/patches/fix-oot-builds.dpatch
index 787246a..0558b00 100755
--- a/debian/patches/fix-oot-builds.dpatch
+++ b/debian/patches/fix-oot-builds.dpatch
@@ -6,10 +6,10 @@
 ## DP: out of tree builds.
 
 @DPATCH@
-diff -urNad lustre~/build/autoconf/lustre-build.m4 
lustre/build/autoconf/lustre-build.m4
---- lustre~/build/autoconf/lustre-build.m4     2009-08-12 10:52:19.000000000 
+0200
-+++ lustre/build/autoconf/lustre-build.m4      2009-08-12 11:18:12.000000000 
+0200
-@@ -764,7 +764,7 @@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
lustre~/build/autoconf/lustre-build.m4 lustre/build/autoconf/lustre-build.m4
+--- lustre~/build/autoconf/lustre-build.m4     2010-03-03 14:44:38.000000000 
+0100
++++ lustre/build/autoconf/lustre-build.m4      2010-03-03 16:30:38.704635051 
+0100
+@@ -816,7 +816,7 @@
        CC="$CC -m64"
  fi
  
@@ -18,9 +18,9 @@ diff -urNad lustre~/build/autoconf/lustre-build.m4 
lustre/build/autoconf/lustre-
  
  LLCPPFLAGS="-D__arch_lib__ -D_LARGEFILE64_SOURCE=1"
  AC_SUBST(LLCPPFLAGS)
-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
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
lustre~/lustre/autoMakefile.am lustre/lustre/autoMakefile.am
+--- lustre~/lustre/autoMakefile.am     2010-01-23 03:07:58.000000000 +0100
++++ lustre/lustre/autoMakefile.am      2010-03-03 16:30:38.704635051 +0100
 @@ -85,7 +85,7 @@
  BUILD_VER_H=$(top_builddir)/lustre/include/lustre/lustre_build_version.h
  
@@ -30,15 +30,19 @@ diff -urNad lustre~/lustre/autoMakefile.am 
lustre/lustre/autoMakefile.am
        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:26:58.000000000 
+0200
-@@ -163,16 +163,18 @@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
lustre~/lustre/scripts/version_tag.pl lustre/lustre/scripts/version_tag.pl
+--- lustre~/lustre/scripts/version_tag.pl      2010-03-03 14:44:38.000000000 
+0100
++++ lustre/lustre/scripts/version_tag.pl       2010-03-03 16:33:54.136665590 
+0100
+@@ -166,17 +166,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";
 -        }
++            #die "Run make dep on '$dir'\n";
++          $kernver = "UNKOWN-KERNEL";
++        } else {
+ 
 -    while(defined($line = <$ver>)) {
 -        $line =~ /\#define UTS_RELEASE "(.*)"/;
 -        if ($1) {
@@ -47,22 +51,19 @@ diff -urNad lustre~/lustre/scripts/version_tag.pl 
lustre/lustre/scripts/version_
 -        }
 -    }
 -    $ver->close();
-+            #die "Run make dep on $dir\n";
-+            $kernver = "UNKNOWN-KERNEL";
-+        } else {
-+            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();
++      }
      chomp($kernver);
      $dir =~ s/\//\./g;
      return $dir;
-@@ -243,6 +245,8 @@
+@@ -254,6 +256,8 @@
      if (!defined($ENV{LUSTRE_VERS}));
  
  if ($progname eq "version_tag.pl") {
diff --git a/debian/patches/no-darwin.dpatch b/debian/patches/no-darwin.dpatch
index 7003153..3652a65 100755
--- a/debian/patches/no-darwin.dpatch
+++ b/debian/patches/no-darwin.dpatch
@@ -6,21 +6,72 @@
 ## DP: Remove darwin subdirs from autoMakefile.am files
 
 @DPATCH@
-diff -urNad lustre~/autoMakefile.am lustre/autoMakefile.am
---- lustre~/autoMakefile.am    2009-08-11 12:37:07.000000000 +0200
-+++ lustre/autoMakefile.am     2009-08-11 14:09:04.000000000 +0200
-@@ -3,7 +3,7 @@
- SOURCES_SUBDIRS := @LDISKFS_SUBDIR@ @LIBCFS_SUBDIR@ lnet lustre
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
lustre-1.8.2~/autoMakefile.am lustre-1.8.2/autoMakefile.am
+--- lustre-1.8.2~/autoMakefile.am      2010-03-03 13:43:00.000000000 +0000
++++ lustre-1.8.2/autoMakefile.am       2010-03-03 14:02:31.579839504 +0000
+@@ -4,7 +4,7 @@
  RPM_SUBDIRS := @LDISKFS_SUBDIR@ @LUSTREIOKIT_SUBDIR@
  if LDISKFS_ENABLED
+ if !LDISKFS_IN_KERNEL
 -EXTRA_SOURCES := @SYMVERFILE@
 +#EXTRA_SOURCES := @SYMVERFILE@
  endif
+ endif
  
- include build/autoMakefile.am.toplevel
-diff -urNad lustre~/lnet/include/libcfs/Makefile.am 
lustre/lnet/include/libcfs/Makefile.am
---- lustre~/lnet/include/libcfs/Makefile.am    2007-11-29 15:13:28.000000000 
+0100
-+++ lustre/lnet/include/libcfs/Makefile.am     2009-08-11 14:09:04.000000000 
+0200
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
lustre-1.8.2~/autoMakefile.am.~1~ lustre-1.8.2/autoMakefile.am.~1~
+--- lustre-1.8.2~/autoMakefile.am.~1~  1970-01-01 00:00:00.000000000 +0000
++++ lustre-1.8.2/autoMakefile.am.~1~   2010-03-03 13:43:00.000000000 +0000
+@@ -0,0 +1,47 @@
++SUBDIRS := @LDISKFS_SUBDIR@ @SPL_SUBDIR@ @ZFS_SUBDIR@ . @LIBSYSIO_SUBDIR@ 
@SNMP_SUBDIR@ @LUSTREIOKIT_SUBDIR@ @LIBCFS_SUBDIR@ lnet lustre
++DIST_SUBDIRS := @SNMP_DIST_SUBDIR@ libsysio ldiskfs @LUSTREIOKIT_SUBDIR@ 
@LIBCFS_SUBDIR@ lnet lustre 
++SOURCES_SUBDIRS := @LDISKFS_SUBDIR@ @LIBCFS_SUBDIR@ lnet lustre
++RPM_SUBDIRS := @LDISKFS_SUBDIR@ @LUSTREIOKIT_SUBDIR@
++if LDISKFS_ENABLED
++if !LDISKFS_IN_KERNEL
++EXTRA_SOURCES := @SYMVERFILE@
++endif
++endif
++
++include build/autoMakefile.am.toplevel
++
++EXTRA_DIST += config.h.in debian/*
++
++if LDISKFS_ENABLED
++if !LDISKFS_IN_KERNEL
+...@symverfile@: @LDISKFS_DIR@/@SYMVERFILE@
++      touch @SYMVERFILE@
++      -grep -v ldiskfs @SYMVERFILE@ > @symverf...@.old
++      cat @symverf...@.old @LDISKFS_DIR@/@SYMVERFILE@ > @SYMVERFILE@
++endif
++endif
++
++CSTK=/tmp/checkstack
++CSTKO=/tmp/checkstack.orig
++
++checkstack:
++      [ -f ${CSTK} -a ! -s ${CSTKO} ] && mv -f ${CSTK} ${CSTKO} || true
++      { for MOD in $$(find . -name "*.ko"); do                             \
++              objdump -d $$MOD | perl build/checkstack.pl;                 \
++        done } | grep -v " bug " | sort -nr | uniq > ${CSTK}
++      [ -f ${CSTKO} ] && ! diff -u ${CSTKO} ${CSTK} || head -30 ${CSTK}
++
++checkstack-update:
++      [ -f ${CSTK} ] && mv -f ${CSTK} ${CSTKO}
++
++checkstack-clean:
++      rm -f ${CSTK} ${CSTKO}
++
++module-dist-hook:
++      if [ -d CVS -o -d .git ]; then \
++          perl lustre/scripts/tree_status.pl > $(distdir)/tree_status; \
++      elif [ -f tree_status ]; then \
++          cp tree_status $(distdir)/tree_status; \
++      else \
++          echo -e "I have no idea how to create a tree_status file in 
$(distdir).\nPlease file a bug at http://bugzilla.lustre.org/";; \
++      fi
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
lustre-1.8.2~/lnet/include/libcfs/Makefile.am 
lustre-1.8.2/lnet/include/libcfs/Makefile.am
+--- lustre-1.8.2~/lnet/include/libcfs/Makefile.am      2010-03-03 
14:01:34.000000000 +0000
++++ lustre-1.8.2/lnet/include/libcfs/Makefile.am       2010-03-03 
14:01:38.748634013 +0000
 @@ -1,7 +1,7 @@
  SUBDIRS := linux
 -if DARWIN
@@ -32,9 +83,9 @@ diff -urNad lustre~/lnet/include/libcfs/Makefile.am 
lustre/lnet/include/libcfs/M
  DIST_SUBDIRS := $(SUBDIRS)
  
  EXTRA_DIST := curproc.h kp30.h libcfs.h list.h lltrace.h \
-diff -urNad lustre~/lnet/include/lnet/Makefile.am 
lustre/lnet/include/lnet/Makefile.am
---- lustre~/lnet/include/lnet/Makefile.am      2008-11-20 16:14:28.000000000 
+0100
-+++ lustre/lnet/include/lnet/Makefile.am       2009-08-11 14:09:04.000000000 
+0200
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
lustre-1.8.2~/lnet/include/lnet/Makefile.am 
lustre-1.8.2/lnet/include/lnet/Makefile.am
+--- lustre-1.8.2~/lnet/include/lnet/Makefile.am        2010-03-03 
14:01:34.000000000 +0000
++++ lustre-1.8.2/lnet/include/lnet/Makefile.am 2010-03-03 14:01:38.748634013 
+0000
 @@ -1,9 +1,9 @@
  lnetdir=$(includedir)/lnet
  
@@ -48,9 +99,9 @@ diff -urNad lustre~/lnet/include/lnet/Makefile.am 
lustre/lnet/include/lnet/Makef
  DIST_SUBDIRS := $(SUBDIRS)
  
  EXTRA_DIST = api.h api-support.h \
-diff -urNad lustre~/lnet/klnds/socklnd/autoMakefile.am 
lustre/lnet/klnds/socklnd/autoMakefile.am
---- lustre~/lnet/klnds/socklnd/autoMakefile.am 2009-08-11 12:37:07.000000000 
+0200
-+++ lustre/lnet/klnds/socklnd/autoMakefile.am  2009-08-11 14:11:04.000000000 
+0200
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
lustre-1.8.2~/lnet/klnds/socklnd/autoMakefile.am 
lustre-1.8.2/lnet/klnds/socklnd/autoMakefile.am
+--- lustre-1.8.2~/lnet/klnds/socklnd/autoMakefile.am   2010-03-03 
14:01:34.000000000 +0000
++++ lustre-1.8.2/lnet/klnds/socklnd/autoMakefile.am    2010-03-03 
14:01:38.748634013 +0000
 @@ -6,21 +6,21 @@
  endif # LINUX
  endif # MODULES
@@ -87,9 +138,9 @@ diff -urNad lustre~/lnet/klnds/socklnd/autoMakefile.am 
lustre/lnet/klnds/socklnd
  
  install-data-hook: $(install_data_hook)
  
-diff -urNad lustre~/lnet/libcfs/autoMakefile.am 
lustre/lnet/libcfs/autoMakefile.am
---- lustre~/lnet/libcfs/autoMakefile.am        2009-08-11 12:37:07.000000000 
+0200
-+++ lustre/lnet/libcfs/autoMakefile.am 2009-08-11 14:09:04.000000000 +0200
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
lustre-1.8.2~/lnet/libcfs/autoMakefile.am 
lustre-1.8.2/lnet/libcfs/autoMakefile.am
+--- lustre-1.8.2~/lnet/libcfs/autoMakefile.am  2010-03-03 14:01:34.000000000 
+0000
++++ lustre-1.8.2/lnet/libcfs/autoMakefile.am   2010-03-03 14:01:38.748634013 
+0000
 @@ -35,9 +35,9 @@
  #
  
@@ -148,9 +199,9 @@ diff -urNad lustre~/lnet/libcfs/autoMakefile.am 
lustre/lnet/libcfs/autoMakefile.
  
  endif
  
-diff -urNad lustre~/lnet/lnet/autoMakefile.am lustre/lnet/lnet/autoMakefile.am
---- lustre~/lnet/lnet/autoMakefile.am  2009-08-11 12:37:07.000000000 +0200
-+++ lustre/lnet/lnet/autoMakefile.am   2009-08-11 14:09:04.000000000 +0200
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
lustre-1.8.2~/lnet/lnet/autoMakefile.am lustre-1.8.2/lnet/lnet/autoMakefile.am
+--- lustre-1.8.2~/lnet/lnet/autoMakefile.am    2010-03-03 14:01:34.000000000 
+0000
++++ lustre-1.8.2/lnet/lnet/autoMakefile.am     2010-03-03 14:01:38.748634013 
+0000
 @@ -18,23 +18,23 @@
  modulenet_DATA = lnet$(KMODEXT)
  endif # LINUX
@@ -192,9 +243,9 @@ diff -urNad lustre~/lnet/lnet/autoMakefile.am 
lustre/lnet/lnet/autoMakefile.am
  
  endif # MODULES
  
-diff -urNad lustre~/lustre/lov/autoMakefile.am 
lustre/lustre/lov/autoMakefile.am
---- lustre~/lustre/lov/autoMakefile.am 2009-08-11 12:37:07.000000000 +0200
-+++ lustre/lustre/lov/autoMakefile.am  2009-08-11 14:09:04.000000000 +0200
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
lustre-1.8.2~/lustre/lov/autoMakefile.am lustre-1.8.2/lustre/lov/autoMakefile.am
+--- lustre-1.8.2~/lustre/lov/autoMakefile.am   2010-03-03 14:01:34.000000000 
+0000
++++ lustre-1.8.2/lustre/lov/autoMakefile.am    2010-03-03 14:01:38.748634013 
+0000
 @@ -46,29 +46,29 @@
  modulefs_DATA = lov$(KMODEXT)
  endif
@@ -243,91 +294,9 @@ diff -urNad lustre~/lustre/lov/autoMakefile.am 
lustre/lustre/lov/autoMakefile.am
  
  endif # MODULES
  
-diff -urNad lustre~/lustre/lov/autoMakefile.am~ 
lustre/lustre/lov/autoMakefile.am~
---- lustre~/lustre/lov/autoMakefile.am~        1970-01-01 01:00:00.000000000 
+0100
-+++ lustre/lustre/lov/autoMakefile.am~ 2009-08-11 14:09:04.000000000 +0200
-@@ -0,0 +1,78 @@
-+#
-+# GPL HEADER START
-+#
-+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+#
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License version 2 only,
-+# as published by the Free Software Foundation.
-+#
-+# This program is distributed in the hope that it will be useful, but
-+# WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+# General Public License version 2 for more details (a copy is included
-+# in the LICENSE file that accompanied this code).
-+#
-+# You should have received a copy of the GNU General Public License
-+# version 2 along with this program; If not, see
-+# http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
-+#
-+# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-+# CA 95054 USA or visit www.sun.com if you need additional information or
-+# have any questions.
-+#
-+# GPL HEADER END
-+#
-+
-+#
-+# Copyright  2008 Sun Microsystems, Inc. All rights reserved
-+# Use is subject to license terms.
-+#
-+
-+#
-+# This file is part of Lustre, http://www.lustre.org/
-+# Lustre is a trademark of Sun Microsystems, Inc.
-+#
-+
-+if LIBLUSTRE
-+noinst_LIBRARIES = liblov.a
-+liblov_a_SOURCES = lov_log.c lov_pool.c lov_obd.c lov_pack.c lov_request.c 
lov_offset.c lov_qos.c lov_merge.c lov_ea.c lov_internal.h
-+liblov_a_CPPFLAGS = $(LLCPPFLAGS)
-+liblov_a_CFLAGS = $(LLCFLAGS)
-+endif
-+
-+if MODULES
-+if LINUX
-+modulefs_DATA = lov$(KMODEXT)
-+endif
-+
-+if DARWIN
-+macos_PROGRAMS := lov
-+
-+lov_SOURCES :=          \
-+        lov_log.c       \
-+      lov_pool.c      \
-+        lov_obd.c       \
-+        lov_pack.c      \
-+        lov_request.c   \
-+        lov_merge.c     \
-+        lov_qos.c       \
-+        lov_offset.c    \
-+        lov_internal.h
-+
-+lov_CFLAGS := $(EXTRA_KCFLAGS)
-+lov_LDFLAGS := $(EXTRA_KLDFLAGS)
-+lov_LDADD := $(EXTRA_KLIBS)
-+
-+plist_DATA := Info.plist
-+
-+install_data_hook := fix-kext-ownership
-+
-+endif # DARWIN
-+
-+endif # MODULES
-+
-+install-data-hook: $(install_data_hook)
-+
-+DIST_SOURCES = $(lov-objs:.o=.c) lov_internal.h
-+MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ 
-diff -urNad lustre~/lustre/lvfs/autoMakefile.am 
lustre/lustre/lvfs/autoMakefile.am
---- lustre~/lustre/lvfs/autoMakefile.am        2009-08-11 12:37:07.000000000 
+0200
-+++ lustre/lustre/lvfs/autoMakefile.am 2009-08-11 14:09:04.000000000 +0200
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
lustre-1.8.2~/lustre/lvfs/autoMakefile.am 
lustre-1.8.2/lustre/lvfs/autoMakefile.am
+--- lustre-1.8.2~/lustre/lvfs/autoMakefile.am  2010-03-03 14:01:34.000000000 
+0000
++++ lustre-1.8.2/lustre/lvfs/autoMakefile.am   2010-03-03 14:01:38.752633824 
+0000
 @@ -85,21 +85,21 @@
  
  endif # LINUX
@@ -365,9 +334,9 @@ diff -urNad lustre~/lustre/lvfs/autoMakefile.am 
lustre/lustre/lvfs/autoMakefile.
  
  else # MODULES
  
-diff -urNad lustre~/lustre/obdclass/autoMakefile.am 
lustre/lustre/obdclass/autoMakefile.am
---- lustre~/lustre/obdclass/autoMakefile.am    2009-08-11 12:37:07.000000000 
+0200
-+++ lustre/lustre/obdclass/autoMakefile.am     2009-08-11 14:09:04.000000000 
+0200
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
lustre-1.8.2~/lustre/obdclass/autoMakefile.am 
lustre-1.8.2/lustre/obdclass/autoMakefile.am
+--- lustre-1.8.2~/lustre/obdclass/autoMakefile.am      2010-03-03 
14:01:34.000000000 +0000
++++ lustre-1.8.2/lustre/obdclass/autoMakefile.am       2010-03-03 
14:01:38.752633824 +0000
 @@ -1,7 +1,7 @@
  SUBDIRS := linux
 -if DARWIN
@@ -424,9 +393,9 @@ diff -urNad lustre~/lustre/obdclass/autoMakefile.am 
lustre/lustre/obdclass/autoM
  
  endif # MODULES
  
-diff -urNad lustre~/lustre/obdecho/autoMakefile.am 
lustre/lustre/obdecho/autoMakefile.am
---- lustre~/lustre/obdecho/autoMakefile.am     2009-08-11 12:37:07.000000000 
+0200
-+++ lustre/lustre/obdecho/autoMakefile.am      2009-08-11 14:09:04.000000000 
+0200
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
lustre-1.8.2~/lustre/obdecho/autoMakefile.am 
lustre-1.8.2/lustre/obdecho/autoMakefile.am
+--- lustre-1.8.2~/lustre/obdecho/autoMakefile.am       2010-03-03 
14:01:34.000000000 +0000
++++ lustre-1.8.2/lustre/obdecho/autoMakefile.am        2010-03-03 
14:01:38.752633824 +0000
 @@ -46,22 +46,22 @@
  modulefs_DATA = obdecho$(KMODEXT)
  endif
@@ -466,9 +435,9 @@ diff -urNad lustre~/lustre/obdecho/autoMakefile.am 
lustre/lustre/obdecho/autoMak
  
  endif # MODULES
  
-diff -urNad lustre~/lustre/osc/autoMakefile.am 
lustre/lustre/osc/autoMakefile.am
---- lustre~/lustre/osc/autoMakefile.am 2009-08-11 12:37:07.000000000 +0200
-+++ lustre/lustre/osc/autoMakefile.am  2009-08-11 14:09:04.000000000 +0200
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
lustre-1.8.2~/lustre/osc/autoMakefile.am lustre-1.8.2/lustre/osc/autoMakefile.am
+--- lustre-1.8.2~/lustre/osc/autoMakefile.am   2010-03-03 14:01:34.000000000 
+0000
++++ lustre-1.8.2/lustre/osc/autoMakefile.am    2010-03-03 14:01:38.752633824 
+0000
 @@ -47,22 +47,22 @@
  modulefs_DATA = osc$(KMODEXT)
  endif
@@ -508,9 +477,9 @@ diff -urNad lustre~/lustre/osc/autoMakefile.am 
lustre/lustre/osc/autoMakefile.am
  
  endif
  
-diff -urNad lustre~/lustre/ptlrpc/autoMakefile.am 
lustre/lustre/ptlrpc/autoMakefile.am
---- lustre~/lustre/ptlrpc/autoMakefile.am      2009-08-11 12:37:07.000000000 
+0200
-+++ lustre/lustre/ptlrpc/autoMakefile.am       2009-08-11 14:09:04.000000000 
+0200
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
lustre-1.8.2~/lustre/ptlrpc/autoMakefile.am 
lustre-1.8.2/lustre/ptlrpc/autoMakefile.am
+--- lustre-1.8.2~/lustre/ptlrpc/autoMakefile.am        2010-03-03 
14:01:34.000000000 +0000
++++ lustre-1.8.2/lustre/ptlrpc/autoMakefile.am 2010-03-03 14:01:38.752633824 
+0000
 @@ -68,39 +68,39 @@
  modulefs_DATA = ptlrpc$(KMODEXT)
  endif #LINUX
diff --git a/debian/rules b/debian/rules
index 9de8d67..b055a15 100755
--- a/debian/rules
+++ b/debian/rules
@@ -52,7 +52,7 @@ autogen-stamp: patch-stamp
        cp /usr/share/misc/config.guess config.guess
        cp /usr/share/misc/config.guess libsysio/config.guess
        cp /usr/share/misc/config.guess ldiskfs/config.guess
-       #sh ./autogen.sh
+       sh ./autogen.sh
        touch $@
 
 configure: configure-stamp

-- 
Lustre Debian Packaging 

_______________________________________________
Pkg-lustre-svn-commit mailing list
Pkg-lustre-svn-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-lustre-svn-commit

Reply via email to