perfsonar development work

Author: gijs
Date: 2008-06-16 10:23:08 -0400 (Mon, 16 Jun 2008)
New Revision: 4013

Added:
   trunk/packaging/deb/tomcat5.5-exist-1.1.1/README
   trunk/packaging/deb/tomcat5.5-exist-1.1.1/changelog
   trunk/packaging/deb/tomcat5.5-exist-1.1.1/compat
   trunk/packaging/deb/tomcat5.5-exist-1.1.1/control
   trunk/packaging/deb/tomcat5.5-exist-1.1.1/copyright
   trunk/packaging/deb/tomcat5.5-exist-1.1.1/dirs
   trunk/packaging/deb/tomcat5.5-exist-1.1.1/docs
   trunk/packaging/deb/tomcat5.5-exist-1.1.1/files
   trunk/packaging/deb/tomcat5.5-exist-1.1.1/install
   trunk/packaging/deb/tomcat5.5-exist-1.1.1/postinst
   trunk/packaging/deb/tomcat5.5-exist-1.1.1/postrm
   trunk/packaging/deb/tomcat5.5-exist-1.1.1/preinst
   trunk/packaging/deb/tomcat5.5-exist-1.1.1/prerm
   trunk/packaging/deb/tomcat5.5-exist-1.1.1/rules
   trunk/packaging/deb/tomcat5.5-exist-1.1.1/watch
   trunk/packaging/deb/zebedee/
   trunk/packaging/deb/zebedee/changelog
   trunk/packaging/deb/zebedee/control
   trunk/packaging/deb/zebedee/copyright
   trunk/packaging/deb/zebedee/dirs
   trunk/packaging/deb/zebedee/docs
   trunk/packaging/deb/zebedee/rules
   trunk/packaging/deb/zebedee/zebedee.examples
Removed:
   trunk/packaging/deb/tomcat5.5-exist-1.1.1/debian/
Modified:
   trunk/packaging/deb/flowd/changelog
   trunk/packaging/deb/flowd/control
   trunk/packaging/deb/flowd/postinst
   trunk/packaging/deb/flowd/rules
   trunk/packaging/deb/softflowd/rules
   trunk/packaging/deb/surfnet_java-flowsa-ma/changelog
   trunk/packaging/deb/surfnet_java-flowsa-ma/init
   trunk/packaging/deb/surfnet_java-flowsa-ma/postrm
   trunk/packaging/deb/surfnet_java-flowsa-ma/rules
   trunk/packaging/deb/surfnet_java-flowsubscription-mp/changelog
   trunk/packaging/deb/surfnet_java-flowsubscription-mp/install
   trunk/packaging/deb/surfnet_java-flowsubscription-mp/postrm
Log:


Modified: trunk/packaging/deb/flowd/changelog
===================================================================
--- trunk/packaging/deb/flowd/changelog 2008-06-16 14:21:15 UTC (rev 4012)
+++ trunk/packaging/deb/flowd/changelog 2008-06-16 14:23:08 UTC (rev 4013)
@@ -1,3 +1,9 @@
+flowd (0.9-2) stable; urgency=low
+
+  * fixed adduser postinst script
+
+ -- Gijs Molenaar 
<>
  Mon, 16 Jun 2008 14:55:09 +0200
+
 flowd (0.9-1) unstable; urgency=low
 
   * Initial release

Modified: trunk/packaging/deb/flowd/control
===================================================================
--- trunk/packaging/deb/flowd/control   2008-06-16 14:21:15 UTC (rev 4012)
+++ trunk/packaging/deb/flowd/control   2008-06-16 14:23:08 UTC (rev 4013)
@@ -3,6 +3,7 @@
 Priority: optional
 Maintainer: Gijs Molenaar 
<>
 Build-Depends: debhelper (>= 5), autotools-dev, byacc
+#, python-all-dev
 Standards-Version: 3.7.2
 
 Package: flowd
@@ -15,18 +16,17 @@
  storing flows in multiple formats or performing data analysis. That sort of
  thing is left to external tools.
 
