perfsonar development work

Author: gijs
Date: 2008-06-05 09:32:10 -0400 (Thu, 05 Jun 2008)
New Revision: 3959

Added:
   trunk/packaging/deb/nfdump/
   trunk/packaging/deb/nfdump/README.Debian
   trunk/packaging/deb/nfdump/changelog
   trunk/packaging/deb/nfdump/compat
   trunk/packaging/deb/nfdump/control
   trunk/packaging/deb/nfdump/copyright
   trunk/packaging/deb/nfdump/dirs
   trunk/packaging/deb/nfdump/docs
   trunk/packaging/deb/nfdump/files
   trunk/packaging/deb/nfdump/nfdump.substvars
   trunk/packaging/deb/nfdump/rules
   trunk/packaging/deb/nfdump/watch
Modified:
   trunk/packaging/deb/geant2_java-rrd-ma/changelog
   trunk/packaging/deb/geant2_java-rrd-ma/conffiles
   trunk/packaging/deb/geant2_java-rrd-ma/control
   trunk/packaging/deb/geant2_java-rrd-ma/install
   trunk/packaging/deb/geant2_java-rrd-ma/rules
   trunk/packaging/deb/tomcat5.5-exist-1.1.1/debian/changelog
   trunk/packaging/deb/tomcat5.5-exist-1.1.1/debian/files
   trunk/packaging/deb/tomcat5.5-exist-1.1.1/debian/postinst
Log:


Modified: trunk/packaging/deb/geant2_java-rrd-ma/changelog
===================================================================
--- trunk/packaging/deb/geant2_java-rrd-ma/changelog    2008-06-05 12:49:27 
UTC (rev 3958)
+++ trunk/packaging/deb/geant2_java-rrd-ma/changelog    2008-06-05 13:32:10 
UTC (rev 3959)
@@ -2,4 +2,4 @@
 
   * initial release
 
- -- Gijs Molenaar 
<>
  Tue, 20 May 2008 14:46:48 +0200
+ -- Roman Lapacz 
<>
  Tue, 20 May 2008 14:46:48 +0200

Modified: trunk/packaging/deb/geant2_java-rrd-ma/conffiles
===================================================================
--- trunk/packaging/deb/geant2_java-rrd-ma/conffiles    2008-06-05 12:49:27 
UTC (rev 3958)
+++ trunk/packaging/deb/geant2_java-rrd-ma/conffiles    2008-06-05 13:32:10 
UTC (rev 3959)
@@ -1,5 +1,2 @@
-/var/lib/tomcat5.5/webapps/geant2-java-rrdma/WEB-INF/classes/perfsonar/conf/components.properties
-/var/lib/tomcat5.5/webapps/geant2-java-rrdma/WEB-INF/classes/perfsonar/conf/log4j.properties
-/var/lib/tomcat5.5/webapps/geant2-java-rrdma/WEB-INF/classes/perfsonar/conf/service.properties
-/var/lib/tomcat5.5/webapps/geant2-java-rrdma/WEB-INF/classes/perfsonar/conf/servlet.properties
-/var/lib/tomcat5.5/webapps/geant2-java-rrdma/WEB-INF/classes/perfsonar/conf/wizard.properties
+/var/lib/tomcat5.5/webapps/geant2-java-rrd-ma/WEB-INF/classes/perfsonar/conf/servlet.properties
+/var/lib/tomcat5.5/webapps/geant2-java-rrd-ma/WEB-INF/classes/perfsonar/conf/wizard.properties

Modified: trunk/packaging/deb/geant2_java-rrd-ma/control
===================================================================
--- trunk/packaging/deb/geant2_java-rrd-ma/control      2008-06-05 12:49:27 
UTC (rev 3958)
+++ trunk/packaging/deb/geant2_java-rrd-ma/control      2008-06-05 13:32:10 
UTC (rev 3959)
@@ -1,13 +1,13 @@
-Source: geant2_java-rrd-ma
+Source: geant2-java-rrd-ma
 Section: web
 Priority: extra
-Maintainer: Gijs Molenaar 
<>
-Build-Depends: debhelper (>= 5), maven2
+Maintainer: Roman Lapacz 
<>
+Build-Depends: debhelper (>= 5), maven2, librrd2-dev
 Standards-Version: 3.7.2
 
-Package: surfnet-java-flowsa-ma
-Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, nfdump (>= 1.5.7), tomcat5.5, 
+Package: geant2-java-rrd-ma
+Architecture: i386
+Depends: ${shlibs:Depends}, ${misc:Depends}, nfdump (>= 1.5.7), tomcat5.5, 
librrd2
 Description: perfSONAR Round Robin Database
  TODO TODO
 

