perfsonar development work

Author: dfn.calim
Date: 2011-09-14 11:42:58 +0100 (Wed, 14 Sep 2011)
New Revision: 741

Added:
   
branches/perfsonar-oppd-all-0.53/build/debian/0.53-0rc1/libnmwg-perl_0.03-1_all.deb
   
branches/perfsonar-oppd-all-0.53/build/debian/0.53-0rc1/perfsonar-oppd-ma-hades_0.53-1_all.deb
   
branches/perfsonar-oppd-all-0.53/build/debian/0.53-0rc1/perfsonar-oppd-mp-bwctl_0.53-1_all.deb
   
branches/perfsonar-oppd-all-0.53/build/debian/0.53-0rc1/perfsonar-oppd-mp-owamp_0.53-1_all.deb
   
branches/perfsonar-oppd-all-0.53/build/debian/0.53-0rc1/perfsonar-oppd_0.53-1_all.deb
Removed:
   
branches/perfsonar-oppd-all-0.53/build/debian/0.53-0rc1/perfsonar-oppd-ma-hades_0.53-0rc1_all.deb
   
branches/perfsonar-oppd-all-0.53/build/debian/0.53-0rc1/perfsonar-oppd-mp-bwctl_0.53-0rc1_all.deb
   
branches/perfsonar-oppd-all-0.53/build/debian/0.53-0rc1/perfsonar-oppd-mp-owamp_0.53-0rc1_all.deb
   
branches/perfsonar-oppd-all-0.53/build/debian/0.53-0rc1/perfsonar-oppd_0.53-0rc1_all.deb
Modified:
   branches/perfsonar-oppd-all-0.53/build/debian/libnmwg-perl-debian/changelog
   
branches/perfsonar-oppd-all-0.53/build/debian/perfsonar-oppd-debian/changelog
   branches/perfsonar-oppd-all-0.53/build/debian/perfsonar-oppd-debian/control
   
branches/perfsonar-oppd-all-0.53/build/debian/perfsonar-oppd-ma-hades-debian/changelog
   
branches/perfsonar-oppd-all-0.53/build/debian/perfsonar-oppd-ma-hades-debian/control
   
branches/perfsonar-oppd-all-0.53/build/debian/perfsonar-oppd-ma-hades-debian/postinst
   
branches/perfsonar-oppd-all-0.53/build/debian/perfsonar-oppd-ma-hades-debian/postrm
   
branches/perfsonar-oppd-all-0.53/build/debian/perfsonar-oppd-mp-bwctl-debian/changelog
   
branches/perfsonar-oppd-all-0.53/build/debian/perfsonar-oppd-mp-owamp-debian/changelog
   branches/perfsonar-oppd-all-0.53/build/perfSONAR-MA-Hades/META.yml
   branches/perfsonar-oppd-all-0.53/build/perfSONAR/MANIFEST
   branches/perfsonar-oppd-all-0.53/build/perfSONAR/MANIFEST.SKIP
Log:
add debian build files

Added: 
branches/perfsonar-oppd-all-0.53/build/debian/0.53-0rc1/libnmwg-perl_0.03-1_all.deb
===================================================================
(Binary files differ)


Property changes on: 
branches/perfsonar-oppd-all-0.53/build/debian/0.53-0rc1/libnmwg-perl_0.03-1_all.deb
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Deleted: 
branches/perfsonar-oppd-all-0.53/build/debian/0.53-0rc1/perfsonar-oppd-ma-hades_0.53-0rc1_all.deb
===================================================================
(Binary files differ)

Added: 
branches/perfsonar-oppd-all-0.53/build/debian/0.53-0rc1/perfsonar-oppd-ma-hades_0.53-1_all.deb
===================================================================
(Binary files differ)


Property changes on: 
branches/perfsonar-oppd-all-0.53/build/debian/0.53-0rc1/perfsonar-oppd-ma-hades_0.53-1_all.deb
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Deleted: 
branches/perfsonar-oppd-all-0.53/build/debian/0.53-0rc1/perfsonar-oppd-mp-bwctl_0.53-0rc1_all.deb
===================================================================
(Binary files differ)

Added: 
branches/perfsonar-oppd-all-0.53/build/debian/0.53-0rc1/perfsonar-oppd-mp-bwctl_0.53-1_all.deb
===================================================================
(Binary files differ)


Property changes on: 
branches/perfsonar-oppd-all-0.53/build/debian/0.53-0rc1/perfsonar-oppd-mp-bwctl_0.53-1_all.deb
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Deleted: 
branches/perfsonar-oppd-all-0.53/build/debian/0.53-0rc1/perfsonar-oppd-mp-owamp_0.53-0rc1_all.deb
===================================================================
(Binary files differ)

