perfsonar development work

Author: dfn.calim
Date: 2010-11-10 14:54:12 +0000 (Wed, 10 Nov 2010)
New Revision: 662

Added:
   
branches/perfsonar-oppd-new-architect/build/debian/perfsonar-oppd-mp-bwctl-debian/
Modified:
   
branches/perfsonar-oppd-new-architect/build/debian/perfsonar-oppd-debian/postinst
   
branches/perfsonar-oppd-new-architect/build/debian/perfsonar-oppd-debian/postrm
   
branches/perfsonar-oppd-new-architect/build/debian/perfsonar-oppd-mp-bwctl-debian/changelog
   
branches/perfsonar-oppd-new-architect/build/debian/perfsonar-oppd-mp-bwctl-debian/control
   
branches/perfsonar-oppd-new-architect/build/debian/perfsonar-oppd-mp-bwctl-debian/files
   branches/perfsonar-oppd-new-architect/etc/oppd-mdm/oppd.conf
Log:


Modified: 
branches/perfsonar-oppd-new-architect/build/debian/perfsonar-oppd-debian/postinst
===================================================================
--- 
branches/perfsonar-oppd-new-architect/build/debian/perfsonar-oppd-debian/postinst
   2010-11-10 12:01:17 UTC (rev 661)
+++ 
branches/perfsonar-oppd-new-architect/build/debian/perfsonar-oppd-debian/postinst
   2010-11-10 14:54:12 UTC (rev 662)
@@ -24,13 +24,7 @@
     chmod 755 /etc/init.d/oppd
     chown -R perfsonar:perfsonar /usr/lib/perfsonar/services/oppd
     ;;
-    upgrade)
-    if which invoke-rc.d >/dev/null 2>&1; then
-        invoke-rc.d oppd start
-    else
-        /etc/init.d/oppd start
-    fi
-    ;;
+
     abort-upgrade|abort-remove|abort-deconfigure)
     ;;
 

Modified: 
branches/perfsonar-oppd-new-architect/build/debian/perfsonar-oppd-debian/postrm
===================================================================
--- 
branches/perfsonar-oppd-new-architect/build/debian/perfsonar-oppd-debian/postrm
     2010-11-10 12:01:17 UTC (rev 661)
+++ 
branches/perfsonar-oppd-new-architect/build/debian/perfsonar-oppd-debian/postrm
     2010-11-10 14:54:12 UTC (rev 662)
@@ -28,6 +28,13 @@
     remove|disappear)
     ;;
 
+    upgrade)
+    if which invoke-rc.d >/dev/null 2>&1; then
+       invoke-rc.d oppd start
+    else
+        /etc/init.d/oppd start
+    fi    
+    ;;
 
     failed-upgrade|abort-upgrade)
     ;;

Copied: 
branches/perfsonar-oppd-new-architect/build/debian/perfsonar-oppd-mp-bwctl-debian
 (from rev 658, 
branches/perfsonar-oppd-all-0.52/build/debian/perfsonar-oppd-mp-bwctl-0.51/debian)


Property changes on: 
branches/perfsonar-oppd-new-architect/build/debian/perfsonar-oppd-mp-bwctl-debian
___________________________________________________________________
Name: svn:mergeinfo
   + 

Modified: 
branches/perfsonar-oppd-new-architect/build/debian/perfsonar-oppd-mp-bwctl-debian/changelog
===================================================================
--- 
branches/perfsonar-oppd-all-0.52/build/debian/perfsonar-oppd-mp-bwctl-0.51/debian/changelog
 2010-10-20 13:59:42 UTC (rev 658)
+++ 
branches/perfsonar-oppd-new-architect/build/debian/perfsonar-oppd-mp-bwctl-debian/changelog
 2010-11-10 14:54:12 UTC (rev 662)
@@ -1,4 +1,4 @@
-perfsonar-oppd-mp-bwctl (0.52-2) unstable; urgency=low
+perfsonar-oppd-mp-bwctl (0.53-0rc1) unstable; urgency=low
 
   * Initial release
 

Modified: 
branches/perfsonar-oppd-new-architect/build/debian/perfsonar-oppd-mp-bwctl-debian/control
===================================================================
--- 
branches/perfsonar-oppd-all-0.52/build/debian/perfsonar-oppd-mp-bwctl-0.51/debian/control
   2010-10-20 13:59:42 UTC (rev 658)
+++ 
branches/perfsonar-oppd-new-architect/build/debian/perfsonar-oppd-mp-bwctl-debian/control
   2010-11-10 14:54:12 UTC (rev 662)
@@ -9,7 +9,7 @@
 Package: perfsonar-oppd-mp-bwctl
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Pre-Depends: perfsonar-oppd
+Pre-Depends: perfsonar-oppd ( >= 0.53)
 Description: perfSONAR::MP::BWCTL Perl module, plugin for oppd 
  The README is used to introduce the module and provide instructions on how
  to install the module, any machine dependencies it may have (for example C

Modified: 
branches/perfsonar-oppd-new-architect/build/debian/perfsonar-oppd-mp-bwctl-debian/files
===================================================================
--- 
branches/perfsonar-oppd-all-0.52/build/debian/perfsonar-oppd-mp-bwctl-0.51/debian/files
     2010-10-20 13:59:42 UTC (rev 658)
+++ 
branches/perfsonar-oppd-new-architect/build/debian/perfsonar-oppd-mp-bwctl-debian/files
     2010-11-10 14:54:12 UTC (rev 662)
@@ -1 +1 @@
-perfsonar-oppd-mp-bwctl_0.52-2_all.deb net extra
+perfsonar-oppd-mp-bwctl_0.53-0rc1_all.deb net extra

Modified: branches/perfsonar-oppd-new-architect/etc/oppd-mdm/oppd.conf
===================================================================
--- branches/perfsonar-oppd-new-architect/etc/oppd-mdm/oppd.conf        
2010-11-10 12:01:17 UTC (rev 661)
+++ branches/perfsonar-oppd-new-architect/etc/oppd-mdm/oppd.conf        
2010-11-10 14:54:12 UTC (rev 662)
@@ -19,7 +19,7 @@
 # Example:
 #detach         off
 #
-detach         on
+#detach         on
 
 
 #
@@ -42,7 +42,7 @@
 # logfile        "/var/log/oppd.log"
 #
 #logfile        off
-logfile        "/var/log/oppd.log"
+#logfile        "/var/log/oppd.log"
 
 
 #
@@ -62,7 +62,7 @@
 # syslog         on
 #
 #syslog         off
-syslog         off
+#syslog         off
 
 
 #