Commit 5ad9973c authored by Adam Mercer's avatar Adam Mercer
Browse files

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

Merge release branch

See merge request lscsoft/lalsuite!1367
parents 1afe91fa 53e00643
AC_PREREQ([2.63])
AC_INIT([LALSuite],[6.70.1],[lal-discuss@ligo.org])
AC_INIT([LALSuite],[6.71.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([LAL],[6.22.0.1],[lal-discuss@ligo.org])
AC_INIT([LAL],[7.0.0.1],[lal-discuss@ligo.org])
AC_CONFIG_HEADERS([lib/config.h lib/LALConfig.h])
AC_CONFIG_SRCDIR([lib/std/LALStdio.h])
AC_CONFIG_AUX_DIR([gnuscripts])
......@@ -89,9 +89,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],[19])
AC_SUBST([LIBCURRENT],[20])
AC_SUBST([LIBREVISION],[0])
AC_SUBST([LIBAGE],[1])
AC_SUBST([LIBAGE],[0])
AC_SUBST([LIBVERSION],[${LIBCURRENT}:${LIBREVISION}:${LIBAGE}])
# set library api info - liblalsupport
......
lal (7.0.0-1) unstable; urgency=low
* Update for 7.0.0
-- Adam Mercer <adam.mercer@ligo.org> Mon, 08 Jun 2020 15:04:44 -0700
lal (6.22.0-1) unstable; urgency=low
* Update for 6.22.0
......
......@@ -223,6 +223,9 @@ rm -Rf ${RPM_BUILD_DIR}/%{name}-%{version}%{?nightly:-%{nightly}}
# dates should be formatted using: 'date +"%a %b %d %Y"'
%changelog
* Mon Jun 08 2020 Adam Mercer <adam.mercer@ligo.org> 7.0.0-1
- Update for 7.0.0
* Wed Mar 25 2020 Duncan Macleod <duncan.macleod@ligo.org> 6.22.0-1
- Update for 6.22.0
......
......@@ -9,14 +9,14 @@
{% set url = "file://@TARBALL@" %}
{% set sha256 = "@SHA256@" %}
{% set lal_version = "6.21.0" %}
{% set lal_version = "7.0.0" %}
{% set lalburst_version = "1.5.3" %}
{% set lalframe_version = "1.5.0" %}
{% set lalinference_version = "1.11.4" %}
{% set lalinference_version = "2.0.0" %}
{% set lalinspiral_version = "1.10.0" %}
{% set lalmetaio_version = "1.6.0" %}
{% set lalpulsar_version = "1.18.2" %}
{% set lalsimulation_version = "1.10.0" %}
{% set lalpulsar_version = "2.0.0" %}
{% set lalsimulation_version = "2.1.0" %}
package:
name: {{ name }}
......
AC_PREREQ([2.63])
AC_INIT([LALApps],[6.25.1.1],[lal-discuss@ligo.org])
AC_INIT([LALApps],[6.26.0.1],[lal-discuss@ligo.org])
AC_CONFIG_HEADERS([src/config.h])
AC_CONFIG_SRCDIR([src/lalapps/lalapps.c])
AC_CONFIG_AUX_DIR([gnuscripts])
......@@ -56,14 +56,14 @@ AM_INIT_AUTOMAKE([ \
# version requirements
MIN_FRAMEL_VERSION="8.39.2"
MIN_LAL_VERSION="6.21.0"
MIN_LAL_VERSION="7.0.0"
MIN_LALFRAME_VERSION="1.5.0"
MIN_LALMETAIO_VERSION="1.6.0"
MIN_LALSIMULATION_VERSION="1.10.0"
MIN_LALSIMULATION_VERSION="2.1.0"
MIN_LALBURST_VERSION="1.5.3"
MIN_LALINSPIRAL_VERSION="1.10.0"
MIN_LALPULSAR_VERSION="1.18.2"
MIN_LALINFERENCE_VERSION="1.11.4"
MIN_LALPULSAR_VERSION="2.0.0"
MIN_LALINFERENCE_VERSION="2.0.0"
AC_SUBST([MIN_FRAMEL_VERSION])
AC_SUBST([MIN_LAL_VERSION])
AC_SUBST([MIN_LALFRAME_VERSION])
......
lalapps (6.26.0-1) unstable; urgency=low
* Update for 6.26.0
-- Adam Mercer <adam.mercer@ligo.org> Mon, 08 Jun 2020 16:29:43 -0700
lalapps (6.25.1-1) unstable; urgency=low
* MakeSFTs.c: fix incorrect XLAL error checks
......
......@@ -152,6 +152,9 @@ rm -Rf ${RPM_BUILD_DIR}/%{name}-%{version}%{?nightly:-%{nightly}}
# dates should be formatted using: 'date +"%a %b %d %Y"'
%changelog
* Mon Jun 08 2020 Adam Mercer <adam.mercer@ligo.org> 6.26.0-1
- Update for 6.26.0
* Mon Jan 13 2020 Adam Mercer <adam.mercer@ligo.org> 6.25.1-1
- MakeSFTs.c: fix incorrect XLAL error checks
......
......@@ -10,9 +10,9 @@
{% set sha256 = "@SHA256@" %}
# dependencies
{% set lal_version = "6.21.0" %}
{% set lal_version = "7.0.0" %}
{% set lalmetaio_version = "1.6.0" %}
{% set lalsimulation_version = "1.10.0" %}
{% set lalsimulation_version = "2.1.0" %}
{% set swig_version = "3.0.9" %}
package:
......
AC_PREREQ([2.63])
AC_INIT([LALBurst],[1.5.4.1],[lal-discuss@ligo.org])
AC_INIT([LALBurst],[1.5.5.1],[lal-discuss@ligo.org])
AC_CONFIG_HEADERS([lib/config.h lib/LALBurstConfig.h])
AC_CONFIG_SRCDIR([lib/EPSearch.c])
AC_CONFIG_AUX_DIR([gnuscripts])
......@@ -39,9 +39,9 @@ AM_INIT_AUTOMAKE([ \
])
# version requirements
MIN_LAL_VERSION="6.21.0"
MIN_LAL_VERSION="7.0.0"
MIN_LALMETAIO_VERSION="1.6.0"
MIN_LALSIMULATION_VERSION="1.10.0"
MIN_LALSIMULATION_VERSION="2.1.0"
AC_SUBST([MIN_LAL_VERSION])
AC_SUBST([MIN_LALMETAIO_VERSION])
AC_SUBST([MIN_LALSIMULATION_VERSION])
......
lalburst (1.5.5-1) unstable; urgency=low
* Update for 1.5.5
-- Adam Mercer <adam.mercer@ligo.org> Mon, 08 Jun 2020 15:57:54 -0700
lalburst (1.5.4-1) unstable; urgency=low
* snglcoinc: fix rate_factors for more than two detector cases
......
%define nightly @NIGHTLY_VERSION@%{nil}
%define _sysconfdir %{_prefix}/etc
%define release 3
%define release 1
%define configure_opts %{nil}
%if "%{?nightly:%{nightly}}%{!?nightly:0}" == "%{nil}"
......@@ -236,6 +236,9 @@ rm -Rf ${RPM_BUILD_DIR}/%{name}-%{version}%{?nightly:-%{nightly}}
# dates should be formatted using: 'date +"%a %b %d %Y"'
%changelog
* Mon Jun 08 2020 Adam Mercer <adam.mercer@ligo.org> 1.5.5-1
- Update for 1.5.5
* Fri Dec 20 2019 Adam Mercer <adam.mercer@ligo.org> 1.5.4-1
- snglcoinc: fix rate_factors for more than two detector cases
......
......@@ -9,7 +9,8 @@
{% set url = "file://@TARBALL@" %}
{% set sha256 = "@SHA256@" %}
{% set lal_version = "6.21.0" %}
{% set lal_version = "7.0.0" %}
{% set framel_version = "8.39.2" %}
{% set framecpp_version = "2.5.5" %}
package:
......@@ -33,11 +34,11 @@ requirements:
host:
- lal >={{ lal_version }}a0
- ldas-tools-framecpp >={{ framecpp_version }}
- libframel
- libframel >={{ framel_version }}
run:
- lal >={{ lal_version }}a0
- ldas-tools-framecpp >={{ framecpp_version }}
- libframel
- libframel >={{ framel_version }}
test:
source_files:
......@@ -81,7 +82,7 @@ outputs:
- lal >={{ lal_version }}a0
- {{ pin_subpackage('lalframe', exact=True) }}
- ldas-tools-framecpp >={{ framecpp_version }}
- libframel
- libframel >={{ framel_version }}
- {{ pin_compatible('numpy') }}
- python
- python-lal >={{ lal_version }}a0
......
AC_PREREQ([2.63])
AC_INIT([LALFrame],[1.5.0.1],[lal-discuss@ligo.org])
AC_INIT([LALFrame],[1.5.1.1],[lal-discuss@ligo.org])
AC_CONFIG_HEADERS([lib/config.h lib/LALFrameConfig.h])
AC_CONFIG_SRCDIR([lib/LALFrameIO.c])
AC_CONFIG_AUX_DIR([gnuscripts])
......@@ -40,7 +40,7 @@ AM_INIT_AUTOMAKE([ \
])
# version requirements
MIN_LAL_VERSION="6.21.0"
MIN_LAL_VERSION="7.0.0"
MIN_FRAMECPPC_VERSION="2.5.5"
MIN_FRAMEL_VERSION="8.39.2"
AC_SUBST([MIN_LAL_VERSION])
......@@ -69,7 +69,7 @@ LALSUITE_DISTCHECK_CONFIGURE_FLAGS
# 6. if any interfaces have been removed since the last public release,
# then set age to 0.
AC_SUBST([LIBCURRENT],[11])
AC_SUBST([LIBREVISION],[0])
AC_SUBST([LIBREVISION],[1])
AC_SUBST([LIBAGE],[0])
AC_SUBST([LIBVERSION],[${LIBCURRENT}:${LIBREVISION}:${LIBAGE}])
......
lalframe (1.5.1-1) unstable; urgency=low
* Update for 1.5.1
-- Adam Mercer <adam.mercer@ligo.org> Mon, 08 Jun 2020 15:16:22 -0700
lalframe (1.5.0-1) unstable; urgency=low
* O3b release
......
%define nightly @NIGHTLY_VERSION@%{nil}
%define _sysconfdir %{_prefix}/etc
%define release 4
%define release 1
%define configure_opts %{nil}
%if "%{?nightly:%{nightly}}%{!?nightly:0}" == "%{nil}"
......@@ -203,6 +203,9 @@ rm -Rf ${RPM_BUILD_DIR}/%{name}-%{version}%{?nightly:-%{nightly}}
# dates should be formatted using: 'date +"%a %b %d %Y"'
%changelog
* Mon Jun 08 2020 Adam Mercer <adam.mercer@ligo.org> 1.5.1-1
- Update for 1.5.1
* Mon Dec 09 2019 Adam Mercer <adam.mercer@ligo.org> 1.5.0-4
- Packaging updates
......
......@@ -10,13 +10,13 @@
{% set sha256 = "@SHA256@" %}
# dependencies
{% set lal_version = "6.21.0" %}
{% set lal_version = "7.0.0" %}
{% set lalburst_version = "1.5.3" %}
{% set lalframe_version = "1.5.0" %}
{% set lalinspiral_version = "1.10.0" %}
{% set lalmetaio_version = "1.6.0" %}
{% set lalpulsar_version = "1.18.2" %}
{% set lalsimulation_version = "2.0.0" %}
{% set lalpulsar_version = "2.0.0" %}
{% set lalsimulation_version = "2.1.0" %}
{% set swig_version = "3.0.9" %}
package:
......
AC_PREREQ([2.63])
AC_INIT([LALInference],[2.0.0.1],[lal-discuss@ligo.org])
AC_INIT([LALInference],[2.0.1.1],[lal-discuss@ligo.org])
AC_CONFIG_HEADERS([lib/config.h lib/LALInferenceConfig.h])
AC_CONFIG_SRCDIR([lib/LALInference.h])
AC_CONFIG_AUX_DIR([gnuscripts])
......@@ -47,13 +47,13 @@ AM_INIT_AUTOMAKE([ \
# version requirements
MIN_GLUE_VERSION="1.54.1"
MIN_LAL_VERSION="6.21.0"
MIN_LAL_VERSION="7.0.0"
MIN_LALMETAIO_VERSION="1.6.0"
MIN_LALFRAME_VERSION="1.5.0"
MIN_LALSIMULATION_VERSION="2.0.0"
MIN_LALSIMULATION_VERSION="2.1.0"
MIN_LALBURST_VERSION="1.5.3"
MIN_LALINSPIRAL_VERSION="1.10.0"
MIN_LALPULSAR_VERSION="1.18.2"
MIN_LALPULSAR_VERSION="2.0.0"
AC_SUBST([MIN_GLUE_VERSION])
AC_SUBST([MIN_LAL_VERSION])
AC_SUBST([MIN_LALMETAIO_VERSION])
......
lalinference (2.0.1-1) unstable; urgency=low
* Update for 2.0.1
-- Adam Mercer <adam.mercer@ligo.org> Mon, 08 Jun 2020 16:25:21 -0700
lalinference (2.0.0-1) unstable; urgency=low
* Update for 2.0.0
......
......@@ -332,6 +332,9 @@ rm -Rf ${RPM_BUILD_DIR}/%{name}-%{version}%{?nightly:-%{nightly}}
# dates should be formatted using: 'date +"%a %b %d %Y"'
%changelog
* Mon Jun 08 2020 Adam Mercer <adam.mercer@ligo.org> 2.0.1-1
- Update for 2.0.1
* Wed Mar 25 2020 Duncan Macleod <duncan.macleod@ligo.org> 2.0.0-1
- Update for 2.0.0
......
......@@ -9,10 +9,10 @@
{% set url = "file://@TARBALL@" %}
{% set sha256 = "@SHA256@" %}
{% set lal_version = "6.21.0" %}
{% set lal_version = "7.0.0" %}
{% set lalframe_version = "1.5.0" %}
{% set lalmetaio_version = "1.6.0" %}
{% set lalsimulation_version = "1.10.0" %}
{% set lalsimulation_version = "2.1.0" %}
{% set lalburst_version = "1.5.3" %}
{% set swig_version = "3.0.9" %}
......
AC_PREREQ([2.63])
AC_INIT([LALInspiral],[1.10.0.1],[lal-discuss@ligo.org])
AC_INIT([LALInspiral],[1.10.1.1],[lal-discuss@ligo.org])
AC_CONFIG_HEADERS([lib/config.h lib/LALInspiralConfig.h])
AC_CONFIG_SRCDIR([lib/LALInspiral.h])
AC_CONFIG_AUX_DIR([gnuscripts])
......@@ -40,10 +40,10 @@ AM_INIT_AUTOMAKE([ \
])
# version requirements
MIN_LAL_VERSION="6.21.0"
MIN_LAL_VERSION="7.0.0"
MIN_LALFRAME_VERSION="1.5.0"
MIN_LALMETAIO_VERSION="1.6.0"
MIN_LALSIMULATION_VERSION="1.10.0"
MIN_LALSIMULATION_VERSION="2.1.0"
MIN_LALBURST_VERSION="1.5.3"
AC_SUBST([MIN_LAL_VERSION])
AC_SUBST([MIN_LALFRAME_VERSION])
......
lalinspiral (1.10.1-1) unstable; urgency=low
* Update for 1.10.1
-- Adam Mercer <adam.mercer@ligo.org> Mon, 08 Jun 2020 16:06:36 -0700
lalinspiral (1.10.0-1) unstable; urgency=low
* O3b release
......
%define nightly @NIGHTLY_VERSION@%{nil}
%define _sysconfdir %{_prefix}/etc
%define release 2
%define release 1
%define configure_opts GSL_LIBS="-lgsl"
%if "%{?nightly:%{nightly}}%{!?nightly:0}" == "%{nil}"
......@@ -242,6 +242,9 @@ rm -Rf ${RPM_BUILD_DIR}/%{name}-%{version}%{?nightly:-%{nightly}}
# dates should be formatted using: 'date +"%a %b %d %Y"'
%changelog
* Mon Jun 08 2020 Adam Mercer <adam.mercer@ligo.org> 1.10.1-1
- Update for 1.10.1
* Mon Dec 09 2019 Adam Mercer <adam.mercer@ligo.org> 1.10.0-2
- Packaging updates
......
......@@ -10,7 +10,7 @@
{% set sha256 = "@SHA256@" %}
# dependencies
{% set lal_version = "6.21.0" %}
{% set lal_version = "7.0.0" %}
{% set swig_version = "3.0.9" %}
package:
......
AC_PREREQ([2.63])
AC_INIT([LALMetaIO],[1.6.0.1],[lal-discuss@ligo.org])
AC_INIT([LALMetaIO],[1.6.1.1],[lal-discuss@ligo.org])
AC_CONFIG_HEADERS([lib/config.h lib/LALMetaIOConfig.h])
AC_CONFIG_SRCDIR([lib/LIGOLwXML.c])
AC_CONFIG_AUX_DIR([gnuscripts])
......@@ -39,7 +39,7 @@ AM_INIT_AUTOMAKE([ \
])
# version requirements
MIN_LAL_VERSION="6.21.0"
MIN_LAL_VERSION="7.0.0"
AC_SUBST([MIN_LAL_VERSION])
AC_CANONICAL_HOST
......
lalmetaio (1.6.1-1) unstable; urgency=low
* Update for 1.6.1
-- Adam Mercer <adam.mercer@ligo.org> Mon, 08 Jun 2020 15:20:01 -0700
lalmetaio (1.6.0-1) unstable; urgency=low
* O3b release
......
%define nightly @NIGHTLY_VERSION@%{nil}
%define _sysconfdir %{_prefix}/etc
%define release 3
%define release 1
%define configure_opts %{nil}
%if "%{?nightly:%{nightly}}%{!?nightly:0}" == "%{nil}"
......@@ -197,6 +197,9 @@ rm -Rf ${RPM_BUILD_DIR}/%{name}-%{version}%{?nightly:-%{nightly}}
# dates should be formatted using: 'date +"%a %b %d %Y"'
%changelog
* Mon Jun 08 2020 Adam Mercer <adam.mercer@ligo.org> 1.6.1-1
- Update for 1.6.1
* Mon Dec 09 2019 Adam Mercer <adam.mercer@ligo.org> 1.6.0-3
- Packaging updates
......
......@@ -9,7 +9,7 @@
{% set url = "file://@TARBALL@" %}
{% set sha256 = "@SHA256@" %}
{% set lal_version = "6.21.0" %}
{% set lal_version = "7.0.0" %}
{% set swig_version = "3.0.9" %}
package:
......
AC_PREREQ([2.63])
AC_INIT([LALPulsar],[1.18.2.1],[lal-discuss@ligo.org])
AC_INIT([LALPulsar],[2.0.0.1],[lal-discuss@ligo.org])
AC_CONFIG_HEADERS([lib/config.h lib/LALPulsarConfig.h])
AC_CONFIG_SRCDIR([lib/ComputeFstat.c])
AC_CONFIG_AUX_DIR([gnuscripts])
......@@ -40,7 +40,7 @@ AM_INIT_AUTOMAKE([ \
])
# version requirements
MIN_LAL_VERSION="6.21.0"
MIN_LAL_VERSION="7.0.0"
AC_SUBST([MIN_LAL_VERSION])
AC_CANONICAL_HOST
......@@ -64,9 +64,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],[20])
AC_SUBST([LIBCURRENT],[21])
AC_SUBST([LIBREVISION],[0])
AC_SUBST([LIBAGE],[1])
AC_SUBST([LIBAGE],[0])
AC_SUBST([LIBVERSION],[${LIBCURRENT}:${LIBREVISION}:${LIBAGE}])
# nightly build
......
lalpulsar (2.0.0-1) unstable; urgency=low
* Update for 2.0.0
-- Adam Mercer <adam.mercer@ligo.org> Mon, 08 Jun 2020 16:16:22 -0700
lalpulsar (1.18.2-1) unstable; urgency=low
* O3b release
......
%define nightly @NIGHTLY_VERSION@%{nil}
%define _sysconfdir %{_prefix}/etc
%define release 2
%define release 1
%define configure_opts --enable-cfitsio GSL_LIBS="-lgsl" CFITSIO_LIBS="-lcfitsio"
%if "%{?nightly:%{nightly}}%{!?nightly:0}" == "%{nil}"
......@@ -207,6 +207,9 @@ rm -Rf ${RPM_BUILD_DIR}/%{name}-%{version}%{?nightly:-%{nightly}}
# dates should be formatted using: 'date +"%a %b %d %Y"'
%changelog
* Mon Jun 08 2020 Adam Mercer <adam.mercer@ligo.org> 2.0.0-1
- Update for 2.0.0
* Mon Dec 09 2019 Adam Mercer <adam.mercer@ligo.org> 1.18.2-2
- Packaging updates
......
......@@ -10,7 +10,7 @@
{% set sha256 = "@SHA256@" %}
# dependencies
{% set lal_version = "6.22.0" %}
{% set lal_version = "7.0.0" %}
{% set swig_version = "3.0.9" %}
package:
......
AC_PREREQ([2.63])
AC_INIT([LALSimulation],[2.0.0.1],[lal-discuss@ligo.org])
AC_INIT([LALSimulation],[2.1.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])
......@@ -42,7 +42,7 @@ AM_INIT_AUTOMAKE([ \
])
# version requirements
MIN_LAL_VERSION="6.22.0"
MIN_LAL_VERSION="7.0.0"
AC_SUBST([MIN_LAL_VERSION])
AC_CANONICAL_HOST
......@@ -66,9 +66,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],[23])
AC_SUBST([LIBCURRENT],[24])
AC_SUBST([LIBREVISION],[0])
AC_SUBST([LIBAGE],[0])
AC_SUBST([LIBAGE],[1])
AC_SUBST([LIBVERSION],[${LIBCURRENT}:${LIBREVISION}:${LIBAGE}])
# nightly build
......
lalsimulation (2.1.0-1) unstable; urgency=low
* Update for 2.1.0
-- Adam Mercer <adam.mercer@ligo.org> Mon, 08 Jun 2020 15:36:49 -0700
lalsimulation (2.0.0-1) unstable; urgency=low
* Update for 2.0.0
......
......@@ -205,6 +205,9 @@ rm -Rf ${RPM_BUILD_DIR}/%{name}-%{version}%{?nightly:-%{nightly}}
# dates should be formatted using: 'date +"%a %b %d %Y"'
%changelog
* Mon Jun 08 2020 Adam Mercer <adam.mercer@ligo.org> 2.1.0-1
- Update for 2.1.0
* Wed Mar 25 2020 Duncan Macleod <duncan.macleod@ligo.org> 2.0.0-1
- Update for 2.0.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