added GPLv3. moved examples to /usr/share/doc/kaliveda/examples/

CMakeLists.txt

@@ -333,6 +333,9 @@ install(PROGRAMS tools/SetUpKaliVeda.sh tools/SetUpROOT.sh tools/WhichROOT
 install(FILES tools/.nedit DESTINATION ${CMAKE_INSTALL_SYSCONFDIR} RENAME nedit.cf)
 install(FILES tools/kaliveda.m4 DESTINATION ${CMAKE_INSTALL_SYSCONFDIR})
 
+#---install README, COPYING, etc. in ${CMAKE_INSTALL_DOCDIR}
+install(FILES COPYING INSTALL README.md DESTINATION ${CMAKE_INSTALL_DOCDIR})
+
 #---install exported targets file for use by other projects
 install(EXPORT ${CMAKE_PROJECT_NAME}Exports DESTINATION ${CMAKE_INSTALL_CMAKEPKGDIR} FILE ${CMAKE_PROJECT_NAME}-targets.cmake)
 

cmake/KaliVedaInstallDirs.cmake

@@ -58,6 +58,11 @@ if(gnuinstall)
 else()
   set(CMAKE_INSTALL_DATAROOTDIR "KVFiles")
 endif()
+if(gnuinstall)
+  set(CMAKE_INSTALL_DOCDIR "share/doc/kaliveda")
+else()
+  set(CMAKE_INSTALL_DOCDIR ".")
+endif()
 if(gnuinstall)
   set(CMAKE_INSTALL_SYSCONFDIR "share/kaliveda/etc")
 else()
@@ -84,11 +89,7 @@ if(gnuinstall)
 else()
   set(CMAKE_INSTALL_TMPLDIR "${CMAKE_INSTALL_DATAROOTDIR}")
 endif()
-if(gnuinstall)
-  set(CMAKE_INSTALL_TUTDIR "share/kaliveda/examples")
-else()
-  set(CMAKE_INSTALL_TUTDIR "examples")
-endif()
+set(CMAKE_INSTALL_TUTDIR "${CMAKE_INSTALL_DOCDIR}/examples")
 set(CMAKE_INSTALL_DATASETDIR "${CMAKE_INSTALL_DATAROOTDIR}")
 set(CMAKE_INSTALL_CMAKEPKGDIR "${CMAKE_INSTALL_LIBDIR}/kaliveda")
 
@@ -104,6 +105,7 @@ mark_as_advanced(
   CMAKE_INSTALL_DATAROOTDIR
   CMAKE_INSTALL_DATASETDIR
   CMAKE_INSTALL_DATADIR
+  CMAKE_INSTALL_DOCDIR
   CMAKE_INSTALL_CMAKEDIR
   CMAKE_INSTALL_CMAKEPKGDIR
   CMAKE_INSTALL_TMPLDIR
@@ -120,6 +122,7 @@ foreach(dir BINDIR
             DATAROOTDIR
             DATASETDIR
             DATADIR
+            DOCDIR
             CMAKEDIR 
             TMPLDIR 
             TUTDIR

debian/changelog

-kaliveda (1.10.7-0ubuntu3) UNRELEASED; urgency=medium
+kaliveda (1.10.7-0ubuntu5) UNRELEASED; urgency=medium
 
   * New release v1.10/07
   * removal of KVINDRAFAZIA from FAZIA subproject
   * cmake minimum version 2.8.11; FAZIASYM/Runlist.csv removed
+  * moved examples to new /usr/share/doc/kaliveda directory
+  * added GNU GPL v3 in COPYING file, installed in /usr/share/doc/kaliveda directory
+  * corrected missing examples installation
 
- -- John Frankland <frankland@ganil.fr>  Mon, 08 Feb 2016 11:02:12 +0100
+ -- John Frankland <frankland@ganil.fr>  Mon, 08 Feb 2016 14:22:07 +0100
 
 kaliveda (1.10.6-0ubuntu1) wily; urgency=medium
 

debian/libkaliveda-dev.dirs

@@ -2,5 +2,5 @@
 /usr/include/kaliveda
 /usr/lib
 /usr/lib/kaliveda
+/usr/share/doc/kaliveda/examples/KVMultiDet
 /usr/share/kaliveda/etc
-/usr/share/kaliveda/examples/KVMultiDet

debian/libkaliveda-dev.install

-/usr/share/kaliveda/examples/KVMultiDet/base_kvbase.C
-/usr/share/kaliveda/examples/KVMultiDet/base_kvnumberlist.C
-/usr/share/kaliveda/examples/KVMultiDet/ClassTraj.cpp
-/usr/share/kaliveda/examples/KVMultiDet/ClassTraj.h
-/usr/share/kaliveda/examples/KVMultiDet/KVEvent_iterator_example.C
-/usr/share/kaliveda/examples/KVMultiDet/KVGenPhaseSpace_example2.C
-/usr/share/kaliveda/examples/KVMultiDet/KVGenPhaseSpace_example.C
+/usr/share/doc/kaliveda/examples/KVMultiDet/base_kvbase.C
+/usr/share/doc/kaliveda/examples/KVMultiDet/base_kvnumberlist.C
+/usr/share/doc/kaliveda/examples/KVMultiDet/ClassTraj.cpp
+/usr/share/doc/kaliveda/examples/KVMultiDet/ClassTraj.h
+/usr/share/doc/kaliveda/examples/KVMultiDet/KVEvent_iterator_example.C
+/usr/share/doc/kaliveda/examples/KVMultiDet/KVGenPhaseSpace_example2.C
+/usr/share/doc/kaliveda/examples/KVMultiDet/KVGenPhaseSpace_example.C
 /usr/lib/libKVMultiDetanalysis.so
 /usr/lib/libKVMultiDetdata_management.so
 /usr/lib/libKVMultiDetparticles.so

debian/libkaliveda-microstat-dev.dirs

 /usr/include/kaliveda
 /usr/lib
-/usr/share/kaliveda/examples/MicroStat
+/usr/share/doc/kaliveda/examples/MicroStat

debian/libkaliveda-microstat-dev.install

-/usr/share/kaliveda/examples/MicroStat/MicroStat_example2.C
-/usr/share/kaliveda/examples/MicroStat/MicroStat_example.C
+/usr/share/doc/kaliveda/examples/MicroStat/MicroStat_example2.C
+/usr/share/doc/kaliveda/examples/MicroStat/MicroStat_example.C
 /usr/lib/libMicroStatmontecarlo.so
 /usr/lib/libMicroStatweights.so
 /usr/lib/libMicroStatweights.rootmap

debian/libkaliveda.dirs

 /usr/lib
+/usr/share/doc/kaliveda
 /usr/share/kaliveda/data
 /usr/share/kaliveda/etc
 /usr/share/kaliveda/templates

debian/libkaliveda.install

@@ -45,6 +45,9 @@
 /usr/lib/libKVMultiDetparticles.so.1.10.07
 /usr/lib/libKVMultiDetevents.so.1
 /usr/lib/libKVMultiDetevents.so.1.10.07
+/usr/share/doc/kaliveda/README.md
+/usr/share/doc/kaliveda/COPYING
+/usr/share/doc/kaliveda/INSTALL
 /usr/share/kaliveda/etc/config.files
 /usr/share/kaliveda/etc/KaliVeda.par
 /usr/lib/libfitltg.so

tools/make_deb_files.sh

@@ -122,7 +122,7 @@ for etc in $etcfiles; do
    echo "/usr/share/kaliveda/etc/$etc" >> $install_file
 done
 for exmpl in $exmplfiles; do
-   echo "/usr/share/kaliveda/examples/$3/$exmpl" >> $dev_install_file
+   echo "/usr/share/doc/kaliveda/examples/$3/$exmpl" >> $dev_install_file
 done
 for lib in $devlibs; do
    echo "/$lib" >> $dev_install_file
@@ -137,7 +137,7 @@ for lib in $libs; do
    echo "/$lib" >> $install_file
 done
 if [ "x$3" = "xKVMultiDet" ]; then
-  extras="/usr/share/kaliveda/etc/config.files /usr/share/kaliveda/etc/KaliVeda.par /usr/lib/libfitltg.so /usr/lib/libgan_tape.so"
+  extras="/usr/share/doc/kaliveda/README.md /usr/share/doc/kaliveda/COPYING /usr/share/doc/kaliveda/INSTALL /usr/share/kaliveda/etc/config.files /usr/share/kaliveda/etc/KaliVeda.par /usr/lib/libfitltg.so /usr/lib/libgan_tape.so"
   tools="/usr/bin/kaliveda /usr/bin/kaliveda-sim /usr/bin/update_runlist /usr/bin/kvtreeanalyzer /usr/bin/kvdatanalyser /usr/bin/KaliVedaAnalysis"
   dev_extras="/usr/share/kaliveda/etc/kaliveda.m4 /usr/share/kaliveda/etc/nedit.cf /usr/bin/kaliveda-config"
   for e in $extras; do
@@ -186,7 +186,13 @@ if [ "x$reply" = "xy" ]; then
 fi
 cd $2
 cmake $1 -DCMAKE_INSTALL_PREFIX=/usr -Dgnuinstall=yes -DUSE_MICROSTAT=yes -DUSE_ALL=yes -DUSE_GEMINI=no
-make -j3 install DESTDIR=$2/tmp
+if [ $? -ne 0 ]; then
+   exit 1
+fi
+make -j4 install DESTDIR=$2/tmp
+if [ $? -ne 0 ]; then
+   exit 1
+fi
 makeDebFiles $1 $2 KVMultiDet kaliveda
 makeDebFiles $1 $2 KVIndra kaliveda-indra
 makeDebFiles $1 $2 VAMOS kaliveda-indravamos

tools/update_packaging.sh

@@ -18,6 +18,9 @@ fi
 
 # UPDATE PACKAGING
 $1/tools/make_deb_files.sh $1 $2
+if [ $? -ne 0 ]; then
+   exit 1
+fi
 cd $1
 
 # UPDATE debian/changelog