Author: winnie
Date: Wed Apr  2 06:54:52 2008
New Revision: 467

URL: http://svn.debian.org/wsvn/pkg-lustre/?sc=1&rev=467
Log:
Check in work done yesterday

Added:
    utils/lmt/trunk/debian/patches/fix-autogen.sh.dpatch   (with props)
    utils/lmt/trunk/debian/patches/fix-install-server.sh.dpatch   (with props)
    utils/lmt/trunk/debian/patches/install-everything-to-destdir.dpatch   (with 
props)
Removed:
    utils/lmt/trunk/debian/lmt-server-agent.install
    utils/lmt/trunk/debian/lmt-server-agent.lmtcollect.init
    utils/lmt/trunk/debian/lmt-server-agent.lmtd.init
    utils/lmt/trunk/debian/patches/remove-script-executables.dpatch
    utils/lmt/trunk/debian/pycompat
Modified:
    utils/lmt/trunk/debian/changelog
    utils/lmt/trunk/debian/control
    utils/lmt/trunk/debian/lmt-server.dirs
    utils/lmt/trunk/debian/lmt-server.install
    utils/lmt/trunk/debian/patches/00list
    utils/lmt/trunk/debian/rules

Modified: utils/lmt/trunk/debian/changelog
URL: 
http://svn.debian.org/wsvn/pkg-lustre/utils/lmt/trunk/debian/changelog?rev=467&op=diff
==============================================================================
--- utils/lmt/trunk/debian/changelog (original)
+++ utils/lmt/trunk/debian/changelog Wed Apr  2 06:54:52 2008
@@ -1,4 +1,4 @@
-lmt (2.1.0-1) unstable; urgency=low
+lmt (2.5.4-1) unstable; urgency=low
 
   * Initial release (Closes: #468462)
 

Modified: utils/lmt/trunk/debian/control
URL: 
http://svn.debian.org/wsvn/pkg-lustre/utils/lmt/trunk/debian/control?rev=467&op=diff
==============================================================================
--- utils/lmt/trunk/debian/control (original)
+++ utils/lmt/trunk/debian/control Wed Apr  2 06:54:52 2008
@@ -3,14 +3,14 @@
 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-support (>= 0.3), dpatch
+Build-Depends: debhelper (>= 5), ant, ant-optional, libncursesw5-dev, 
sun-java6-jdk, dpatch, libtool, autotools-dev, autoconf, cerebro-dev
 Standards-Version: 3.7.3
 Homepage: http://sourceforge.net/projects/lmt/
 
 Package: lwatch-lustre
 Architecture: i386 amd64
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: lustre monitoring tool - frontend
+Description: lustre monitoring tool - graphical frontend
  Some description here...
 
 
@@ -19,15 +19,5 @@
 XB-Python-Version: ${python:Versions}
 Provides: ${python:Provides}
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, ${perl:Depends}
-Description: lustre monitoring tool - collect daemon
+Description: lustre monitoring tool - cerebro plugins
  Some description here...
-
-
-Package: lmt-server-agent
-Architecture: any
-XB-Python-Version: ${python:Versions}
-Provides: ${python:Provides}
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
-Description: lustre monitoring tool - lmtd daemon
- Some description here
-

Modified: utils/lmt/trunk/debian/lmt-server.dirs
URL: 
http://svn.debian.org/wsvn/pkg-lustre/utils/lmt/trunk/debian/lmt-server.dirs?rev=467&op=diff
==============================================================================
--- utils/lmt/trunk/debian/lmt-server.dirs (original)
+++ utils/lmt/trunk/debian/lmt-server.dirs Wed Apr  2 06:54:52 2008
@@ -1,4 +1,3 @@
 usr/sbin/
 usr/share/lmt/
 usr/share/lmt/cron/
-usr/share/perl/lmt/

Modified: utils/lmt/trunk/debian/lmt-server.install
URL: 
http://svn.debian.org/wsvn/pkg-lustre/utils/lmt/trunk/debian/lmt-server.install?rev=467&op=diff
==============================================================================
--- utils/lmt/trunk/debian/lmt-server.install (original)
+++ utils/lmt/trunk/debian/lmt-server.install Wed Apr  2 06:54:52 2008
@@ -1,11 +1,1 @@
-server/src/lmtupdatedb usr/sbin/
-server/src/create_lmtconfig.pl usr/sbin/
-server/cron/lmt_update_fs_agg  usr/sbin/
-server/cron/lmt_update_mds_agg usr/sbin/
-server/cron/lmt_update_ost_agg usr/sbin/
-server/cron/lmt_update_other_agg usr/sbin/
-server/cron/lmt_update_router_agg usr/sbin/
-server/cron/lmt_agg.sh   usr/sbin/
-server/lib/perl/LMT.pm usr/share/perl/lmt/
-server/cron/lmtrc usr/share/lmt/cron/
-server/cron/lmt_agg.cron usr/share/lmt/cron/
+usr/lib/cerebro/*

Modified: utils/lmt/trunk/debian/patches/00list
URL: 
http://svn.debian.org/wsvn/pkg-lustre/utils/lmt/trunk/debian/patches/00list?rev=467&op=diff
==============================================================================
--- utils/lmt/trunk/debian/patches/00list (original)
+++ utils/lmt/trunk/debian/patches/00list Wed Apr  2 06:54:52 2008
@@ -1,2 +1,4 @@
 lwatch-lustre-fix_pathnames.dpatch
-remove-script-executables.dpatch
+fix-autogen.sh.dpatch
+fix-install-server.sh.dpatch
+install-everything-to-destdir.dpatch

Added: utils/lmt/trunk/debian/patches/fix-autogen.sh.dpatch
URL: 
http://svn.debian.org/wsvn/pkg-lustre/utils/lmt/trunk/debian/patches/fix-autogen.sh.dpatch?rev=467&op=file
==============================================================================
--- utils/lmt/trunk/debian/patches/fix-autogen.sh.dpatch (added)
+++ utils/lmt/trunk/debian/patches/fix-autogen.sh.dpatch Wed Apr  2 06:54:52 
2008
@@ -1,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix-autogen.sh.dpatch by Patrick Winnertz <[EMAIL PROTECTED]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
[EMAIL PROTECTED]@
+diff -urNad lmt-2.5.4~/server/src/autogen.sh lmt-2.5.4/server/src/autogen.sh
+--- lmt-2.5.4~/server/src/autogen.sh   2007-12-26 12:36:51.000000000 +0100
++++ lmt-2.5.4/server/src/autogen.sh    2008-04-01 13:03:51.000000000 +0200
+@@ -2,7 +2,7 @@
+ 
+ SYSTEM=`uname -s`
+ 
+-if [[ ! -z ${SYSTEM} && ${SYSTEM} != "AIX" ]]; then
++if [ ! -z ${SYSTEM} ] && [ ${SYSTEM} != "AIX" ]; then
+       echo "******************************"
+       echo "Running libtoolize"
+       echo "******************************"

Propchange: utils/lmt/trunk/debian/patches/fix-autogen.sh.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Added: utils/lmt/trunk/debian/patches/fix-install-server.sh.dpatch
URL: 
http://svn.debian.org/wsvn/pkg-lustre/utils/lmt/trunk/debian/patches/fix-install-server.sh.dpatch?rev=467&op=file
==============================================================================
--- utils/lmt/trunk/debian/patches/fix-install-server.sh.dpatch (added)
+++ utils/lmt/trunk/debian/patches/fix-install-server.sh.dpatch Wed Apr  2 
06:54:52 2008
@@ -1,0 +1,17 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix-install-server.sh.dpatch by Patrick Winnertz <[EMAIL PROTECTED]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
[EMAIL PROTECTED]@
+diff -urNad lmt-2.5.4~/scripts/install-lmt-server.sh 
lmt-2.5.4/scripts/install-lmt-server.sh
+--- lmt-2.5.4~/scripts/install-lmt-server.sh   2007-12-26 13:21:03.000000000 
+0100
++++ lmt-2.5.4/scripts/install-lmt-server.sh    2008-04-01 13:09:43.000000000 
+0200
+@@ -27,5 +27,5 @@
+ # 
=============================================================================
+ 
+ pushd .
+-cd server/src && make install
++cd server/src && make install DESTDIR=$1
+ popd

Propchange: utils/lmt/trunk/debian/patches/fix-install-server.sh.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Added: utils/lmt/trunk/debian/patches/install-everything-to-destdir.dpatch
URL: 
http://svn.debian.org/wsvn/pkg-lustre/utils/lmt/trunk/debian/patches/install-everything-to-destdir.dpatch?rev=467&op=file
==============================================================================
--- utils/lmt/trunk/debian/patches/install-everything-to-destdir.dpatch (added)
+++ utils/lmt/trunk/debian/patches/install-everything-to-destdir.dpatch Wed Apr 
 2 06:54:52 2008
@@ -1,0 +1,31 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## install-everything-to-destdir.dpatch by Patrick Winnertz <[EMAIL PROTECTED]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
[EMAIL PROTECTED]@
+diff -urNad lmt-2.5.4~/Makefile lmt-2.5.4/Makefile
+--- lmt-2.5.4~/Makefile        2007-12-26 13:21:03.000000000 +0100
++++ lmt-2.5.4/Makefile 2008-04-01 14:46:16.000000000 +0200
+@@ -49,7 +49,19 @@
+ config: check-vars
+ 
+ install: lmt-server
+-      scripts/install-lmt-server.sh
++      scripts/install-lmt-server.sh $(DESTDIR)
++      install -D server/src/scripts/create_lmtconfig.pl 
$(DESTDIR)/usr/sbin/create-lmtconfig
++      install -D server/cron/lmt_agg.cron $(DESTDIR)/etc/cron.hourly/
++      install -D server/cron/lmt_agg.sh $(DESTDIR)/usr/share/lmt/
++      install -D server/cron/lmtrc $(DESTDIR)/etc/
++      install -D server/cron/lmtsh $(DESTDIR)/usr/sbin/
++      install -D server/cron/lmt_update* $(DESTDIR)/usr/share/lmt/
++      install -D server/lib/perl/LMT.pm $(DESTDIR)/usr/share/perl5/LMT.pm
++      install -D client/scripts/lwatch $(DESTDIR)/usr/bin/
++      install -D client/scripts/lstat $(DESTDIR)/usr/bin/
++      install -D client/scripts/ltop $(DESTDIR)/usr/bin/
++      install -D client/lmt-complete.jar $(DESTDIR)/usr/lib/lmt/
++      install -D client/charva/c/lib/libTerminal.so $(DESTDIR)/usr/lib/lmt/
+       
+ lmt-server: config
+       scripts/build-lmt-server.sh

Propchange: utils/lmt/trunk/debian/patches/install-everything-to-destdir.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: utils/lmt/trunk/debian/rules
URL: 
http://svn.debian.org/wsvn/pkg-lustre/utils/lmt/trunk/debian/rules?rev=467&op=diff
==============================================================================
--- utils/lmt/trunk/debian/rules (original)
+++ utils/lmt/trunk/debian/rules Wed Apr  2 06:54:52 2008
@@ -46,6 +46,9 @@
        rm -f client/config.log
        rm -f INSTALLED_FILES*
        rm -rf server/src/build/
+       rm -f server/src/config/config.guess
+       rm -f server/src/config/config.sub
+       rm -f server/src/config/ltmain.sh
        find $(CURDIR) -mindepth 2 -name 'Makefile' | xargs rm -f ;
 
        dh_clean 
@@ -55,6 +58,8 @@
        dh_testroot
        dh_clean -k 
        dh_installdirs
+
+       $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 
 # Build architecture-independent files here.
 binary-indep: build install
@@ -67,16 +72,10 @@
        dh_installchangelogs ChangeLog
        dh_installdocs
        dh_installexamples
-       dh_install
+       dh_install  --list-missing --sourcedir=debian/tmp
        #Remove language extensions
-       mv $(CURDIR)/debian/lmt-server/usr/sbin/create_lmtconfig.pl 
$(CURDIR)/debian/lmt-server/usr/sbin/create_lmtconfig
-       mv $(CURDIR)/debian/lmt-server/usr/sbin/lmt_agg.sh 
$(CURDIR)/debian/lmt-server/usr/sbin/lmt_agg
-       /bin/bash $(CURDIR)/scripts/install-lmt-server.sh 
$(CURDIR)/debian/lmt-server-agent/
+       /bin/bash $(CURDIR)/scripts/install-lmt-server.sh 
$(CURDIR)/debian/lmt-server
        dh_installmenu
-       dh_pysupport
-       dh_installinit 
-       dh_installinit -plmt-server-agent --name=lmtcollect 
-       dh_installinit -plmt-server-agent --name=lmtd
        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