[Pkg-lustre-svn-commit] r386 - in /trunk/debian: changelog patches/00list patches/enable-quota.dpatch rules

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

Author: pwinnertz-guest
Date: Wed Nov 28 11:24:32 2007
New Revision: 386

URL: http://svn.debian.org/wsvn/pkg-lustre/?sc=1&rev=386
Log:
Prepare for 1.6.3-2 and enable binaries with quota

Added:
    trunk/debian/patches/enable-quota.dpatch
Modified:
    trunk/debian/changelog
    trunk/debian/patches/00list
    trunk/debian/rules

Modified: trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-lustre/trunk/debian/changelog?rev=386&op=diff
==============================================================================
--- trunk/debian/changelog (original)
+++ trunk/debian/changelog Wed Nov 28 11:24:32 2007
@@ -1,3 +1,11 @@
+lustre (1.6.3-2) unstable; urgency=low
+
+  * Add patch to remove fiemap.h from new_sources list
+  * Add some patches to make it work with etch again
+  * enable quota in binarys with a hack
+
+ -- Patrick Winnertz <patrick.winnertz at skolelinux.org>  Wed, 28 Nov 2007 12:24:35 +0100
+
 lustre (1.6.3-1) unstable; urgency=low
 
   [ Patrick Winnertz ]
@@ -13,7 +21,6 @@
   * Removed unneeded patches (this patches are included in the new release)
   * Include several patches from upstream bugzilla with some important fixes,
     which aren't addressed by the 1.6.3 release.
-  * Add patch to remove fiemap.h from new_sources list
 
   [ Noèl Köthe ]
   * adding author and date of debian/TODO

Modified: trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-lustre/trunk/debian/patches/00list?rev=386&op=diff
==============================================================================
--- trunk/debian/patches/00list (original)
+++ trunk/debian/patches/00list Wed Nov 28 11:24:32 2007
@@ -31,6 +31,5 @@
 autogen-run.dpatch
 fix-mballoc3corepatch.dpatch
 
-#Work needing patches
-#autogen-run.dpatch
-#quota-configure.dpatch
+#Quick hack to get quota working
+enable-quota.dpatch

Added: trunk/debian/patches/enable-quota.dpatch
URL: http://svn.debian.org/wsvn/pkg-lustre/trunk/debian/patches/enable-quota.dpatch?rev=386&op=file
==============================================================================
--- trunk/debian/patches/enable-quota.dpatch (added)
+++ trunk/debian/patches/enable-quota.dpatch Wed Nov 28 11:24:32 2007
@@ -1,0 +1,63 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: --enable-quota check was only run when building modules.
+
+ at DPATCH@
+--- ./configure	2004-12-20 00:06:24.000000000 +0100
++++ ./configure	2007-10-10 13:06:56.161232534 +0200
+@@ -5096,6 +5096,25 @@
+ fi
+ 
+ 
++{ echo "$as_me:$LINENO: checking whether to enable quota support" >&5
++echo $ECHO_N "checking whether to enable quota support... $ECHO_C" >&6; }
++# Check whether --enable-quota was given.
++if test "${enable_quota+set}" = set; then
++  enableval=$enable_quota;
++else
++  enable_quota='yes'
++fi
++
++{ echo "$as_me:$LINENO: result: $enable_quota" >&5
++echo "${ECHO_T}$enable_quota" >&6; }
++if test x$enable_quota != xno; then
++
++cat >>confdefs.h <<\_ACEOF
++#define HAVE_QUOTA_SUPPORT 1
++_ACEOF
++
++fi
++
+ { echo "$as_me:$LINENO: checking whether to build kernel modules" >&5
+ echo $ECHO_N "checking whether to build kernel modules... $ECHO_C" >&6; }
+ # Check whether --enable-modules was given.
+@@ -8315,28 +8334,6 @@
+ 
+ fi
+ 
+-{ echo "$as_me:$LINENO: checking whether to enable quota support" >&5
+-echo $ECHO_N "checking whether to enable quota support... $ECHO_C" >&6; }
+-# Check whether --enable-quota was given.
+-if test "${enable_quota+set}" = set; then
+-  enableval=$enable_quota;
+-else
+-  enable_quota='yes'
+-fi
+-
+-{ echo "$as_me:$LINENO: result: $enable_quota" >&5
+-echo "${ECHO_T}$enable_quota" >&6; }
+-if test x$linux25 != xyes; then
+-   enable_quota='no'
+-fi
+-if test x$enable_quota != xno; then
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_QUOTA_SUPPORT 1
+-_ACEOF
+-
+-fi
+-
+ { echo "$as_me:$LINENO: checking whether to enable a write with the health check" >&5
+ echo $ECHO_N "checking whether to enable a write with the health check... $ECHO_C" >&6; }
+ # Check whether --enable-health-write was given.

Modified: trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-lustre/trunk/debian/rules?rev=386&op=diff
==============================================================================
--- trunk/debian/rules (original)
+++ trunk/debian/rules Wed Nov 28 11:24:32 2007
@@ -57,6 +57,7 @@
 		   --enable-snmp \
 		   --disable-tests \
 		   --disable-client \
+		   --enable-quota \
 		   --disable-server  )
 	# Correct tex2pdf mode.
 	chmod 744 lustre/doc/tex2pdf