Author: winnie
Date: Tue Mar 25 13:05:10 2008
New Revision: 464

URL: http://svn.debian.org/wsvn/pkg-lustre/?sc=1&rev=464
Log:
Add first patches to make lmt working on a debian platform

Added:
    utils/lmt/trunk/debian/patches/
    utils/lmt/trunk/debian/patches/00list   (with props)
    utils/lmt/trunk/debian/patches/lwatch-lustre-fix_pathnames.dpatch   (with 
props)
Modified:
    utils/lmt/trunk/debian/control
    utils/lmt/trunk/debian/rules

Modified: utils/lmt/trunk/debian/control
URL: 
http://svn.debian.org/wsvn/pkg-lustre/utils/lmt/trunk/debian/control?rev=464&op=diff
==============================================================================
--- utils/lmt/trunk/debian/control (original)
+++ utils/lmt/trunk/debian/control Tue Mar 25 13:05:10 2008
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer:  Debian Lustre Packaging team <[EMAIL PROTECTED]>
 Uploaders: Patrick Winnertz <[EMAIL PROTECTED]>, Noel Köthe <[EMAIL 
PROTECTED]>,  Goswin von Brederlow <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 5), ant, ant-optional, libncursesw5-dev, 
sun-java6-jdk, python-all-dev, python-support (>= 0.3)
+Build-Depends: debhelper (>= 5), ant, ant-optional, libncursesw5-dev, 
sun-java6-jdk, python-support (>= 0.3), dpatch
 Standards-Version: 3.7.3
 Homepage: http://sourceforge.net/projects/lmt/
 
@@ -15,16 +15,16 @@
 
 
 Package: lmt-server
-Architecture: i386 amd64
+Architecture: any
 XB-Python-Version: ${python:Versions}
 Provides: ${python:Provides}
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, ${perl:Depends}
 Description: lustre monitoring tool - collect daemon
  Some description here...
 
 
 Package: lmt-server-agent
-Architecture: i386 amd64
+Architecture: any
 XB-Python-Version: ${python:Versions}
 Provides: ${python:Provides}
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}

Added: utils/lmt/trunk/debian/patches/00list
URL: 
http://svn.debian.org/wsvn/pkg-lustre/utils/lmt/trunk/debian/patches/00list?rev=464&op=file
==============================================================================
--- utils/lmt/trunk/debian/patches/00list (added)
+++ utils/lmt/trunk/debian/patches/00list Tue Mar 25 13:05:10 2008
@@ -1,0 +1,1 @@
+lwatch-lustre-fix_pathnames.dpatch

Propchange: utils/lmt/trunk/debian/patches/00list
------------------------------------------------------------------------------
    svn:executable = *

