[Pkg-lustre-svn-commit] r403 - in /trunk/debian: changelog patches/lustre_config.dpatch rules

winnie at users.alioth.debian.org winnie at users.alioth.debian.org
Fri Dec 21 11:08:19 UTC 2007 

Author: winnie
Date: Fri Dec 21 11:08:19 2007
New Revision: 403

URL: http://svn.debian.org/wsvn/pkg-lustre/?sc=1&rev=403
Log:
Fixes #457287

Modified:
    trunk/debian/changelog
    trunk/debian/patches/lustre_config.dpatch
    trunk/debian/rules

Modified: trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-lustre/trunk/debian/changelog?rev=403&op=diff
==============================================================================
--- trunk/debian/changelog (original)
+++ trunk/debian/changelog Fri Dec 21 11:08:19 2007
@@ -23,9 +23,10 @@
         - tex2pdf.dpatch
   * Add new patch in order to fix the lustre manpage provided by upstream
     (fix-lustre-manpage.dpatch)
-  * Removed obsolete target from debian/rules 
-
- -- Patrick Winnertz <winnie at debian.org>  Fri, 21 Dec 2007 11:45:26 +0100
+  * Removed obsolete target from debian/rules
+  * Fixed path issue of lc_common (lc_common in wrong path) Closes: #457287) 
+
+ -- Patrick Winnertz <winnie at debian.org>  Fri, 21 Dec 2007 12:10:10 +0100
 
 lustre (1.6.3-2) unstable; urgency=low
 

Modified: trunk/debian/patches/lustre_config.dpatch
URL: http://svn.debian.org/wsvn/pkg-lustre/trunk/debian/patches/lustre_config.dpatch?rev=403&op=diff
==============================================================================
--- trunk/debian/patches/lustre_config.dpatch (original)
+++ trunk/debian/patches/lustre_config.dpatch Fri Dec 21 11:08:19 2007
@@ -5,10 +5,82 @@
 ## DP: Hard coded path to lc_common... not the best solution, but a solution
 
 @DPATCH@
