Commit 0e56b1fd authored by Duncan Macleod's avatar Duncan Macleod
Browse files

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

Merge release branch

Closes #338

See merge request lscsoft/lalsuite!1400
parents 78b7b051 5a6d1642
AC_PREREQ([2.63])
AC_INIT([LALSuite],[6.73.1],[lal-discuss@ligo.org])
AC_INIT([LALSuite],[6.74.1],[lal-discuss@ligo.org])
AC_CONFIG_SRCDIR([configure.ac])
AC_CONFIG_AUX_DIR([gnuscripts])
AC_CONFIG_MACRO_DIR([gnuscripts])
......
AC_PREREQ([2.63])
AC_INIT([LALSimulation],[2.1.0.1],[lal-discuss@ligo.org])
AC_INIT([LALSimulation],[2.2.0.1],[lal-discuss@ligo.org])
AC_CONFIG_HEADERS([lib/config.h lib/LALSimulationConfig.h])
AC_CONFIG_SRCDIR([lib/LALSimulation.c])
AC_CONFIG_AUX_DIR([gnuscripts])
......@@ -69,9 +69,9 @@ LALSUITE_DISTCHECK_CONFIGURE_FLAGS
# then increment age.
# 6. if any interfaces have been removed since the last public release,
# then set age to 0.
AC_SUBST([LIBCURRENT],[24])
AC_SUBST([LIBCURRENT],[25])
AC_SUBST([LIBREVISION],[0])
AC_SUBST([LIBAGE],[1])
AC_SUBST([LIBAGE],[2])
AC_SUBST([LIBVERSION],[${LIBCURRENT}:${LIBREVISION}:${LIBAGE}])
# nightly build
......
lalsimulation (2.2.0-1) unstable; urgency=low
* Update for 2.2.0
-- Adam Mercer <adam.mercer@ligo.org> Mon, 20 Jul 2020 10:49:28 -0700
lalsimulation (2.1.0-1) unstable; urgency=low
* Update for 2.1.0
......
......@@ -206,6 +206,9 @@ rm -Rf ${RPM_BUILD_DIR}/%{name}-%{version}%{?nightly:-%{nightly}}
# dates should be formatted using: 'date +"%a %b %d %Y"'
%changelog
* Mon Jul 20 2020 Adam Mercer <adam.mercer@ligo.org> 2.2.0-2
- Update for 2.2.0
* Mon Jun 08 2020 Adam Mercer <adam.mercer@ligo.org> 2.1.0-1
- Update for 2.1.0
......
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