-Package: python-flowd
-Architecture: any
-Section: python
-Priority: optional
-Depends: ${python:Depends}, ${shlibs:Depends}
-Provides: ${python:Provides}
-XB-Python-Version: ${python:Versions}
-Description: a small, fast and secure NetFlow collector (python interface)
- The flowd sensor follows the Unix philosophy of "doing one thing well" - it
- doesn't try to do anything beyond accepting NetFlow packets and storing them
- in a standard format on disk. In particular, it does not include support for
- storing flows in multiple formats or performing data analysis. That sort of
- thing is left to external tools.
+#Package: python-flowd
+#Architecture: any
+#Section: python
+#Priority: optional
+#Depends: ${python:Depends}, ${shlibs:Depends}
+#Provides: ${python:Provides}
+#Description: a small, fast and secure NetFlow collector (python interface)
+# The flowd sensor follows the Unix philosophy of "doing one thing well" - it
+# doesn't try to do anything beyond accepting NetFlow packets and storing 
them
+# in a standard format on disk. In particular, it does not include support 
for
+# storing flows in multiple formats or performing data analysis. That sort of
+# thing is left to external tools.
+#
 
-

Modified: trunk/packaging/deb/flowd/postinst
===================================================================
--- trunk/packaging/deb/flowd/postinst  2008-06-16 14:21:15 UTC (rev 4012)
+++ trunk/packaging/deb/flowd/postinst  2008-06-16 14:23:08 UTC (rev 4013)
@@ -6,7 +6,7 @@
     configure)
     if ! id perfsonar > /dev/null 2>&1 ; then
         adduser --system --home /nonexistent --no-create-home \
-        --disabled-password --shell /bin/false --group nogroup
+        --disabled-password --shell /bin/false flowd
     fi
     ;;
 

Modified: trunk/packaging/deb/flowd/rules
===================================================================
--- trunk/packaging/deb/flowd/rules     2008-06-16 14:21:15 UTC (rev 4012)
+++ trunk/packaging/deb/flowd/rules     2008-06-16 14:23:08 UTC (rev 4013)
@@ -39,7 +39,7 @@
 
        touch $@
 
-build-python%:
+build-python:
        python setup.py build
 
 
@@ -49,8 +49,9 @@
        rm -f build-stamp 
 
        # Add here commands to clean up after the build process.
-       -$(MAKE) distclean
+       -$(MAKE) clean
        rm -f config.sub config.guess
+       rm -rf build
 
        dh_clean 
 
@@ -63,7 +64,7 @@
        # Add here commands to install the package into debian/flowd.
        $(MAKE) prefix=$(CURDIR)/debian/flowd/usr install
 
-       python setup.py install --root $(CURDIR)/debian/python-rrd
+       #python setup.py install --root $(CURDIR)/debian/python-flowd
 
 
 # Build architecture-independent files here.
@@ -84,7 +85,7 @@
 #      dh_installemacsen
 #      dh_installpam
 #      dh_installmime
-       dh_python
+       #dh_pysupport
 #      dh_installinit
 #      dh_installcron
 #      dh_installinfo

Modified: trunk/packaging/deb/softflowd/rules
===================================================================
--- trunk/packaging/deb/softflowd/rules 2008-06-16 14:21:15 UTC (rev 4012)
+++ trunk/packaging/deb/softflowd/rules 2008-06-16 14:23:08 UTC (rev 4013)
@@ -7,7 +7,7 @@
 # This special exception was added by Craig Small in version 0.37 of dh-make.
 
 # Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+#export DH_VERBOSE=0
 
 
 # These are used for cross-compiling and for saving the configure script
@@ -16,7 +16,8 @@
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 
-config.status: configure
+configure: configure-stamp
+configure-stamp:
        dh_testdir
        # Add here commands to configure the package.
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
@@ -26,11 +27,12 @@
        cp -f /usr/share/misc/config.guess config.guess
 endif
        ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) 
--prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info 
CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
+       touch $@
 
 
 build: build-stamp
 
-build-stamp:  config.status
+build-stamp:  configure-stamp
        dh_testdir
 
        # Add here commands to compile the package.
@@ -45,7 +47,7 @@
        rm -f build-stamp 
 
        # Add here commands to clean up after the build process.
-       -$(MAKE) distclean
+       -$(MAKE) clean
        rm -f config.sub config.guess
 
        dh_clean 

Modified: trunk/packaging/deb/surfnet_java-flowsa-ma/changelog
===================================================================
--- trunk/packaging/deb/surfnet_java-flowsa-ma/changelog        2008-06-16 
14:21:15 UTC (rev 4012)
+++ trunk/packaging/deb/surfnet_java-flowsa-ma/changelog        2008-06-16 
14:23:08 UTC (rev 4013)
@@ -1,3 +1,24 @@
+surfnet-java-flowsa-ma (0.3-3) stable; urgency=low
+
+  * fixed postrm script
+
+ -- Gijs Molenaar 
<>
  Mon, 16 Jun 2008 15:12:46 +0200
+
+surfnet-java-flowsa-ma (0.3-2) stable; urgency=low
+
+  * fixed startup script
+  * changed tomcat.tomcat UID/GID to tomcat55
+
+ -- Gijs Molenaar 
<>
  Mon, 16 Jun 2008 14:53:12 +0200
+
+surfnet-java-flowsa-ma (0.3-1) stable; urgency=low
+
+  * new upstream release
+  * fixed webapps images
+  * small bug fixes
+
+ -- Gijs Molenaar 
<>
  Mon, 16 Jun 2008 14:01:00 +0200
+
 surfnet-java-flowsa-ma (0.2-5) unstable; urgency=low
 
   * changed init script to check default file, so service doesn't autostart

Modified: trunk/packaging/deb/surfnet_java-flowsa-ma/init
===================================================================
--- trunk/packaging/deb/surfnet_java-flowsa-ma/init     2008-06-16 14:21:15 
UTC (rev 4012)
+++ trunk/packaging/deb/surfnet_java-flowsa-ma/init     2008-06-16 14:23:08 
UTC (rev 4013)
@@ -26,7 +26,8 @@
 fi
 
 case $FLOWSA_ENABLE in
-    false)  exit 0
+    false)  log_failure_msg "You should configure this MP first and then 
enable it in /etc/default/surfnet-java-flowsa-ma"
+            exit 0
             ;;
     true)   ;;
     *)      log_failure_msg "Value of FLOWSA_ENABLE should be true or false"

Modified: trunk/packaging/deb/surfnet_java-flowsa-ma/postrm
===================================================================
--- trunk/packaging/deb/surfnet_java-flowsa-ma/postrm   2008-06-16 14:21:15 
UTC (rev 4012)
+++ trunk/packaging/deb/surfnet_java-flowsa-ma/postrm   2008-06-16 14:23:08 
UTC (rev 4013)
@@ -21,7 +21,8 @@
 
 case "$1" in
     purge)