-diff -urNad lustre-1.6.2~/lustre/scripts/lustre_config.in lustre-1.6.2/lustre/scripts/lustre_config.in
---- lustre-1.6.2~/lustre/scripts/lustre_config.in	2004-12-20 00:06:24.000000000 +0100
-+++ lustre-1.6.2/lustre/scripts/lustre_config.in	2007-09-19 11:49:34.000000000 +0200
-@@ -228,7 +228,7 @@
+diff -urNad lustre-1.6.4.1~/lustre/scripts/lc_cluman.in lustre-1.6.4.1/lustre/scripts/lc_cluman.in
+--- lustre-1.6.4.1~/lustre/scripts/lc_cluman.in	2007-03-23 03:31:10.000000000 +0100
++++ lustre-1.6.4.1/lustre/scripts/lc_cluman.in	2007-12-21 12:04:45.000000000 +0100
+@@ -38,7 +38,7 @@
+ }
+ 
+ # Get the library of functions
+-. @scriptlibdir@/lc_common
++. /usr/share/lustre/lc_common
+ 
+ #****************************** Global variables ******************************#
+ TMP_DIR=${CLUMGR_TMP_DIR}		# Temporary directory
+diff -urNad lustre-1.6.4.1~/lustre/scripts/lc_hb.in lustre-1.6.4.1/lustre/scripts/lc_hb.in
+--- lustre-1.6.4.1~/lustre/scripts/lc_hb.in	2007-03-23 03:31:10.000000000 +0100
++++ lustre-1.6.4.1/lustre/scripts/lc_hb.in	2007-12-21 12:04:58.000000000 +0100
+@@ -31,7 +31,7 @@
+ }
+ 
+ # Get the library of functions
+-. @scriptlibdir@/lc_common
++. /usr/share/lustre/lc_common
+ 
+ #****************************** Global variables ******************************#
+ # Heartbeat tools
+diff -urNad lustre-1.6.4.1~/lustre/scripts/lc_lvm.in lustre-1.6.4.1/lustre/scripts/lc_lvm.in
+--- lustre-1.6.4.1~/lustre/scripts/lc_lvm.in	2007-03-23 03:31:10.000000000 +0100
++++ lustre-1.6.4.1/lustre/scripts/lc_lvm.in	2007-12-21 12:05:15.000000000 +0100
+@@ -118,7 +118,7 @@
+ }
+ 
+ # Get the library of functions
+-. @scriptlibdir@/lc_common
++. /usr/share/lustre/lc_common
+ 
+ #***************************** Global variables *****************************#
+ # All the LVM device items in the csv file
+diff -urNad lustre-1.6.4.1~/lustre/scripts/lc_md.in lustre-1.6.4.1/lustre/scripts/lc_md.in
+--- lustre-1.6.4.1~/lustre/scripts/lc_md.in	2007-06-09 09:09:09.000000000 +0200
++++ lustre-1.6.4.1/lustre/scripts/lc_md.in	2007-12-21 12:05:31.000000000 +0100
+@@ -70,7 +70,7 @@
+ }
+ 
+ # Get the library of functions
+-. @scriptlibdir@/lc_common
++. /usr/share/lustre/lc_common
+ 
+ #***************************** Global variables *****************************#
+ # All the MD device items in the csv file
+diff -urNad lustre-1.6.4.1~/lustre/scripts/lc_modprobe.in lustre-1.6.4.1/lustre/scripts/lc_modprobe.in
+--- lustre-1.6.4.1~/lustre/scripts/lc_modprobe.in	2007-03-23 03:31:10.000000000 +0100
++++ lustre-1.6.4.1/lustre/scripts/lc_modprobe.in	2007-12-21 12:05:50.000000000 +0100
+@@ -6,7 +6,7 @@
+ #################################################################################
+ 
+ # Get the library of functions
+-. @scriptlibdir@/lc_common
++. /usr/share/lustre/lc_common
+ 
+ # Check the kernel version
+ KERNEL_VERSION=`uname -r`
+diff -urNad lustre-1.6.4.1~/lustre/scripts/lc_net.in lustre-1.6.4.1/lustre/scripts/lc_net.in
+--- lustre-1.6.4.1~/lustre/scripts/lc_net.in	2007-03-23 03:31:10.000000000 +0100
++++ lustre-1.6.4.1/lustre/scripts/lc_net.in	2007-12-21 12:06:06.000000000 +0100
+@@ -27,7 +27,7 @@
+ }
+ 
+ # Get the library of functions
+-. @scriptlibdir@/lc_common
++. /usr/share/lustre/lc_common
+ 
+ VERBOSE_OUTPUT=false
+ # Get and check the positional parameters
+diff -urNad lustre-1.6.4.1~/lustre/scripts/lustre_config.in lustre-1.6.4.1/lustre/scripts/lustre_config.in
+--- lustre-1.6.4.1~/lustre/scripts/lustre_config.in	2007-10-14 06:33:14.000000000 +0200
++++ lustre-1.6.4.1/lustre/scripts/lustre_config.in	2007-12-21 12:04:25.000000000 +0100
+@@ -230,7 +230,7 @@
  }
  
  # Get the library of functions
@@ -17,3 +89,15 @@
  
  #***************************** Global variables *****************************#
  declare -a MGS_NODENAME             # node names of the MGS servers
+diff -urNad lustre-1.6.4.1~/lustre/scripts/lustre_createcsv.in lustre-1.6.4.1/lustre/scripts/lustre_createcsv.in
+--- lustre-1.6.4.1~/lustre/scripts/lustre_createcsv.in	2007-10-14 06:33:14.000000000 +0200
++++ lustre-1.6.4.1/lustre/scripts/lustre_createcsv.in	2007-12-21 12:06:43.000000000 +0100
+@@ -37,7 +37,7 @@
+ }
+ 
+ # Get the library of functions
+-. @scriptlibdir@/lc_common
++. /usr/share/lustre/lc_common
+ 
+ #**************************** Global variables ****************************#
+ # csv file

Modified: trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-lustre/trunk/debian/rules?rev=403&op=diff
==============================================================================
--- trunk/debian/rules (original)
+++ trunk/debian/rules Fri Dec 21 11:08:19 2007
@@ -58,7 +58,7 @@
 		   --disable-tests \
 		   --disable-client \
 		   --enable-quota \
-		   --disable-server  )
+		   --disable-server )
 	# Correct tex2pdf mode.
 	chmod 744 lustre/doc/tex2pdf
 	touch $@

More information about the Pkg-lustre-svn-commit mailing list