perfsonar development work

Author: dfn.calim
Date: 2010-09-24 12:23:29 +0100 (Fri, 24 Sep 2010)
New Revision: 644

Removed:
   
branches/perfsonar-oppd-new-architect/build/debian/perfsonar-oppd-mp-bwctl-0.51/debian/
Modified:
   
branches/perfsonar-oppd-new-architect/build/debian/create-personar-oppd-dpkg.sh
   
branches/perfsonar-oppd-new-architect/build/debian/perfsonar-oppd-debian/control
   
branches/perfsonar-oppd-new-architect/build/debian/perfsonar-oppd-debian/postrm
   branches/perfsonar-oppd-new-architect/build/perfSONAR-MP-BWCTL/Build.PL
   branches/perfsonar-oppd-new-architect/etc/oppd-mdm/oppd.conf
Log:
update package build data

Modified: 
branches/perfsonar-oppd-new-architect/build/debian/create-personar-oppd-dpkg.sh
===================================================================
--- 
branches/perfsonar-oppd-new-architect/build/debian/create-personar-oppd-dpkg.sh
     2010-09-24 07:02:41 UTC (rev 643)
+++ 
branches/perfsonar-oppd-new-architect/build/debian/create-personar-oppd-dpkg.sh
     2010-09-24 11:23:29 UTC (rev 644)
@@ -24,4 +24,5 @@
        echo 'deleting files....'
        rm -rf $pkg_name-$version.tar.gz
        rm -rf $pkg_name-$version
+       rm $pkg_name'_'$version*
 fi

Modified: 
branches/perfsonar-oppd-new-architect/build/debian/perfsonar-oppd-debian/control
===================================================================
--- 
branches/perfsonar-oppd-new-architect/build/debian/perfsonar-oppd-debian/control
    2010-09-24 07:02:41 UTC (rev 643)
+++ 
branches/perfsonar-oppd-new-architect/build/debian/perfsonar-oppd-debian/control
    2010-09-24 11:23:29 UTC (rev 644)
@@ -9,8 +9,8 @@
 Package: perfsonar-oppd
 Architecture: all
 Pre-Depends: ${shlibs:Depends}, ${misc:Depends}, perl, 
libconfig-general-perl, libwww-perl, libipc-shareable-perl, 
liblog-dispatch-perl, libnmwg-perl, liburi-perl, libxml-libxml-perl, 
libsocket6-perl,libhttp-daemon-ssl-perl,liblog-log4perl-perl,libreadonly-perl
-Conflicts: oppd
-Replaces: oppd
+Conflicts: oppd,perfsonar-oppd-mp-bwctl (<= 0.52)
+Replaces: oppd,perfsonar-oppd-mp-bwctl (<= 0.52)
 Description: open PERL perfSONAR daemon
  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-debian/postrm
===================================================================
--- 
branches/perfsonar-oppd-new-architect/build/debian/perfsonar-oppd-debian/postrm
     2010-09-24 07:02:41 UTC (rev 643)
+++ 
branches/perfsonar-oppd-new-architect/build/debian/perfsonar-oppd-debian/postrm
     2010-09-24 11:23:29 UTC (rev 644)
@@ -28,13 +28,6 @@
     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)
     ;;

Modified: 
branches/perfsonar-oppd-new-architect/build/perfSONAR-MP-BWCTL/Build.PL
===================================================================
--- branches/perfsonar-oppd-new-architect/build/perfSONAR-MP-BWCTL/Build.PL   
  2010-09-24 07:02:41 UTC (rev 643)
+++ branches/perfsonar-oppd-new-architect/build/perfSONAR-MP-BWCTL/Build.PL   
  2010-09-24 11:23:29 UTC (rev 644)
@@ -7,7 +7,7 @@
     dist_name           => 'perfsonar-oppd-mp-bwctl',
     license             => 'apache',
     dist_author         => 'DFN-Labor 
<>',
-    dist_version_from   => 'lib/perfSONAR/MP/BWCTL.pm',
+    dist_version_from   => 'lib/perfSONAR.pm',
     dist_abstract       => 'BWCTL MP module for perl-perfSONAR',
     build_requires => {
         'Test::More' => 0,

Modified: branches/perfsonar-oppd-new-architect/etc/oppd-mdm/oppd.conf
===================================================================
--- branches/perfsonar-oppd-new-architect/etc/oppd-mdm/oppd.conf        
2010-09-24 07:02:41 UTC (rev 643)
+++ branches/perfsonar-oppd-new-architect/etc/oppd-mdm/oppd.conf        
2010-09-24 11:23:29 UTC (rev 644)
@@ -17,9 +17,9 @@
 # Default: on
 #
 # Example:
-detach         off
+#detach         off
 #
-#detach         on
+detach         on
 
 
 #