Added: 
branches/perfsonar-oppd-all-0.53/build/debian/0.53-0rc1/perfsonar-oppd-mp-owamp_0.53-1_all.deb
===================================================================
(Binary files differ)


Property changes on: 
branches/perfsonar-oppd-all-0.53/build/debian/0.53-0rc1/perfsonar-oppd-mp-owamp_0.53-1_all.deb
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Deleted: 
branches/perfsonar-oppd-all-0.53/build/debian/0.53-0rc1/perfsonar-oppd_0.53-0rc1_all.deb
===================================================================
(Binary files differ)

Added: 
branches/perfsonar-oppd-all-0.53/build/debian/0.53-0rc1/perfsonar-oppd_0.53-1_all.deb
===================================================================
(Binary files differ)


Property changes on: 
branches/perfsonar-oppd-all-0.53/build/debian/0.53-0rc1/perfsonar-oppd_0.53-1_all.deb
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: 
branches/perfsonar-oppd-all-0.53/build/debian/libnmwg-perl-debian/changelog
===================================================================
--- 
branches/perfsonar-oppd-all-0.53/build/debian/libnmwg-perl-debian/changelog 
2011-09-13 10:36:34 UTC (rev 740)
+++ 
branches/perfsonar-oppd-all-0.53/build/debian/libnmwg-perl-debian/changelog 
2011-09-14 10:42:58 UTC (rev 741)
@@ -1,5 +1,5 @@
-libnmwg-perl (0.02-0rc1) unstable; urgency=low
+libnmwg-perl (0.03-1) unstable; urgency=low
 
-  * Initial Release.
+  * .djust to the new framework
 
- -- Hakan Calim 
<>
  Wed, 2 Jun 2010 12:42:47 +0200
+ -- Hakan Calim 
<>
  Wed, 31 Aug 2011 12:42:47 +0200

Modified: 
branches/perfsonar-oppd-all-0.53/build/debian/perfsonar-oppd-debian/changelog
===================================================================
--- 
branches/perfsonar-oppd-all-0.53/build/debian/perfsonar-oppd-debian/changelog 
      2011-09-13 10:36:34 UTC (rev 740)
+++ 
branches/perfsonar-oppd-all-0.53/build/debian/perfsonar-oppd-debian/changelog 
      2011-09-14 10:42:58 UTC (rev 741)
@@ -1,4 +1,4 @@
-perfsonar-oppd (0.53-0rc1) unstable; urgency=low
+perfsonar-oppd (0.53-1) unstable; urgency=low
   * Creating package from new OPPD architecture
   * 
 

Modified: 
branches/perfsonar-oppd-all-0.53/build/debian/perfsonar-oppd-debian/control
===================================================================
--- 
branches/perfsonar-oppd-all-0.53/build/debian/perfsonar-oppd-debian/control 
2011-09-13 10:36:34 UTC (rev 740)
+++ 
branches/perfsonar-oppd-all-0.53/build/debian/perfsonar-oppd-debian/control 
2011-09-14 10:42:58 UTC (rev 741)
@@ -8,7 +8,7 @@
 
 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,
 liblog-log4perl-perl
+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,
 liblog-log4perl-perl,libnmwg-perl (>= 0.03)
 Conflicts: oppd,perfsonar-oppd-mp-bwctl (<= 0.52)
 Replaces: oppd,perfsonar-oppd-mp-bwctl (<= 0.52)
 Description: open PERL perfSONAR daemon

Modified: 
branches/perfsonar-oppd-all-0.53/build/debian/perfsonar-oppd-ma-hades-debian/changelog
===================================================================
--- 
branches/perfsonar-oppd-all-0.53/build/debian/perfsonar-oppd-ma-hades-debian/changelog
      2011-09-13 10:36:34 UTC (rev 740)
+++ 
branches/perfsonar-oppd-all-0.53/build/debian/perfsonar-oppd-ma-hades-debian/changelog
      2011-09-14 10:42:58 UTC (rev 741)
@@ -1,4 +1,4 @@
-perfsonar-oppd-ma-hades (0.53-0rc1) unstable; urgency=low
+perfsonar-oppd-ma-hades (0.53-1) unstable; urgency=low
 
   * Initial release
 

Modified: 
branches/perfsonar-oppd-all-0.53/build/debian/perfsonar-oppd-ma-hades-debian/control
===================================================================
--- 
branches/perfsonar-oppd-all-0.53/build/debian/perfsonar-oppd-ma-hades-debian/control
        2011-09-13 10:36:34 UTC (rev 740)