Modified: trunk/packaging/deb/geant2_java-rrd-ma/install
===================================================================
--- trunk/packaging/deb/geant2_java-rrd-ma/install      2008-06-05 12:49:27 
UTC (rev 3958)
+++ trunk/packaging/deb/geant2_java-rrd-ma/install      2008-06-05 13:32:10 
UTC (rev 3959)
@@ -1 +1,3 @@
-build/geant2-java-rrd-ma/* /var/lib/tomcat5.5/webapps/geant2-java-rrd-ma
+build/rrd-ma/* /var/lib/tomcat5.5/webapps/geant2-java-rrd-ma
+contrib/rrdjtool/build/libjrrd.so /usr/lib
+

Modified: trunk/packaging/deb/geant2_java-rrd-ma/rules
===================================================================
--- trunk/packaging/deb/geant2_java-rrd-ma/rules        2008-06-05 12:49:27 
UTC (rev 3958)
+++ trunk/packaging/deb/geant2_java-rrd-ma/rules        2008-06-05 13:32:10 
UTC (rev 3959)
@@ -18,7 +18,7 @@
 build-stamp: configure-stamp 
        dh_testdir
        mvn package
-
+       cd contrib/rrdjtool/native && make /usr/lib/jvm/java-6-sun
        touch $@
 
 clean:

Added: trunk/packaging/deb/nfdump/README.Debian

Added: trunk/packaging/deb/nfdump/changelog

Added: trunk/packaging/deb/nfdump/compat

Added: trunk/packaging/deb/nfdump/control

Added: trunk/packaging/deb/nfdump/copyright

Added: trunk/packaging/deb/nfdump/dirs

Added: trunk/packaging/deb/nfdump/docs

Added: trunk/packaging/deb/nfdump/files

Added: trunk/packaging/deb/nfdump/nfdump.substvars

Added: trunk/packaging/deb/nfdump/rules


Property changes on: trunk/packaging/deb/nfdump/rules
___________________________________________________________________
Name: svn:executable
   + *

Added: trunk/packaging/deb/nfdump/watch

Modified: trunk/packaging/deb/tomcat5.5-exist-1.1.1/debian/changelog
===================================================================
--- trunk/packaging/deb/tomcat5.5-exist-1.1.1/debian/changelog  2008-06-05 
12:49:27 UTC (rev 3958)
+++ trunk/packaging/deb/tomcat5.5-exist-1.1.1/debian/changelog  2008-06-05 
13:32:10 UTC (rev 3959)
@@ -1,3 +1,10 @@
+tomcat5.5-exist (1.1.1-4) stable; urgency=low
+
+  * added install file so the package is not EMPTY :)
+  * modified startup script to restart tomcat correctly with debian 4
+
+ -- Gijs Molenaar 
<>
  Thu, 05 Jun 2008 14:52:01 +0200
+
 tomcat5.5-exist (1.1.1-3) stable; urgency=low
 
   * new package structure

Modified: trunk/packaging/deb/tomcat5.5-exist-1.1.1/debian/files
===================================================================
--- trunk/packaging/deb/tomcat5.5-exist-1.1.1/debian/files      2008-06-05 
12:49:27 UTC (rev 3958)
+++ trunk/packaging/deb/tomcat5.5-exist-1.1.1/debian/files      2008-06-05 
13:32:10 UTC (rev 3959)
@@ -1 +1 @@
-tomcat5.5-exist_1.1.1-3_all.deb web extra
+tomcat5.5-exist_1.1.1-4_all.deb web extra

Modified: trunk/packaging/deb/tomcat5.5-exist-1.1.1/debian/postinst
===================================================================
--- trunk/packaging/deb/tomcat5.5-exist-1.1.1/debian/postinst   2008-06-05 
12:49:27 UTC (rev 3958)
+++ trunk/packaging/deb/tomcat5.5-exist-1.1.1/debian/postinst   2008-06-05 
13:32:10 UTC (rev 3959)
@@ -24,7 +24,7 @@
     configure)
     touch $PREFIX/WEB-INF/TMPfile.xml
     chown tomcat55 $PREFIX/WEB-INF/logs $PREFIX/WEB-INF/data 
$PREFIX/WEB-INF/TMPfile.xml
-    /etc/init.d/tomcat5.5 try-restart
+    /etc/init.d/tomcat5.5 restart
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)