Merge branch 'release' into integration

# Conflicts: # NEWS # README.md # configure.ac # doc/Doxyfile # doc/source/conf.py # sonar-project.properties

Merge branch 'release' into integration
# Conflicts: # NEWS # README.md # configure.ac # doc/Doxyfile # doc/source/conf.py # sonar-project.properties
Jürgen Knödlseder
2 parents 2b961924 eb916ad8
Showing 7 changed files with 82 additions and 33 deletions
ChangeLog
NEWS
doc/source/admin/download.rst
doc/source/admin/release_history/1.6.1.rst
doc/source/admin/release_history/1.7.rst
doc/source/admin/release_history/index.rst
src/ctools-setup.in
@@ -4,6 +4,14 @@
         ========================
+2019-06-05
+
+        * Bug fix version 1.6.1 released
+        ================================
+
+        Fix initialisation script for c-shell (#2724)
+
+
 2019-05-29
         * Version 1.6.0 released
 New Features and Important Changes in ctools 1.7.0
-29 May 2019
+5 June 2019
 Introduction
@@ -3,7 +3,7 @@
 Download
 ========
-The latest ctools release is ``ctools-1.6.0`` (29 May 2019).
+The latest ctools release is ``ctools-1.6.1`` (5 June 2019).
 Below a table of ctools releases. Please read the :ref:`sec_release` to
 learn more about new features and corrected bugs in a given release.
@@ -23,6 +23,9 @@ learn more about new features and corrected bugs in a given release.
     * - ctools
       - gammalib
       - Mac OS X (10.7+) binary disk image
+    * - `1.6.1 <http://cta.irap.omp.eu/ctools/releases/ctools/ctools-1.6.1.tar.gz>`_
+      - `1.6.1 <http://cta.irap.omp.eu/ctools/releases/gammalib/gammalib-1.6.1.tar.gz>`_
+      - `ctools-1.6.1-macosx10.7.dmg <http://cta.irap.omp.eu/ctools/releases/ctools/ctools-1.6.1-macosx10.7.dmg>`_
     * - `1.6.0 <http://cta.irap.omp.eu/ctools/releases/ctools/ctools-1.6.0.tar.gz>`_
       - `1.6.0 <http://cta.irap.omp.eu/ctools/releases/gammalib/gammalib-1.6.0.tar.gz>`_
       - `ctools-1.6.0-macosx10.7.dmg <http://cta.irap.omp.eu/ctools/releases/ctools/ctools-1.6.0-macosx10.7.dmg>`_
+.. _1.6.1:
+
+ctools 1.6.1 release (5 June 2019)
+==================================
+
+Overview
+--------
+
+ctools 1.6.1 is a bug fix release for ctools release 1.6.
+
+The following bugs were fixed:
+
+* [`2724 <https://cta-redmine.irap.omp.eu/issues/2724>`_] -
+  Fix initialisation script for c-shell
+.. _1.7:
+
+ctools 1.7 release
+==================
+
+Overview
+--------
+
+ctools 1.7 is a major release that adds significant functionality.
+
+In particular, this release provides:
+
+* ...
+* ...
+
+
+Bug fixes
+---------
+
+
+
+Improvements
+------------
+
+
+
+New features
+------------
+
+
+
+Clean up
+--------
+
@@ -6,6 +6,8 @@ Release History
 .. toctree::
    :maxdepth: 1
+   ctools 1.7 <1.7>
+   ctools 1.6.1 <1.6.1>
    ctools 1.6 <1.6>
    ctools 1.5.4 <1.5.4>
    ctools 1.5.3 <1.5.3>
-#  Filename:   ctools-setup(.in)
+#! /bin/sh
+# Filename:    ctools-setup(.in)
 # Description: Writes an initialization script for ctools software
 #              which is custom fit to the user and the particular
 #              software installation. Note that this script is
@@ -82,35 +83,6 @@ if [ -d $prefix/syspfiles/. ]; then
 fi
 #
-# Set LD_LIBRARY_PATH
-# ===================
-if [ -z "${LD_LIBRARY_PATH}" ]; then
-  LD_LIBRARY_PATH=$ctools_lib
-else
-  LD_LIBRARY_PATH=$ctools_lib:$LD_LIBRARY_PATH
-fi
-
-#
-# Set DYLD_LIBRARY_PATH if required
-# =================================
-case $uname_system in
-  Darwin*)
-    if [ -z "${DYLD_LIBRARY_PATH}" ]; then
-      DYLD_LIBRARY_PATH=$ctools_lib
-    else
-      DYLD_LIBRARY_PATH=$ctools_lib:$DYLD_LIBRARY_PATH
-    fi
-    ;;
-  CYGWIN*)
-    if [ -z "${PATH}" ]; then
-      PATH=$ctools_lib
-    else
-      PATH=$ctools_lib:$PATH
-    fi
-    ;;
-esac
-
-#
 # Set PYTHONPATH
 # ==============
 if [ -z "${PYTHONPATH}" ]; then
@@ -163,11 +135,27 @@ fi
 #
 # List of variables needed in initialization script
 # =================================================
-varlist="LD_LIBRARY_PATH DYLD_LIBRARY_PATH PATH"
+varlist="PATH"
 varlist="$varlist PYTHONPATH PKG_CONFIG_PATH MANPATH"
 varlist="$varlist PFILES PFCLOBBER CALDB"
 #
+# Set LD_LIBRARY_PATH
+# ===================
+case $uname_system in
+  Darwin*)
+    ;;
+  *)
+    if [ -z "${LD_LIBRARY_PATH}" ]; then
+      LD_LIBRARY_PATH=$ctools_lib
+    else
+      LD_LIBRARY_PATH=$ctools_lib:$LD_LIBRARY_PATH
+    fi
+    varlist="$varlist LD_LIBRARY_PATH"
+    ;;
+esac
+
+#
 # Save values in output initialization shell scripts
 # ==================================================
 # Name of temporary config script