+++ 
branches/perfsonar-oppd-all-0.53/build/debian/perfsonar-oppd-ma-hades-debian/control
        2011-09-14 10:42:58 UTC (rev 741)
@@ -9,8 +9,8 @@
 Package: perfsonar-oppd-ma-hades
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Pre-Depends: perfsonar-oppd ( >= 0.53)
-Description: perfSONAR::MP::OWAMP Perl module, plugin for oppd 
+Pre-Depends: perfsonar-oppd ( >= 0.53),hades-server ( >= 1.0)
+Description: perfSONAR::MA::HADES 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
  compilers and installed libraries) and any other information that should be

Modified: 
branches/perfsonar-oppd-all-0.53/build/debian/perfsonar-oppd-ma-hades-debian/postinst
===================================================================
--- 
branches/perfsonar-oppd-all-0.53/build/debian/perfsonar-oppd-ma-hades-debian/postinst
       2011-09-13 10:36:34 UTC (rev 740)
+++ 
branches/perfsonar-oppd-all-0.53/build/debian/perfsonar-oppd-ma-hades-debian/postinst
       2011-09-14 10:42:58 UTC (rev 741)
@@ -16,17 +16,25 @@
 #          <conflicting-package> <version>
 # for details, see http://www.debian.org/doc/debian-policy/ or
 # the debian-policy package
+INSTALL_BASE=/usr/lib/perfsonar/services/oppd
 
-
 case "$1" in
        configure)
-       if [ ! -f /var/run/oppd.pid ]; then
-               if which invoke-rc.d >/dev/null 2>&1; then
-                 invoke-rc.d oppd start
-               else
-                       /etc/init.d/oppd start
-               fi
+       #if [ ! -f /var/run/oppd.pid ]; then
+       #       if which invoke-rc.d >/dev/null 2>&1; then
+        #         invoke-rc.d oppd start
+       #       else
+       #               /etc/init.d/oppd start
+       #       fi
+       #fi
+        if [ -d /opt/hades/lib ]; then
+               ln -s /opt/hades/lib/Hades $INSTALL_BASE/lib/Hades
+               ln -s /opt/hades/lib/Hades.pm $INSTALL_BASE/lib/Hades.pm
        fi
+        echo -e 
"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n"
+       echo -e "!!!! Please set /etc/oppd.d/hades.conf and                   
!!!!\n"
+       echo -e "!!!! /etc/oppd.d/hades-status.conf to the hades server data  
!!!!\n"
+       echo -e 
"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n"
        ;;
 
 

Modified: 
branches/perfsonar-oppd-all-0.53/build/debian/perfsonar-oppd-ma-hades-debian/postrm
===================================================================
--- 
branches/perfsonar-oppd-all-0.53/build/debian/perfsonar-oppd-ma-hades-debian/postrm
 2011-09-13 10:36:34 UTC (rev 740)
+++ 
branches/perfsonar-oppd-all-0.53/build/debian/perfsonar-oppd-ma-hades-debian/postrm
 2011-09-14 10:42:58 UTC (rev 741)
@@ -17,17 +17,16 @@
 #          <overwriter-version>
 # for details, see http://www.debian.org/doc/debian-policy/ or
 # the debian-policy package
+INSTALL_BASE=/usr/lib/perfsonar/services/oppd/
 
-
 case "$1" in
     purge|remove|upgrade)
-    if [ ! -a /var/run/oppd.pid ] && [  -a /etc/init.d/oppd ]; then
-       if which invoke-rc.d >/dev/null 2>&1; then
-                invoke-rc.d oppd start
-       else
-                /etc/init.d/oppd start
-       fi
+    if [ -e $INSTALL_BASE/lib/Hades ]; then
+                rm $INSTALL_BASE/lib/Hades
     fi
+    if [ -e $INSTALL_BASE/lib/Hades.pm ]; then
+               rm $INSTALL_BASE/lib/Hades.pm
+    fi
     ;;
 
     failed-upgrade|abort-install|abort-upgrade|disappear)

Modified: 
branches/perfsonar-oppd-all-0.53/build/debian/perfsonar-oppd-mp-bwctl-debian/changelog
===================================================================
--- 
branches/perfsonar-oppd-all-0.53/build/debian/perfsonar-oppd-mp-bwctl-debian/changelog
      2011-09-13 10:36:34 UTC (rev 740)
+++ 
branches/perfsonar-oppd-all-0.53/build/debian/perfsonar-oppd-mp-bwctl-debian/changelog
      2011-09-14 10:42:58 UTC (rev 741)