Added: utils/lmt/trunk/debian/patches/lwatch-lustre-fix_pathnames.dpatch
URL: 
http://svn.debian.org/wsvn/pkg-lustre/utils/lmt/trunk/debian/patches/lwatch-lustre-fix_pathnames.dpatch?rev=464&op=file
==============================================================================
--- utils/lmt/trunk/debian/patches/lwatch-lustre-fix_pathnames.dpatch (added)
+++ utils/lmt/trunk/debian/patches/lwatch-lustre-fix_pathnames.dpatch Tue Mar 
25 13:05:10 2008
@@ -1,0 +1,58 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## lwatch-lustre-fix_pathnames.dpatch by Patrick Winnertz <[EMAIL PROTECTED]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix paths for debian
+
[EMAIL PROTECTED]@
+diff -urNad lmt-2.1.0~/client/java/gov/llnl/lustre/database/Database.java 
lmt-2.1.0/client/java/gov/llnl/lustre/database/Database.java
+--- lmt-2.1.0~/client/java/gov/llnl/lustre/database/Database.java      
2007-10-13 20:12:58.000000000 +0200
++++ lmt-2.1.0/client/java/gov/llnl/lustre/database/Database.java       
2008-03-25 13:56:52.000000000 +0100
+@@ -64,7 +64,7 @@
+   private static final boolean localDebug = 
Boolean.getBoolean("Database.debug");
+   private static final boolean debug = Boolean.getBoolean("debug") || 
localDebug;
+ 
+-  public static final String 
GLOBAL_LMTRC_FILE_NAME="/usr/share/lmt/etc/lmtrc";
++  public static final String GLOBAL_LMTRC_FILE_NAME="/etc/lmtrc";
+ 
+   public static final int ASC = 1;
+   public static final int DESC = 2;
+diff -urNad lmt-2.1.0~/client/scripts/lstat lmt-2.1.0/client/scripts/lstat
+--- lmt-2.1.0~/client/scripts/lstat    2007-10-13 20:12:59.000000000 +0200
++++ lmt-2.1.0/client/scripts/lstat     2008-03-25 13:56:26.000000000 +0100
+@@ -33,7 +33,7 @@
+ # Notes:
+ #======================================================================
+ 
+-LMT_JAR=/usr/share/lmt/lib/lmt-complete.jar
++LMT_JAR=/usr/lib/lmt/lmt-complete.jar
+ 
+ getjava()
+ {
+diff -urNad lmt-2.1.0~/client/scripts/ltop lmt-2.1.0/client/scripts/ltop
+--- lmt-2.1.0~/client/scripts/ltop     2007-10-13 20:12:59.000000000 +0200
++++ lmt-2.1.0/client/scripts/ltop      2008-03-25 13:55:53.000000000 +0100
+@@ -33,9 +33,9 @@
+ # Notes:
+ #======================================================================
+ 
+-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/share/lmt/lib
++export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/lmt/
+ 
+-LMT_JAR=/usr/share/lmt/lib/lmt-complete.jar
++LMT_JAR=/usr/lib/lmt/lmt-complete.jar
+ 
+ getjava()
+ {
+diff -urNad lmt-2.1.0~/client/scripts/lwatch lmt-2.1.0/client/scripts/lwatch
+--- lmt-2.1.0~/client/scripts/lwatch   2007-10-13 20:12:59.000000000 +0200
++++ lmt-2.1.0/client/scripts/lwatch    2008-03-25 13:54:46.000000000 +0100
+@@ -33,7 +33,7 @@
+ # Notes:
+ #======================================================================
+ 
+-LMT_JAR=/usr/share/lmt/lib/lmt-complete.jar
++LMT_JAR=/usr/lib/lmt/lmt-complete.jar
+ 
+ getjava()
+ {

Propchange: utils/lmt/trunk/debian/patches/lwatch-lustre-fix_pathnames.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: utils/lmt/trunk/debian/rules
URL: 
http://svn.debian.org/wsvn/pkg-lustre/utils/lmt/trunk/debian/rules?rev=464&op=diff
==============================================================================
--- utils/lmt/trunk/debian/rules (original)
+++ utils/lmt/trunk/debian/rules Tue Mar 25 13:05:10 2008
@@ -9,13 +9,15 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+include /usr/share/dpatch/dpatch.make
+
 #Set JAVA_HOME .. this requires sun-java6-jre to be installed.
 JAVA_HOME=/usr/lib/jvm/java-6-sun-1.6.0.04
 
 TMPDIR=$(CURDIR)/debian/tmp
 
 configure: configure-stamp
-configure-stamp:
+configure-stamp: patch
        dh_testdir
        # Add here commands to configure the package.
 
@@ -33,7 +35,7 @@
 
        touch $@
 
-clean:
+clean: unpatch
        dh_testdir
        dh_testroot
        rm -f build-stamp configure-stamp
@@ -72,9 +74,9 @@
        /bin/bash $(CURDIR)/scripts/install-lmt-server.sh 
$(CURDIR)/debian/lmt-server-agent/
        dh_installmenu
        dh_pysupport
-       dh_installinit -plmt-server --name=lmtupdatedb -o
-       dh_installinit -plmt-server-agent --name=lmtcollect -o
-       dh_installinit -plmt-server-agent --name=lmtd -o
+       #dh_installinit -plmt-server --name=lmtupdatedb -o
+       #dh_installinit -plmt-server-agent --name=lmtcollect -o
+       #dh_installinit -plmt-server-agent --name=lmtd -o
        dh_installcron
        dh_installman
        dh_link


_______________________________________________
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