The following commit has been merged in the master branch:
commit 0a41133a3765df7b1f80acc6320d2d128e44db39
Author: Marco Nelles <marco.nel...@credativ.de>
Date:   Tue Jun 5 09:14:21 2012 +0200

    Removed ldiskfs-detect-2.6.20-2.6.22.patch

diff --git a/debian/patches/ldiskfs-detect-2.6.20-2.6.22.patch 
b/debian/patches/ldiskfs-detect-2.6.20-2.6.22.patch
deleted file mode 100644
index c8d08a6..0000000
--- a/debian/patches/ldiskfs-detect-2.6.20-2.6.22.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-## ldiskfs-detect-2.6.20-2.6.22.dpatch by Goswin von Brederlow 
<goswin-...@web.de>
-## DP: Patch from Q-Leap Networks modified by Patrick winnertz 
<patrick.winne...@credativ.de>
-
-Index: lustre/ldiskfs/configure.ac
-===================================================================
---- lustre.orig/ldiskfs/configure.ac   2011-08-05 11:10:05.195251849 +0200
-+++ lustre/ldiskfs/configure.ac        2011-08-05 11:11:19.987622721 +0200
-@@ -114,13 +114,18 @@
-                 else
-                       LDISKFS_SERIES="2.6-rhel5.series"
-                 fi
--      else
-+      else 
-+          if test -e $LINUX_OBJ/version.Debian; then
-+              LDISKFS_SERIES="2.6.18-debian.series"
-+          else
-               LDISKFS_SERIES="2.6.18-vanilla.series"
-+          fi
-       fi
-       ;;
- 2.6.22*) LDISKFS_SERIES="2.6.22-vanilla.series";;
-+2.6.26*) LDISKFS_SERIES="2.6.26-vanilla.series";;
- 2.6.27*) LDISKFS_SERIES="2.6-sles11.series";;
--2.6.32.*) LDISKFS_SERIES="2.6-sles11.series";;
-+2.6.32*) LDISKFS_SERIES="2.6-sles11.series";;
- *) AC_MSG_WARN([Unknown kernel version $LINUXRELEASE, fix 
ldiskfs/configure.ac])
- esac
- AC_MSG_RESULT([$LDISKFS_SERIES])
diff --git a/debian/patches/series b/debian/patches/series
index 5e09c49..723f159 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 posix-acl.patch
-#ldiskfs-detect-2.6.20-2.6.22.patch
 #no_default_debugging.patch
 no-darwin.patch
 #libsysio.patch

-- 
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

Reply via email to