Commit 8dd32145 authored by Adam Mercer's avatar Adam Mercer

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

Merge release branch

See merge request !841
parents 25c83c3f adb373c8
Pipeline #68302 failed with stages
in 115 minutes and 5 seconds
AC_PREREQ([2.63]) AC_PREREQ([2.63])
AC_INIT([LALSuite],[6.57.1],[lal-discuss@ligo.org]) AC_INIT([LALSuite],[6.58.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([LALInference],[1.11.0.1],[lal-discuss@ligo.org]) AC_INIT([LALInference],[1.11.1.1],[lal-discuss@ligo.org])
AC_CONFIG_HEADERS([src/config.h src/LALInferenceConfig.h]) AC_CONFIG_HEADERS([src/config.h src/LALInferenceConfig.h])
AC_CONFIG_SRCDIR([src/LALInference.h]) AC_CONFIG_SRCDIR([src/LALInference.h])
AC_CONFIG_AUX_DIR([gnuscripts]) AC_CONFIG_AUX_DIR([gnuscripts])
...@@ -83,9 +83,9 @@ LALSUITE_DISTCHECK_CONFIGURE_FLAGS ...@@ -83,9 +83,9 @@ LALSUITE_DISTCHECK_CONFIGURE_FLAGS
# then increment age. # then increment age.
# 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],[18])
AC_SUBST([LIBREVISION],[0]) AC_SUBST([LIBREVISION],[0])
AC_SUBST([LIBAGE],[0]) AC_SUBST([LIBAGE],[1])
AC_SUBST([LIBVERSION],[${LIBCURRENT}:${LIBREVISION}:${LIBAGE}]) AC_SUBST([LIBVERSION],[${LIBCURRENT}:${LIBREVISION}:${LIBAGE}])
# nightly build # nightly build
......
lalinference (1.11.1-1) unstable; urgency=low
* O3 point release
-- Adam Mercer <adam.mercer@ligo.org> Fri, 21 Jun 2019 11:06:11 -0700
lalinference (1.11.0-1) unstable; urgency=low lalinference (1.11.0-1) unstable; urgency=low
* O3 point release * O3 point release
......
...@@ -225,6 +225,9 @@ rm -Rf ${RPM_BUILD_DIR}/%{name}-%{version}%{?nightly:-%{nightly}} ...@@ -225,6 +225,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
* Fri Jun 21 2019 Adam Mercer <adam.mercer@ligo.org> 1.11.1-1
- O3 point release
* Tue May 21 2019 Adam Mercer <adam.mercer@ligo.org> 1.11.0-1 * Tue May 21 2019 Adam Mercer <adam.mercer@ligo.org> 1.11.0-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