Commit d2c40344 authored by Adam Mercer's avatar Adam Mercer

Merge branch 'merge-release-branch' into 'master'

Merge release branch

See merge request !852
parents 58160213 d0b3d8df
Pipeline #68412 passed with stages
in 183 minutes and 41 seconds
AC_PREREQ([2.63]) AC_PREREQ([2.63])
AC_INIT([LALSuite],[6.58.1],[lal-discuss@ligo.org]) AC_INIT([LALSuite],[6.59.1],[lal-discuss@ligo.org])
AC_CONFIG_SRCDIR([configure.ac]) AC_CONFIG_SRCDIR([configure.ac])
AC_CONFIG_AUX_DIR([gnuscripts]) AC_CONFIG_AUX_DIR([gnuscripts])
AC_CONFIG_MACRO_DIR([gnuscripts]) AC_CONFIG_MACRO_DIR([gnuscripts])
......
AC_PREREQ([2.63]) AC_PREREQ([2.63])
AC_INIT([LAL],[6.20.1.1],[lal-discuss@ligo.org]) AC_INIT([LAL],[6.20.2.1],[lal-discuss@ligo.org])
AC_CONFIG_HEADERS([src/config.h src/LALConfig.h]) AC_CONFIG_HEADERS([src/config.h src/LALConfig.h])
AC_CONFIG_SRCDIR([src/std/LALStdio.h]) AC_CONFIG_SRCDIR([src/std/LALStdio.h])
AC_CONFIG_AUX_DIR([gnuscripts]) AC_CONFIG_AUX_DIR([gnuscripts])
...@@ -89,7 +89,7 @@ LALSUITE_DISTCHECK_CONFIGURE_FLAGS ...@@ -89,7 +89,7 @@ LALSUITE_DISTCHECK_CONFIGURE_FLAGS
# 6. if any interfaces have been removed since the last public release, # 6. if any interfaces have been removed since the last public release,
# then set age to 0. # then set age to 0.
AC_SUBST([LIBCURRENT],[17]) AC_SUBST([LIBCURRENT],[17])
AC_SUBST([LIBREVISION],[0]) AC_SUBST([LIBREVISION],[1])
AC_SUBST([LIBAGE],[0]) AC_SUBST([LIBAGE],[0])
AC_SUBST([LIBVERSION],[${LIBCURRENT}:${LIBREVISION}:${LIBAGE}]) AC_SUBST([LIBVERSION],[${LIBCURRENT}:${LIBREVISION}:${LIBAGE}])
......
lal (6.20.2-1) unstable; urgency=low
* MKL FFT fixes
-- Adam Mercer <adam.mercer@ligo.org> Wed, 26 Jun 2019 09:59:16 -0700
lal (6.20.1-1) unstable; urgency=low lal (6.20.1-1) unstable; urgency=low
* O3 point release * O3 point release
......
...@@ -136,6 +136,9 @@ rm -Rf ${RPM_BUILD_DIR}/%{name}-%{version}%{?nightly:-%{nightly}} ...@@ -136,6 +136,9 @@ rm -Rf ${RPM_BUILD_DIR}/%{name}-%{version}%{?nightly:-%{nightly}}
# dates should be formatted using: 'date +"%a %b %d %Y"' # dates should be formatted using: 'date +"%a %b %d %Y"'
%changelog %changelog
* Wed Jun 26 2019 Adam Mercer <adam.mercer@ligo.org> 6.20.2-1
- MKL FFT fixes
* Fri May 24 2019 Adam Mercer <adam.mercer@ligo.org> 6.20.1-1 * Fri May 24 2019 Adam Mercer <adam.mercer@ligo.org> 6.20.1-1
- O3 point release - O3 point release
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment