Merge branch 'master' into devel

# Conflicts: # ChangeLog # NEWS # README.md # configure.ac # doc/Doxyfile # doc/source/admin/release_history/index.rst # doc/source/conf.py # sonar-project.properties

Merge branch 'master' into devel
# Conflicts: # ChangeLog # NEWS # README.md # configure.ac # doc/Doxyfile # doc/source/admin/release_history/index.rst # doc/source/conf.py # sonar-project.properties
Jürgen Knödlseder
2 parents 6a46050e a5805388
Showing 5 changed files with 32 additions and 4 deletions
ChangeLog
dev/pkgbuild-macosx.sh
doc/source/admin/download.rst
doc/source/admin/release_history/1.5.3.rst
doc/source/admin/release_history/index.rst
@@ -62,6 +62,14 @@
         Implement Python pickeling support (#1938)
+2019-05-11
+
+        * Bug fix version 1.5.3 released
+        ================================
+
+        Only for compliance with GammaLib 1.5.3
+
+
 2018-04-26
         * Bug fix version 1.5.2 released
@@ -2,7 +2,7 @@
 # ==========================================================================
 # ctools Mac OS X package creation
 #
-# Copyright (C) 2017 Sylvie Brau-Nogué
+# Copyright (C) 2017-2019 Sylvie Brau-Nogué
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -134,7 +134,7 @@ make clean
 # =============== #
 cd $SRCDIR
 if [ ! -d "cfitsio" ]; then
-    wget http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/$CFITSIO.tar.gz
+    wget https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/$CFITSIO.tar.gz
     if [ "$?" -ne "0" ]; then
         echo "*** Unable to download $CFITSIO.tar.gz"
         exit 1
@@ -174,10 +174,12 @@ if [ ! -d &quot;$GAMMALIB&quot; ]; then
         rm -rf $GAMMALIB.tar.gz
         cd $GAMMALIB
     fi
+else
+    cd $GAMMALIB
 fi
 # If we got code from GitLab, then try using release branch, and if not
 # available, use devel branch.
-USE_BRANCH=
+USE_BRANCH=release
 if [ -d ".git" ]; then
     git fetch
     git checkout release
@@ -231,6 +233,8 @@ if [ ! -d &quot;$CTOOLS&quot; ]; then
         rm -rf $CTOOLS.tar.gz
         cd $CTOOLS
     fi
+else
+    cd $CTOOLS
 fi
 # If we got code from GitLab, then use the same branch that was used for
 # GammaLib
@@ -3,7 +3,7 @@
 Download
 ========
-The latest ctools release is ``ctools-1.5.2`` (26 April 2018).
+The latest ctools release is ``ctools-1.5.3`` (11 May 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.5.3 <http://cta.irap.omp.eu/ctools/releases/ctools/ctools-1.5.3.tar.gz>`_
+      - `1.5.3 <http://cta.irap.omp.eu/ctools/releases/gammalib/gammalib-1.5.3.tar.gz>`_
+      - `ctools-1.5.3-macosx10.7.dmg <http://cta.irap.omp.eu/ctools/releases/ctools/ctools-1.5.3-macosx10.7.dmg>`_
     * - `1.5.2 <http://cta.irap.omp.eu/ctools/releases/ctools/ctools-1.5.2.tar.gz>`_
       - `1.5.2 <http://cta.irap.omp.eu/ctools/releases/gammalib/gammalib-1.5.2.tar.gz>`_
       - `ctools-1.5.2-macosx10.7.dmg <http://cta.irap.omp.eu/ctools/releases/ctools/ctools-1.5.2-macosx10.7.dmg>`_
+.. _1.5.3:
+
+ctools 1.5.3 release (11 May 2019)
+==================================
+
+Overview
+--------
+
+ctools 1.5.3 is a bug fix release for ctools release 1.5.
+
+No changes were made to the code base. The bug fix release is made for
+compliance reasons with the GammaLib 1.5.3 bug fix release.
@@ -7,6 +7,7 @@ Release History
    :maxdepth: 1
    ctools 1.6 <1.6>
+   ctools 1.5.3 <1.5.3>
    ctools 1.5.2 <1.5.2>
    ctools 1.5.1 <1.5.1>
    ctools 1.5 <1.5>