-    rm /var/lib/tomcat5.5/webapps/surfnet-java-flowsa-ma/*
+    rm -rf /var/lib/surfnet-java-flowsa-ma/*
+    rm -rf /etc/surfnet-java-flowsa-ma
     ;;
     
     remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)

Modified: trunk/packaging/deb/surfnet_java-flowsa-ma/rules
===================================================================
--- trunk/packaging/deb/surfnet_java-flowsa-ma/rules    2008-06-16 14:21:15 
UTC (rev 4012)
+++ trunk/packaging/deb/surfnet_java-flowsa-ma/rules    2008-06-16 14:23:08 
UTC (rev 4013)
@@ -26,6 +26,7 @@
        dh_testroot
        rm -f build-stamp configure-stamp
        rm -rf build
+       rm -rf bin
        dh_clean 
 
 install: build

Modified: trunk/packaging/deb/surfnet_java-flowsubscription-mp/changelog
===================================================================
--- trunk/packaging/deb/surfnet_java-flowsubscription-mp/changelog      
2008-06-16 14:21:15 UTC (rev 4012)
+++ trunk/packaging/deb/surfnet_java-flowsubscription-mp/changelog      
2008-06-16 14:23:08 UTC (rev 4013)
@@ -1,3 +1,9 @@
+surfnet-java-flowsubscription-mp (0.2-1) stable; urgency=low
+
+  * new upstream release
+
+ -- Gijs Molenaar 
<gijs@gijs-desktop>
  Mon, 16 Jun 2008 16:02:03 +0200
+
 surfnet-java-flowsubscription-mp (0.1-1) unstable; urgency=low
 
   * initial release

Modified: trunk/packaging/deb/surfnet_java-flowsubscription-mp/install
===================================================================
--- trunk/packaging/deb/surfnet_java-flowsubscription-mp/install        
2008-06-16 14:21:15 UTC (rev 4012)
+++ trunk/packaging/deb/surfnet_java-flowsubscription-mp/install        
2008-06-16 14:23:08 UTC (rev 4013)
@@ -1 +1 @@
-build/flowsubscription-mp/* 
/var/lib/tomcat5.5/webapps/surfnet_java-flowsubscription-mp
+build/surfnet-java-flowsubscription-mp/* 
/var/lib/tomcat5.5/webapps/surfnet_java-flowsubscription-mp

Modified: trunk/packaging/deb/surfnet_java-flowsubscription-mp/postrm
===================================================================
--- trunk/packaging/deb/surfnet_java-flowsubscription-mp/postrm 2008-06-16 
14:21:15 UTC (rev 4012)
+++ trunk/packaging/deb/surfnet_java-flowsubscription-mp/postrm 2008-06-16 
14:23:08 UTC (rev 4013)
@@ -21,7 +21,7 @@
 
 case "$1" in
     purge)
-    rm /var/lib/tomcat5.5/webapps/surfnet_java-flowsubscription-mp/*
+    rm -rf /etc/surfnet-java-flowsa-ma
     ;;
     
     remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)

Added: trunk/packaging/deb/tomcat5.5-exist-1.1.1/README

Added: trunk/packaging/deb/tomcat5.5-exist-1.1.1/changelog

Added: trunk/packaging/deb/tomcat5.5-exist-1.1.1/compat

Added: trunk/packaging/deb/tomcat5.5-exist-1.1.1/control

Added: trunk/packaging/deb/tomcat5.5-exist-1.1.1/copyright

Added: trunk/packaging/deb/tomcat5.5-exist-1.1.1/dirs

Added: trunk/packaging/deb/tomcat5.5-exist-1.1.1/docs

Added: trunk/packaging/deb/tomcat5.5-exist-1.1.1/files

Added: trunk/packaging/deb/tomcat5.5-exist-1.1.1/install

Added: trunk/packaging/deb/tomcat5.5-exist-1.1.1/postinst

Added: trunk/packaging/deb/tomcat5.5-exist-1.1.1/postrm

Added: trunk/packaging/deb/tomcat5.5-exist-1.1.1/preinst

Added: trunk/packaging/deb/tomcat5.5-exist-1.1.1/prerm

Added: trunk/packaging/deb/tomcat5.5-exist-1.1.1/rules


Property changes on: trunk/packaging/deb/tomcat5.5-exist-1.1.1/rules
___________________________________________________________________
Name: svn:executable
   + *

Added: trunk/packaging/deb/tomcat5.5-exist-1.1.1/watch

Added: trunk/packaging/deb/zebedee/changelog

Added: trunk/packaging/deb/zebedee/control

Added: trunk/packaging/deb/zebedee/copyright

Added: trunk/packaging/deb/zebedee/dirs

Added: trunk/packaging/deb/zebedee/docs

Added: trunk/packaging/deb/zebedee/rules


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

Added: trunk/packaging/deb/zebedee/zebedee.examples