perfsonar development work

Author: nordunet.behrmann
Date: 2012-07-17 09:51:47 +0100 (Tue, 17 Jul 2012)
New Revision: 5940

Modified:
   trunk/perfsonar-java-sql-ma/packaging/deb/docs
   trunk/perfsonar-java-sql-ma/packaging/deb/install
   trunk/perfsonar-java-sql-ma/packaging/package.sh
Log:
perfsonar-java-sql-ma: Added all docs and samples

The Debian packages lacked the subdirectories of the docs
and samples directories. These directories are present in the
rpm packages.

Without the samples, the "Test" link in the web admin GUI
will always fail. The installation guide instructs the user
to use the "Test" link and thus it must not fail.

Modified: trunk/perfsonar-java-sql-ma/packaging/deb/docs
===================================================================
--- trunk/perfsonar-java-sql-ma/packaging/deb/docs      2012-07-04 12:35:28 
UTC (rev 5939)
+++ trunk/perfsonar-java-sql-ma/packaging/deb/docs      2012-07-17 08:51:47 
UTC (rev 5940)
@@ -1 +1,2 @@
+doc/*
 

Modified: trunk/perfsonar-java-sql-ma/packaging/deb/install
===================================================================
--- trunk/perfsonar-java-sql-ma/packaging/deb/install   2012-07-04 12:35:28 
UTC (rev 5939)
+++ trunk/perfsonar-java-sql-ma/packaging/deb/install   2012-07-17 08:51:47 
UTC (rev 5940)
@@ -1,5 +1,4 @@
 build/geant2-java-sql-ma/* /usr/lib/perfsonar/services/geant2-java-sql-ma
-doc/* /usr/share/doc/perfsonar-java-sql-ma/spec/
 samples /usr/lib/perfsonar/services/geant2-java-sql-ma/WEB-INF
 debian/geant2-java-sql-ma.xml /etc/tomcat6/Catalina/localhost/
 

Modified: trunk/perfsonar-java-sql-ma/packaging/package.sh
===================================================================
--- trunk/perfsonar-java-sql-ma/packaging/package.sh    2012-07-04 12:35:28 
UTC (rev 5939)
+++ trunk/perfsonar-java-sql-ma/packaging/package.sh    2012-07-17 08:51:47 
UTC (rev 5940)
@@ -62,9 +62,9 @@
        echo " Copying build/geant2-java-sql-ma to temp/deb/build"      
        cp -av ../build/$SERVICE_NAME/* temp/deb/build/$SERVICE_NAME/
        echo " Copying doc file"
-       cp -v ../doc/* temp/deb/doc/
+       cp -av ../doc/* temp/deb/doc/
        echo " Copying samples file"
-       cp -v ../samples/* temp/deb/samples/
+       cp -av ../samples/* temp/deb/samples/
        echo "[ ] Copying package files"    
        cp -v deb/* temp/deb/debian
        echo