@@ -1,4 +1,4 @@
-perfsonar-oppd-mp-bwctl (0.53-0rc1) unstable; urgency=low
+perfsonar-oppd-mp-bwctl (0.53-1) unstable; urgency=low
 
   * Initial release
 

Modified: 
branches/perfsonar-oppd-all-0.53/build/debian/perfsonar-oppd-mp-owamp-debian/changelog
===================================================================
--- 
branches/perfsonar-oppd-all-0.53/build/debian/perfsonar-oppd-mp-owamp-debian/changelog
      2011-09-13 10:36:34 UTC (rev 740)
+++ 
branches/perfsonar-oppd-all-0.53/build/debian/perfsonar-oppd-mp-owamp-debian/changelog
      2011-09-14 10:42:58 UTC (rev 741)
@@ -1,4 +1,4 @@
-perfsonar-oppd-mp-owamp (0.53-0rc1) unstable; urgency=low
+perfsonar-oppd-mp-owamp (0.53-1) unstable; urgency=low
 
   * Initial release
 

Modified: branches/perfsonar-oppd-all-0.53/build/perfSONAR/MANIFEST
===================================================================
--- branches/perfsonar-oppd-all-0.53/build/perfSONAR/MANIFEST   2011-09-13 
10:36:34 UTC (rev 740)
+++ branches/perfsonar-oppd-all-0.53/build/perfSONAR/MANIFEST   2011-09-14 
10:42:58 UTC (rev 741)
@@ -1,5 +1,7 @@
 bin/oppd.pl
+Build.deb.PL
 Build.PL
+Build.rpm.PL
 Changes
 etc/Auth_request.xml
 etc/Auth_response.xml
@@ -9,8 +11,8 @@
 etc/LS_register.xml
 etc/oppd-mdm.conf
 etc/oppd.conf.example
-etc/oppd.init.redhat
-etc/oppd.sysconfig.redhat
+etc/oppd.default.debian
+etc/oppd.init.debian
 lib/perfSONAR.pm
 lib/perfSONAR/Auth.pm
 lib/perfSONAR/Client/LS.pm
@@ -31,6 +33,7 @@
 Makefile.PL
 MANIFEST                       This list of files
 META.yml
+prepare-oppd-debian.pl
 README
 t/00-load.t
 t/perfSONAR-001-SOAP-Message.t

Modified: branches/perfsonar-oppd-all-0.53/build/perfSONAR/MANIFEST.SKIP
===================================================================
--- branches/perfsonar-oppd-all-0.53/build/perfSONAR/MANIFEST.SKIP      
2011-09-13 10:36:34 UTC (rev 740)
+++ branches/perfsonar-oppd-all-0.53/build/perfSONAR/MANIFEST.SKIP      
2011-09-14 10:42:58 UTC (rev 741)
@@ -40,12 +40,12 @@
 
 #avoid redhat specific files
 #for debian package 
-#\bredhat
-#\bspec
+\bredhat
+\bspec
 
 #avoid debian specific files
 #for rpm package 
-\bdebian
+#\bdebian
 
 
 

Modified: branches/perfsonar-oppd-all-0.53/build/perfSONAR-MA-Hades/META.yml
===================================================================
--- branches/perfsonar-oppd-all-0.53/build/perfSONAR-MA-Hades/META.yml  
2011-09-13 10:36:34 UTC (rev 740)
+++ branches/perfsonar-oppd-all-0.53/build/perfSONAR-MA-Hades/META.yml  
2011-09-14 10:42:58 UTC (rev 741)
@@ -5,18 +5,20 @@
   - 'DFN-Labor 
<>'
 abstract: Hades MA module for perl-perfSONAR
 license: apache
+resources:
+  license: http://apache.org/licenses/LICENSE-2.0
+build_requires:
+  Test::More: 0
 requires:
   perfSONAR: 0.53
-build_requires:
-  Test::More: 0
-generated_by: Module::Build version 0.280801
-meta-spec:
-  url: http://module-build.sourceforge.net/META-spec-v1.2.html
-  version: 1.2
+configure_requires:
+  Module::Build: 0.340201
 provides:
   perfSONAR::MA::Hades:
     file: lib/perfSONAR/MA/Hades.pm
   perfSONAR::MA::Status:
     file: lib/perfSONAR/MA/Status.pm
-resources:
-  license: http://apache.org/licenses/LICENSE-2.0
+generated_by: Module::Build version 0.340201
+meta-spec:
+  url: http://module-build.sourceforge.net/META-spec-v1.4.html
+  version: 1.4