Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package lalmetaio for openSUSE:Factory checked in at 2021-04-21 20:59:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lalmetaio (Old) and /work/SRC/openSUSE:Factory/.lalmetaio.new.12324 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lalmetaio" Wed Apr 21 20:59:04 2021 rev:5 rq:876069 version:2.0.2 Changes: -------- --- /work/SRC/openSUSE:Factory/lalmetaio/lalmetaio.changes 2021-02-16 09:19:10.627182635 +0100 +++ /work/SRC/openSUSE:Factory/.lalmetaio.new.12324/lalmetaio.changes 2021-04-21 20:59:08.578177108 +0200 @@ -1,0 +2,6 @@ +Fri Feb 26 23:06:29 UTC 2021 - Atri Bhattacharya <[email protected]> + +- Update to 2.0.2: + * No release notes. + +------------------------------------------------------------------- Old: ---- lalmetaio-2.0.1.tar.xz New: ---- lalmetaio-2.0.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lalmetaio.spec ++++++ --- /var/tmp/diff_new_pack.P0Ip55/_old 2021-04-21 20:59:09.046177845 +0200 +++ /var/tmp/diff_new_pack.P0Ip55/_new 2021-04-21 20:59:09.050177851 +0200 @@ -22,7 +22,7 @@ # octave >= 6 not supported %bcond_with octave Name: lalmetaio -Version: 2.0.1 +Version: 2.0.2 Release: 0 Summary: LSC Algorithm MetaIO Library License: GPL-2.0-or-later ++++++ lalmetaio-2.0.1.tar.xz -> lalmetaio-2.0.2.tar.xz ++++++ ++++ 2157 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lalmetaio-2.0.1/bin/version.c new/lalmetaio-2.0.2/bin/version.c --- old/lalmetaio-2.0.1/bin/version.c 2021-01-27 17:02:04.479525446 +0100 +++ new/lalmetaio-2.0.2/bin/version.c 2021-02-18 18:08:14.142799138 +0100 @@ -14,8 +14,8 @@ * * You should have received a copy of the GNU General Public License * along with with program; see the file COPYING. If not, write to the - * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301 USA */ #include <stdio.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lalmetaio-2.0.1/bin/version.c.in new/lalmetaio-2.0.2/bin/version.c.in --- old/lalmetaio-2.0.1/bin/version.c.in 2021-01-27 03:45:33.568679568 +0100 +++ new/lalmetaio-2.0.2/bin/version.c.in 2021-02-11 02:06:07.459963059 +0100 @@ -14,8 +14,8 @@ * * You should have received a copy of the GNU General Public License * along with with program; see the file COPYING. If not, write to the - * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301 USA */ #include <stdio.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lalmetaio-2.0.1/conda/build.sh new/lalmetaio-2.0.2/conda/build.sh --- old/lalmetaio-2.0.1/conda/build.sh 2021-01-27 02:36:30.529519798 +0100 +++ new/lalmetaio-2.0.2/conda/build.sh 2021-02-16 00:25:21.757373632 +0100 @@ -21,6 +21,7 @@ --disable-python \ --disable-swig-octave \ --disable-swig-python \ + --enable-help2man \ --enable-swig-iface \ --prefix="${PREFIX}" \ ${EXTRA_CONFIG_FLAGS} \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lalmetaio-2.0.1/conda/install-bin.sh new/lalmetaio-2.0.2/conda/install-bin.sh --- old/lalmetaio-2.0.1/conda/install-bin.sh 2021-01-27 02:36:30.435517706 +0100 +++ new/lalmetaio-2.0.2/conda/install-bin.sh 2021-02-16 00:25:21.740373229 +0100 @@ -11,27 +11,3 @@ # install system configuration files make -j ${CPU_COUNT} V=1 VERBOSE=1 install-sysconfDATA - -# -- create activate/deactivate scripts -PKG_NAME_UPPER=$(echo ${PKG_NAME} | awk '{ print toupper($0) }') - -# activate.sh -ACTIVATE_SH="${PREFIX}/etc/conda/activate.d/activate_${PKG_NAME}.sh" -mkdir -p $(dirname ${ACTIVATE_SH}) -cat > ${ACTIVATE_SH} << EOF -#!/bin/bash -export CONDA_BACKUP_${PKG_NAME_UPPER}_DATADIR="\${${PKG_NAME_UPPER}_DATADIR:-empty}" -export ${PKG_NAME_UPPER}_DATADIR="/opt/anaconda1anaconda2anaconda3/share/${PKG_NAME}" -EOF -# deactivate.sh -DEACTIVATE_SH="${PREFIX}/etc/conda/deactivate.d/deactivate_${PKG_NAME}.sh" -mkdir -p $(dirname ${DEACTIVATE_SH}) -cat > ${DEACTIVATE_SH} << EOF -#!/bin/bash -if [ "\${CONDA_BACKUP_${PKG_NAME_UPPER}_DATADIR}" == "empty" ]; then - unset ${PKG_NAME_UPPER}_DATADIR -else - export ${PKG_NAME_UPPER}_DATADIR="\${CONDA_BACKUP_${PKG_NAME_UPPER}_DATADIR}" -fi -unset CONDA_BACKUP_${PKG_NAME_UPPER}_DATADIR -EOF diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lalmetaio-2.0.1/conda/install-lib.sh new/lalmetaio-2.0.2/conda/install-lib.sh --- old/lalmetaio-2.0.1/conda/install-lib.sh 2021-01-27 02:36:30.435517706 +0100 +++ new/lalmetaio-2.0.2/conda/install-lib.sh 2021-02-16 00:25:21.740373229 +0100 @@ -12,3 +12,30 @@ # install pkg-config make -j ${CPU_COUNT} V=1 VERBOSE=1 install-pkgconfigDATA + +# -- create activate/deactivate scripts + +# strip out the 'lib' package name prefix +LALSUITE_NAME=${PKG_NAME#"lib"} +LALSUITE_NAME_UPPER=$(echo ${LALSUITE_NAME} | awk '{ print toupper($0) }') + +# activate.sh +ACTIVATE_SH="${PREFIX}/etc/conda/activate.d/activate_${PKG_NAME}.sh" +mkdir -p $(dirname ${ACTIVATE_SH}) +cat > ${ACTIVATE_SH} << EOF +#!/bin/bash +export CONDA_BACKUP_${LALSUITE_NAME_UPPER}_DATADIR="\${${LALSUITE_NAME_UPPER}_DATADIR:-empty}" +export ${LALSUITE_NAME_UPPER}_DATADIR="/opt/anaconda1anaconda2anaconda3/share/${LALSUITE_NAME}" +EOF +# deactivate.sh +DEACTIVATE_SH="${PREFIX}/etc/conda/deactivate.d/deactivate_${PKG_NAME}.sh" +mkdir -p $(dirname ${DEACTIVATE_SH}) +cat > ${DEACTIVATE_SH} << EOF +#!/bin/bash +if [ "\${CONDA_BACKUP_${LALSUITE_NAME_UPPER}_DATADIR}" = "empty" ]; then + unset ${LALSUITE_NAME_UPPER}_DATADIR +else + export ${LALSUITE_NAME_UPPER}_DATADIR="\${CONDA_BACKUP_${LALSUITE_NAME_UPPER}_DATADIR}" +fi +unset CONDA_BACKUP_${LALSUITE_NAME_UPPER}_DATADIR +EOF diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lalmetaio-2.0.1/conda/install-python.sh new/lalmetaio-2.0.2/conda/install-python.sh --- old/lalmetaio-2.0.1/conda/install-python.sh 2021-01-27 02:36:30.529519798 +0100 +++ new/lalmetaio-2.0.2/conda/install-python.sh 2021-02-16 00:25:21.758373655 +0100 @@ -20,6 +20,7 @@ ${SRC_DIR}/configure \ --disable-doxygen \ --disable-swig-iface \ + --enable-help2man \ --enable-python \ --enable-swig-python \ --prefix=$PREFIX \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lalmetaio-2.0.1/conda/meta.yaml.in new/lalmetaio-2.0.2/conda/meta.yaml.in --- old/lalmetaio-2.0.1/conda/meta.yaml.in 2021-01-27 17:02:04.270520616 +0100 +++ new/lalmetaio-2.0.2/conda/meta.yaml.in 2021-02-18 18:08:13.897793404 +0100 @@ -5,19 +5,26 @@ # production-ready at any time. {% set name = "lalmetaio" %} -{% set version = "2.0.1".replace('-', '.') %} -{% set url = "file://@TARBALL@" %} -{% set sha256 = "@SHA256@" %} + +# set version based on nightly +# (we rebuild the nightly version ourselves because the tarball might have +# been generate on a different day) +{% set base_version = "2.0.2" %} +{% set nightly_version = "" %} +{% if nightly_version %} +{% set version = base_version + "-dev" + datetime.datetime.utcnow().strftime("%Y%m%d") %} +{% else %} +{% set version = base_version %} +{% endif %} # dependencies {% set lal_version = "7.1.0a0" %} {% set metaio_version = "8.4.0" %} {% set swig_version = "3.0.10" %} -{% set numpy_version = "1.7" %} package: name: {{ name }}-split - version: {{ version }} + version: {{ version|replace('-', '.') }} source: url: file://@TARBALL@ @@ -61,6 +68,15 @@ run: - liblal >={{ lal_version }} - metaio >={{ metaio_version }} + run_constrained: + - lalmetaio >=2.0.1 + - python-lalmetaio >=2.0.1 + test: + requires: + - pkg-config + commands: + - pkg-config --print-errors --exact-version "{{ version }}" lalmetaio + - test -f ${PREFIX}/lib/liblalmetaio${SHLIB_EXT} # [not win] about: home: https://wiki.ligo.org/Computing/LALSuite doc_url: https://lscsoft.docs.ligo.org/lalsuite/lalmetaio/ @@ -85,6 +101,7 @@ requirements: build: - {{ compiler('c') }} + - help2man >=1.37 - make - pkg-config - swig >={{ swig_version }} @@ -93,9 +110,8 @@ - numpy - python run: - - liblal >={{ lal_version }} + - liblal # [linux] - {{ pin_subpackage('liblalmetaio', exact=True) }} - - metaio >={{ metaio_version }} - {{ pin_compatible('numpy') }} - python - python-lal >={{ lal_version }} @@ -130,6 +146,7 @@ requirements: build: - {{ compiler('c') }} + - help2man >=1.37 - make host: - liblal >={{ lal_version }} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lalmetaio-2.0.1/conda/meta.yaml.in.in new/lalmetaio-2.0.2/conda/meta.yaml.in.in --- old/lalmetaio-2.0.1/conda/meta.yaml.in.in 2021-01-27 03:45:33.574679703 +0100 +++ new/lalmetaio-2.0.2/conda/meta.yaml.in.in 2021-02-16 19:02:22.056772749 +0100 @@ -5,19 +5,26 @@ # production-ready at any time. {% set name = "lalmetaio" %} -{% set version = "@VERSION@".replace('-', '.') %} -{% set url = "file://@TARBALL@" %} -{% set sha256 = "@SHA256@" %} + +# set version based on nightly +# (we rebuild the nightly version ourselves because the tarball might have +# been generate on a different day) +{% set base_version = "@BASE_VERSION@" %} +{% set nightly_version = "@NIGHTLY_VERSION@" %} +{% if nightly_version %} +{% set version = base_version + "-dev" + datetime.datetime.utcnow().strftime("%Y%m%d") %} +{% else %} +{% set version = base_version %} +{% endif %} # dependencies {% set lal_version = "@MIN_LAL_VERSION@a0" %} {% set metaio_version = "@MIN_METAIO_VERSION@" %} {% set swig_version = "@MIN_SWIG_VERSION@" %} -{% set numpy_version = "@MIN_NUMPY_VERSION@" %} package: name: {{ name }}-split - version: {{ version }} + version: {{ version|replace('-', '.') }} source: url: file://@TARBALL@ @@ -61,6 +68,15 @@ run: - liblal >={{ lal_version }} - metaio >={{ metaio_version }} + run_constrained: + - lalmetaio >=2.0.1 + - python-lalmetaio >=2.0.1 + test: + requires: + - pkg-config + commands: + - pkg-config --print-errors --exact-version "{{ version }}" lalmetaio + - test -f ${PREFIX}/lib/liblalmetaio${SHLIB_EXT} # [not win] about: home: https://wiki.ligo.org/Computing/LALSuite doc_url: https://lscsoft.docs.ligo.org/lalsuite/lalmetaio/ @@ -85,6 +101,7 @@ requirements: build: - {{ compiler('c') }} + - help2man >=1.37 - make - pkg-config - swig >={{ swig_version }} @@ -93,9 +110,8 @@ - numpy - python run: - - liblal >={{ lal_version }} + - liblal # [linux] - {{ pin_subpackage('liblalmetaio', exact=True) }} - - metaio >={{ metaio_version }} - {{ pin_compatible('numpy') }} - python - python-lal >={{ lal_version }} @@ -130,6 +146,7 @@ requirements: build: - {{ compiler('c') }} + - help2man >=1.37 - make host: - liblal >={{ lal_version }} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lalmetaio-2.0.1/configure.ac new/lalmetaio-2.0.2/configure.ac --- old/lalmetaio-2.0.1/configure.ac 2021-01-27 17:00:49.064782848 +0100 +++ new/lalmetaio-2.0.2/configure.ac 2021-02-18 18:08:01.463502380 +0100 @@ -1,5 +1,5 @@ AC_PREREQ([2.63]) -AC_INIT([LALMetaIO],[2.0.1],[[email protected]]) +AC_INIT([LALMetaIO],[2.0.2],[[email protected]]) AC_CONFIG_HEADERS([lib/config.h lib/LALMetaIOConfig.h]) AC_CONFIG_SRCDIR([lib/LIGOLwXML.c]) AC_CONFIG_AUX_DIR([gnuscripts]) @@ -20,7 +20,7 @@ # 6. if any interfaces have been removed since the last public release, # then set age to 0. AC_SUBST([LIBCURRENT],[8]) -AC_SUBST([LIBREVISION],[2]) +AC_SUBST([LIBREVISION],[3]) AC_SUBST([LIBAGE],[0]) AC_SUBST([LIBVERSION],[${LIBCURRENT}:${LIBREVISION}:${LIBAGE}]) AS_CASE([${host_os}], @@ -117,14 +117,6 @@ # check for header files AC_HEADER_STDC -# check for zlib libraries and headers -PKG_CHECK_MODULES([ZLIB],[zlib],[true],[false]) -LALSUITE_PUSH_UVARS -LALSUITE_ADD_FLAGS([C],[${ZLIB_CFLAGS}],[${ZLIB_LIBS}]) -AC_SEARCH_LIBS([compress],[],[:],[AC_MSG_ERROR([could not find the zlib library])]) -AC_CHECK_HEADER([zlib.h],[:],[AC_MSG_ERROR([could not find the zlib.h header])]) -LALSUITE_POP_UVARS - # math library AC_CHECK_LIB([m],[main],,[AC_MSG_ERROR([could not find the math library])]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lalmetaio-2.0.1/debian/changelog new/lalmetaio-2.0.2/debian/changelog --- old/lalmetaio-2.0.1/debian/changelog 2021-01-27 17:00:49.064782848 +0100 +++ new/lalmetaio-2.0.2/debian/changelog 2021-02-18 18:08:01.463502380 +0100 @@ -1,3 +1,9 @@ +lalmetaio (2.0.2-1) unstable; urgency=low + + * Update for 2.0.2 + + -- Adam Mercer <[email protected]> Fri, 05 Feb 2021 13:39:16 -0700 + lalmetaio (2.0.1-1) unstable; urgency=low * Update for 2.0.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lalmetaio-2.0.1/debian/control new/lalmetaio-2.0.2/debian/control --- old/lalmetaio-2.0.1/debian/control 2021-01-27 17:02:04.294521171 +0100 +++ new/lalmetaio-2.0.2/debian/control 2021-02-18 18:08:13.927794106 +0100 @@ -20,8 +20,8 @@ python3-all-dev, python3-lal (>= 7.1.0~), python3-pytest, + rsync, swig (>= 3.0.10) | swig3.0 (>= 3.0.10), - zlib1g-dev, X-Python-Version: >= 2.7 X-Python3-Version: >= 3.5 Standards-Version: 3.9.8 @@ -47,7 +47,6 @@ liblal-dev (>= 7.1.0~), liblalmetaio8 (= ${binary:Version}), libmetaio-dev (>= 8.4.0), - zlib1g-dev, Description: LSC Algorithm Library MetaIO Developers The LSC Algorithm MetaIO Library for gravitational wave data analysis. This package contains files needed build applications that use the LAL @@ -122,7 +121,7 @@ ${misc:Depends}, ${shlibs:Depends}, liblalmetaio8 (= ${binary:Version}), - python-lalmetaio (= ${binary:Version}), + python3-lalmetaio (= ${binary:Version}), Description: LSC Algorithm Library MetaIO The LSC Algorithm MetaIO Library for gravitational wave data analysis. This package provides the runtime tools. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lalmetaio-2.0.1/debian/control.in new/lalmetaio-2.0.2/debian/control.in --- old/lalmetaio-2.0.1/debian/control.in 2021-01-27 03:45:33.574679703 +0100 +++ new/lalmetaio-2.0.2/debian/control.in 2021-02-11 02:06:07.591966199 +0100 @@ -20,8 +20,8 @@ python3-all-dev, python3-lal (>= @MIN_LAL_VERSION@~), python3-pytest, + rsync, swig (>= @MIN_SWIG_VERSION@) | swig3.0 (>= @MIN_SWIG_VERSION@), - zlib1g-dev, X-Python-Version: >= 2.7 X-Python3-Version: >= 3.5 Standards-Version: 3.9.8 @@ -47,7 +47,6 @@ liblal-dev (>= @MIN_LAL_VERSION@~), liblalmetaio@LIBMAJOR@ (= ${binary:Version}), libmetaio-dev (>= @MIN_METAIO_VERSION@), - zlib1g-dev, Description: LSC Algorithm Library MetaIO Developers The LSC Algorithm MetaIO Library for gravitational wave data analysis. This package contains files needed build applications that use the LAL @@ -122,7 +121,7 @@ ${misc:Depends}, ${shlibs:Depends}, liblalmetaio@LIBMAJOR@ (= ${binary:Version}), - python-lalmetaio (= ${binary:Version}), + python3-lalmetaio (= ${binary:Version}), Description: LSC Algorithm Library MetaIO The LSC Algorithm MetaIO Library for gravitational wave data analysis. This package provides the runtime tools. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lalmetaio-2.0.1/debian/lalsuite.mk new/lalmetaio-2.0.2/debian/lalsuite.mk --- old/lalmetaio-2.0.1/debian/lalsuite.mk 2021-01-27 03:45:33.567679545 +0100 +++ new/lalmetaio-2.0.2/debian/lalsuite.mk 2021-02-11 02:06:07.458963035 +0100 @@ -3,16 +3,18 @@ include /usr/share/dpkg/buildflags.mk include /usr/share/dpkg/pkg-info.mk -HAVE_PYTHON2 := $(if $(shell pyversions -r),yes) -HAVE_PYTHON3 := $(if $(shell py3versions -r),yes) -HAVE_OCTAVE := $(if $(shell grep $(DEB_SOURCE)-octave debian/control),yes) +DH_PACKAGES := $(shell dh_listpackages) +WITH_PYTHON2 := $(if $(filter python-$(DEB_SOURCE),$(DH_PACKAGES)),yes) +WITH_OCTAVE := $(if $(filter $(DEB_SOURCE)-octave,$(DH_PACKAGES)),yes) # define 'main' python, and other python # NOTE: to disable the 'other' python build set 'PYTHON_OTHER = ' # (i.e. to the empty string) _before_ the 'include debian/lalsuite.mk' # line in debian/rules file -PYTHON := /usr/bin/python2 -PYTHON_OTHER ?= /usr/bin/python3 +PYTHON := /usr/bin/python3 +ifneq (,$(WITH_PYTHON2)) + PYTHON_OTHER ?= /usr/bin/python2 +endif PYTHON_OTHER_BUILD_DIR ?= _buildpyother # handle parallelism @@ -23,8 +25,9 @@ %: dh $@ \ --buildsystem=autoconf \ - $(if $(HAVE_PYTHON2),--with=python2) \ - $(if $(HAVE_PYTHON3),--with=python3) + --with=python3 \ + $(if $(WITH_PYTHON2),--with=python2) \ + ; override_dh_auto_configure: # configure the build for the 'main' python version @@ -39,6 +42,8 @@ ifneq ($(strip $(PYTHON_OTHER)),) # -- configure and build 'other' python library # copy over current build into new directory + # NOTE: when this is removed, please remove + # 'rsync' from Build-Depends $(RM) -r $(PYTHON_OTHER_BUILD_DIR) rsync -ra . $(PYTHON_OTHER_BUILD_DIR) # remove old makefiles @@ -78,14 +83,15 @@ endif override_dh_fixperms: - dh_fixperms $(if $(HAVE_OCTAVE),&& find debian -name '*.oct' | xargs chmod -x) + dh_fixperms $(if $(WITH_OCTAVE),&& find debian -name '*.oct' | xargs chmod -x) override_dh_strip: - dh_strip $(if $(HAVE_OCTAVE),&& find debian -name '*.oct' | xargs strip --strip-unneeded) + dh_strip $(if $(WITH_OCTAVE),&& find debian -name '*.oct' | xargs strip --strip-unneeded) override_dh_shlibdeps: dh_shlibdeps \ && find debian -name '*.la' -delete \ - $(if $(HAVE_OCTAVE),&& dpkg-shlibdeps -Odebian/$(DEB_SOURCE)-octave.substvars $$(find debian -name '*.oct')) \ - $(if $(HAVE_PYTHON2),&& dh_numpy) \ - $(if $(HAVE_PYTHON3),&& dh_numpy3) + && dh_numpy3 \ + $(if $(WITH_OCTAVE),&& dpkg-shlibdeps -Odebian/$(DEB_SOURCE)-octave.substvars $$(find debian -name '*.oct')) \ + $(if $(WITH_PYTHON2),&& dh_numpy) \ + ; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lalmetaio-2.0.1/gnuscripts/libtool.m4 new/lalmetaio-2.0.2/gnuscripts/libtool.m4 --- old/lalmetaio-2.0.1/gnuscripts/libtool.m4 2021-01-16 19:10:21.423477579 +0100 +++ new/lalmetaio-2.0.2/gnuscripts/libtool.m4 2021-02-16 00:25:21.759373679 +0100 @@ -1076,7 +1076,7 @@ _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; 10.[[012]][[,.]]*) _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; - 10.*) + 10.*|11.*) _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; esac ;; @@ -1874,7 +1874,7 @@ /* When -fvisibility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) -int fnord () __attribute__ ((visibility("default"))); +int fnord () __attribute__((visibility("default"))); #endif int fnord () { return 42; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lalmetaio-2.0.1/gnuscripts/pkg.m4 new/lalmetaio-2.0.2/gnuscripts/pkg.m4 --- old/lalmetaio-2.0.1/gnuscripts/pkg.m4 2021-01-16 19:10:21.073469589 +0100 +++ new/lalmetaio-2.0.2/gnuscripts/pkg.m4 2021-02-11 02:06:07.458963035 +0100 @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lalmetaio-2.0.1/lalmetaio.pc new/lalmetaio-2.0.2/lalmetaio.pc --- old/lalmetaio-2.0.1/lalmetaio.pc 2021-01-27 17:02:04.370522927 +0100 +++ new/lalmetaio-2.0.2/lalmetaio.pc 2021-02-18 18:08:14.013796119 +0100 @@ -11,7 +11,7 @@ Name: LALMetaIO Description: LAL MetaIO Library Support -Version: 2.0.1 +Version: 2.0.2 Requires.private: lal >= 7.1.0, libmetaio Libs: -L${libdir} -llalmetaio Cflags: -I${includedir} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lalmetaio-2.0.1/lalmetaio.spec new/lalmetaio-2.0.2/lalmetaio.spec --- old/lalmetaio-2.0.1/lalmetaio.spec 2021-01-27 17:02:04.377523089 +0100 +++ new/lalmetaio-2.0.2/lalmetaio.spec 2021-02-18 18:08:14.023796353 +0100 @@ -7,10 +7,13 @@ %undefine nightly %endif +# borrowed from python3-rpm-macros +%define pyYdir %{_builddir}/pythonY-%{name}-%{version}-%{release} + # -- metadata --------------- Name: lalmetaio -Version: 2.0.1 +Version: 2.0.2 Release: %{?nightly:0.%{nightly}}%{!?nightly:%{release}}%{?dist} Summary: LSC Algorithm MetaIO Library License: GPLv2+ @@ -34,6 +37,7 @@ # swig BuildRequires: swig >= 3.0.10 +%if 0%{?rhel} != 0 && 0%{?rhel} < 8 # python2 BuildRequires: python2-rpm-macros BuildRequires: python-devel @@ -42,6 +46,8 @@ BuildRequires: python2-numpy >= 1.7 BuildRequires: python-pathlib BuildRequires: pytest +BuildRequires: rsync +%endif # python3x BuildRequires: python-srpm-macros @@ -62,7 +68,7 @@ Summary: LSC Algorithm MetaIO Library - runtime tools Group: LAL Requires: lib%{name} = %{version}-%{release} -Requires: python2-%{name} = %{version}-%{release} +Requires: python%{python3_pkgversion}-%{name} = %{version}-%{release} %description The LSC Algorithm MetaIO Library for gravitational wave data analysis. @@ -87,12 +93,13 @@ Requires: libmetaio-devel >= 8.4.0 Requires: liblal-devel >= 7.1.0 Provides: %{name}-devel = %{version}-%{release} -Obsoletes: %{name}-devel < %{version}-%{release} +Obsoletes: %{name}-devel < 2.0.1-1 %description -n lib%{name}-devel The LSC Algorithm MetaIO Library for gravitational wave data analysis. This package contains files needed build applications that use the LAL MetaIO library. +%if 0%{?rhel} != 0 && 0%{?rhel} < 8 # python2-lalmetaio %package -n python2-%{name} Summary: Python %{python2_version} Bindings for LALMetaIO @@ -102,11 +109,13 @@ Requires: python2-lal >= 7.1.0 Requires: python2-numpy >= 1.7 Provides: %{name}-python = %{version}-%{release} +Provides: deprecated() Obsoletes: %{name}-python < %{version}-%{release} %{?python_provide:%python_provide python2-%{name}} %description -n python2-%{name} The LSC Algorithm Library for gravitational wave data analysis. This package provides the Python %{python2_version} bindings for LALMetaIO. +%endif # python3x-lalmetaio %package -n python%{python3_pkgversion}-%{name} @@ -119,7 +128,7 @@ %{?python_provide:%python_provide python%{python3_pkgversion}-%{name}} %description -n python%{python3_pkgversion}-%{name} The LSC Algorithm Library for gravitational wave data analysis. -This package provides the Python %{python2_version} bindings for LALMetaIO. +This package provides the Python %{python3_version} bindings for LALMetaIO. # lalmetaio-octave %package octave @@ -138,40 +147,47 @@ %setup -q -n %{name}-%{version}%{?nightly:-%{nightly}} %build -# build C library with python2 -%configure %{configure_opts} --disable-gcc-flags --enable-swig PYTHON=%{__python2} +# build C library with python3 +%configure %{configure_opts} --disable-gcc-flags --enable-swig PYTHON=%{__python3} %{__make} %{?_smp_mflags} V=1 -# build python3 library (copy things so we don't have to rebuild them) -rm -rf %py3dir -cp -r . %py3dir -pushd %py3dir +%if 0%{?rhel} != 0 && 0%{?rhel} < 8 +# build python2 library (copy things so we don't have to rebuild them) +rm -rf %pyYdir +rsync -ra . %pyYdir +pushd %pyYdir rm -rfv python/%{name}/*.{la,lo,o} python/%{name}/.libs -%configure %{configure_opts} --disable-doxygen --disable-gcc-flags --disable-swig-octave --enable-swig-python PYTHON=%{__python3} +%configure %{configure_opts} --disable-doxygen --disable-gcc-flags --disable-swig-octave --enable-swig-python PYTHON=%{__python2} %{__make} V=1 -C swig %{__make} V=1 -C python/%{name} %{__make} V=1 -C bin bin_PROGRAMS="" dist_bin_SCRIPTS="" popd +%endif %check -# C + python2 + octave +# C + python3 + octave %{__make} %{?_smp_mflags} V=1 VERBOSE=1 check -# python3 -[ -d %py3dir/test/python ] && %{__make} %{?_smp_mflags} V=1 VERBOSE=1 -C %py3dir -C test/python check + +%if 0%{?rhel} != 0 && 0%{?rhel} < 8 +# python2 +[ -d %pyYdir/test/python ] && %{__make} %{?_smp_mflags} V=1 VERBOSE=1 -C %pyYdir -C test/python check +%endif %install -# C + python2 + octave +# C + python3 + octave %make_install -# python3 -%{__make} -C %py3dir -C swig install-exec-am DESTDIR=%{?buildroot} -%{__make} -C %py3dir -C python/%{name} install DESTDIR=%{?buildroot} + +%if 0%{?rhel} != 0 && 0%{?rhel} < 8 +# python2 +%{__make} -C %pyYdir -C swig install-exec-am DESTDIR=%{?buildroot} +%{__make} -C %pyYdir -C python/%{name} install DESTDIR=%{?buildroot} +%endif + find $RPM_BUILD_ROOT%{_libdir} -name '*.la' -delete -%post -ldconfig +%post -n lib%{name} -p /sbin/ldconfig -%postun -ldconfig +%postun -n lib%{name} -p /sbin/ldconfig %clean [ ${RPM_BUILD_ROOT} != "/" ] && rm -Rf ${RPM_BUILD_ROOT} @@ -181,34 +197,42 @@ %files -n lib%{name} %defattr(-,root,root) +%doc README.md %license COPYING %{_libdir}/*.so.* %files -n lib%{name}-devel %defattr(-,root,root) +%doc README.md %license COPYING %{_includedir}/lal %{_libdir}/*.a %{_libdir}/*.so %{_libdir}/pkgconfig/* +%if 0%{?rhel} != 0 && 0%{?rhel} < 8 %files -n python2-%{name} %defattr(-,root,root) +%doc README.md %license COPYING %{python2_sitearch}/* +%endif %files -n python%{python3_pkgversion}-%{name} %defattr(-,root,root) +%doc README.md %license COPYING %{python3_sitearch}/* %files octave %defattr(-,root,root) +%doc README.md %license COPYING %{_prefix}/lib*/octave/*/site/oct/*/lalmetaio.oct* %files %defattr(-,root,root) +%doc README.md %license COPYING %{_bindir}/* %{_mandir}/man1/* @@ -218,6 +242,9 @@ # dates should be formatted using: 'date +"%a %b %d %Y"' %changelog +* Fri Feb 05 2021 Adam Mercer <[email protected]> 2.0.2-1 +- Update for 2.0.2 + * Mon Jan 11 2021 Adam Mercer <[email protected]> 2.0.1-1 - Update for 2.0.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lalmetaio-2.0.1/lalmetaio.spec.in new/lalmetaio-2.0.2/lalmetaio.spec.in --- old/lalmetaio-2.0.1/lalmetaio.spec.in 2021-01-27 17:00:49.065782871 +0100 +++ new/lalmetaio-2.0.2/lalmetaio.spec.in 2021-02-18 18:08:01.463502380 +0100 @@ -7,6 +7,9 @@ %undefine nightly %endif +# borrowed from python3-rpm-macros +%define pyYdir %{_builddir}/pythonY-%{name}-%{version}-%{release} + # -- metadata --------------- Name: @PACKAGE@ @@ -34,6 +37,7 @@ # swig BuildRequires: swig >= @MIN_SWIG_VERSION@ +%if 0%{?rhel} != 0 && 0%{?rhel} < 8 # python2 BuildRequires: python2-rpm-macros BuildRequires: python-devel @@ -42,6 +46,8 @@ BuildRequires: python2-numpy >= @MIN_NUMPY_VERSION@ BuildRequires: python-pathlib BuildRequires: pytest +BuildRequires: rsync +%endif # python3x BuildRequires: python-srpm-macros @@ -62,7 +68,7 @@ Summary: LSC Algorithm MetaIO Library - runtime tools Group: LAL Requires: lib%{name} = %{version}-%{release} -Requires: python2-%{name} = %{version}-%{release} +Requires: python%{python3_pkgversion}-%{name} = %{version}-%{release} %description The LSC Algorithm MetaIO Library for gravitational wave data analysis. @@ -87,12 +93,13 @@ Requires: libmetaio-devel >= @MIN_METAIO_VERSION@ Requires: liblal-devel >= @MIN_LAL_VERSION@ Provides: %{name}-devel = %{version}-%{release} -Obsoletes: %{name}-devel < %{version}-%{release} +Obsoletes: %{name}-devel < 2.0.1-1 %description -n lib%{name}-devel The LSC Algorithm MetaIO Library for gravitational wave data analysis. This package contains files needed build applications that use the LAL MetaIO library. +%if 0%{?rhel} != 0 && 0%{?rhel} < 8 # python2-lalmetaio %package -n python2-%{name} Summary: Python %{python2_version} Bindings for LALMetaIO @@ -102,11 +109,13 @@ Requires: python2-lal >= @MIN_LAL_VERSION@ Requires: python2-numpy >= @MIN_NUMPY_VERSION@ Provides: %{name}-python = %{version}-%{release} +Provides: deprecated() Obsoletes: %{name}-python < %{version}-%{release} %{?python_provide:%python_provide python2-%{name}} %description -n python2-%{name} The LSC Algorithm Library for gravitational wave data analysis. This package provides the Python %{python2_version} bindings for LALMetaIO. +%endif # python3x-lalmetaio %package -n python%{python3_pkgversion}-%{name} @@ -119,7 +128,7 @@ %{?python_provide:%python_provide python%{python3_pkgversion}-%{name}} %description -n python%{python3_pkgversion}-%{name} The LSC Algorithm Library for gravitational wave data analysis. -This package provides the Python %{python2_version} bindings for LALMetaIO. +This package provides the Python %{python3_version} bindings for LALMetaIO. # lalmetaio-octave %package octave @@ -138,40 +147,47 @@ %setup -q -n %{name}-%{version}%{?nightly:-%{nightly}} %build -# build C library with python2 -%configure %{configure_opts} --disable-gcc-flags --enable-swig PYTHON=%{__python2} +# build C library with python3 +%configure %{configure_opts} --disable-gcc-flags --enable-swig PYTHON=%{__python3} %{__make} %{?_smp_mflags} V=1 -# build python3 library (copy things so we don't have to rebuild them) -rm -rf %py3dir -cp -r . %py3dir -pushd %py3dir +%if 0%{?rhel} != 0 && 0%{?rhel} < 8 +# build python2 library (copy things so we don't have to rebuild them) +rm -rf %pyYdir +rsync -ra . %pyYdir +pushd %pyYdir rm -rfv python/%{name}/*.{la,lo,o} python/%{name}/.libs -%configure %{configure_opts} --disable-doxygen --disable-gcc-flags --disable-swig-octave --enable-swig-python PYTHON=%{__python3} +%configure %{configure_opts} --disable-doxygen --disable-gcc-flags --disable-swig-octave --enable-swig-python PYTHON=%{__python2} %{__make} V=1 -C swig %{__make} V=1 -C python/%{name} %{__make} V=1 -C bin bin_PROGRAMS="" dist_bin_SCRIPTS="" popd +%endif %check -# C + python2 + octave +# C + python3 + octave %{__make} %{?_smp_mflags} V=1 VERBOSE=1 check -# python3 -[ -d %py3dir/test/python ] && %{__make} %{?_smp_mflags} V=1 VERBOSE=1 -C %py3dir -C test/python check + +%if 0%{?rhel} != 0 && 0%{?rhel} < 8 +# python2 +[ -d %pyYdir/test/python ] && %{__make} %{?_smp_mflags} V=1 VERBOSE=1 -C %pyYdir -C test/python check +%endif %install -# C + python2 + octave +# C + python3 + octave %make_install -# python3 -%{__make} -C %py3dir -C swig install-exec-am DESTDIR=%{?buildroot} -%{__make} -C %py3dir -C python/%{name} install DESTDIR=%{?buildroot} + +%if 0%{?rhel} != 0 && 0%{?rhel} < 8 +# python2 +%{__make} -C %pyYdir -C swig install-exec-am DESTDIR=%{?buildroot} +%{__make} -C %pyYdir -C python/%{name} install DESTDIR=%{?buildroot} +%endif + find $RPM_BUILD_ROOT%{_libdir} -name '*.la' -delete -%post -ldconfig +%post -n lib%{name} -p /sbin/ldconfig -%postun -ldconfig +%postun -n lib%{name} -p /sbin/ldconfig %clean [ ${RPM_BUILD_ROOT} != "/" ] && rm -Rf ${RPM_BUILD_ROOT} @@ -181,34 +197,42 @@ %files -n lib%{name} %defattr(-,root,root) +%doc README.md %license COPYING %{_libdir}/*.so.* %files -n lib%{name}-devel %defattr(-,root,root) +%doc README.md %license COPYING %{_includedir}/lal %{_libdir}/*.a %{_libdir}/*.so %{_libdir}/pkgconfig/* +%if 0%{?rhel} != 0 && 0%{?rhel} < 8 %files -n python2-%{name} %defattr(-,root,root) +%doc README.md %license COPYING %{python2_sitearch}/* +%endif %files -n python%{python3_pkgversion}-%{name} %defattr(-,root,root) +%doc README.md %license COPYING %{python3_sitearch}/* %files octave %defattr(-,root,root) +%doc README.md %license COPYING %{_prefix}/lib*/octave/*/site/oct/*/lalmetaio.oct* %files %defattr(-,root,root) +%doc README.md %license COPYING %{_bindir}/* %{_mandir}/man1/* @@ -218,6 +242,9 @@ # dates should be formatted using: 'date +"%a %b %d %Y"' %changelog +* Fri Feb 05 2021 Adam Mercer <[email protected]> 2.0.2-1 +- Update for 2.0.2 + * Mon Jan 11 2021 Adam Mercer <[email protected]> 2.0.1-1 - Update for 2.0.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lalmetaio-2.0.1/lib/LALMetaIOConfig.h new/lalmetaio-2.0.2/lib/LALMetaIOConfig.h --- old/lalmetaio-2.0.1/lib/LALMetaIOConfig.h 2021-01-27 16:09:23.681181324 +0100 +++ new/lalmetaio-2.0.2/lib/LALMetaIOConfig.h 2021-02-17 16:09:02.288904922 +0100 @@ -3,7 +3,7 @@ #ifndef LALMETAIO_VERSION /* LALMetaIO Version */ -#define LALMETAIO_VERSION "2.0.1" +#define LALMETAIO_VERSION "2.0.2" /* LALMetaIO Version Major Number */ #define LALMETAIO_VERSION_MAJOR 2 @@ -12,7 +12,7 @@ #define LALMETAIO_VERSION_MINOR 0 /* LALMetaIO Version Micro Number */ -#define LALMETAIO_VERSION_MICRO 1 +#define LALMETAIO_VERSION_MICRO 2 /* LALMetaIO Version Devel Number */ #define LALMETAIO_VERSION_DEVEL 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lalmetaio-2.0.1/lib/LALMetaIOVCSInfo.c.in new/lalmetaio-2.0.2/lib/LALMetaIOVCSInfo.c.in --- old/lalmetaio-2.0.1/lib/LALMetaIOVCSInfo.c.in 2021-01-16 19:10:21.080469749 +0100 +++ new/lalmetaio-2.0.2/lib/LALMetaIOVCSInfo.c.in 2021-02-11 02:06:07.460963083 +0100 @@ -14,8 +14,8 @@ * * You should have received a copy of the GNU General Public License * along with with program; see the file COPYING. If not, write to the - * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301 USA */ /* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lalmetaio-2.0.1/lib/LALMetaIOVCSInfo.h new/lalmetaio-2.0.2/lib/LALMetaIOVCSInfo.h --- old/lalmetaio-2.0.1/lib/LALMetaIOVCSInfo.h 2021-01-27 17:02:04.436524452 +0100 +++ new/lalmetaio-2.0.2/lib/LALMetaIOVCSInfo.h 2021-02-18 18:08:14.092797968 +0100 @@ -14,8 +14,8 @@ * * You should have received a copy of the GNU General Public License * along with with program; see the file COPYING. If not, write to the - * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301 USA */ #ifndef _LALMETAIOVCSINFO_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lalmetaio-2.0.1/lib/LALMetaIOVCSInfo.h.in new/lalmetaio-2.0.2/lib/LALMetaIOVCSInfo.h.in --- old/lalmetaio-2.0.1/lib/LALMetaIOVCSInfo.h.in 2021-01-16 19:10:21.080469749 +0100 +++ new/lalmetaio-2.0.2/lib/LALMetaIOVCSInfo.h.in 2021-02-11 02:06:07.460963083 +0100 @@ -14,8 +14,8 @@ * * You should have received a copy of the GNU General Public License * along with with program; see the file COPYING. If not, write to the - * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301 USA */ #ifndef _@PACKAGE_NAME_UCASE@VCSINFO_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lalmetaio-2.0.1/lib/LALMetaIOVCSInfoHeader.h new/lalmetaio-2.0.2/lib/LALMetaIOVCSInfoHeader.h --- old/lalmetaio-2.0.1/lib/LALMetaIOVCSInfoHeader.h 2021-01-27 17:02:52.629638044 +0100 +++ new/lalmetaio-2.0.2/lib/LALMetaIOVCSInfoHeader.h 2021-02-18 18:08:14.675811613 +0100 @@ -14,8 +14,8 @@ * * You should have received a copy of the GNU General Public License * along with with program; see the file COPYING. If not, write to the - * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301 USA */ /* @@ -36,10 +36,10 @@ #endif /* VCS information */ -#define LALMETAIO_VCS_ID "04164ccc9fb562fd39e1fa37857d1e1846e42be5" -#define LALMETAIO_VCS_DATE "2021-01-26 20:36:34 +0000" +#define LALMETAIO_VCS_ID "3e213a2342fd1bce03380418ca1d51d51130d7c8" +#define LALMETAIO_VCS_DATE "2021-02-17 22:39:49 +0000" #define LALMETAIO_VCS_BRANCH "None" -#define LALMETAIO_VCS_TAG "lalmetaio-v2.0.1" +#define LALMETAIO_VCS_TAG "lalmetaio-v2.0.2" #define LALMETAIO_VCS_AUTHOR "Adam Mercer <[email protected]>" #define LALMETAIO_VCS_COMMITTER "Adam Mercer <[email protected]>" #define LALMETAIO_VCS_CLEAN "CLEAN" @@ -47,7 +47,7 @@ #if LALMETAIO_VERSION_DEVEL != 0 /* VCS header/library mismatch link check function */ -#define LALMETAIO_VCS_LINK_CHECK LALMETAIO_CLEAN_04164ccc9fb562fd39e1fa37857d1e1846e42be5_VCS_HEADER_LIBRARY_MISMATCH +#define LALMETAIO_VCS_LINK_CHECK LALMETAIO_CLEAN_3e213a2342fd1bce03380418ca1d51d51130d7c8_VCS_HEADER_LIBRARY_MISMATCH void LALMETAIO_VCS_LINK_CHECK(void); #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lalmetaio-2.0.1/lib/LIGOLwXML.c new/lalmetaio-2.0.2/lib/LIGOLwXML.c --- old/lalmetaio-2.0.1/lib/LIGOLwXML.c 2021-01-16 19:10:21.425477624 +0100 +++ new/lalmetaio-2.0.2/lib/LIGOLwXML.c 2021-02-11 02:06:07.591966199 +0100 @@ -13,8 +13,8 @@ * * You should have received a copy of the GNU General Public License * along with with program; see the file COPYING. If not, write to the -* Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, -* MA 02111-1307 USA +* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +* MA 02110-1301 USA */ /*----------------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lalmetaio-2.0.1/lib/LIGOLwXML.h new/lalmetaio-2.0.2/lib/LIGOLwXML.h --- old/lalmetaio-2.0.1/lib/LIGOLwXML.h 2021-01-16 19:10:21.425477624 +0100 +++ new/lalmetaio-2.0.2/lib/LIGOLwXML.h 2021-02-11 02:06:07.591966199 +0100 @@ -13,8 +13,8 @@ * * You should have received a copy of the GNU General Public License * along with with program; see the file COPYING. If not, write to the -* Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, -* MA 02111-1307 USA +* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +* MA 02110-1301 USA */ /*----------------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lalmetaio-2.0.1/lib/LIGOLwXMLArray.c new/lalmetaio-2.0.2/lib/LIGOLwXMLArray.c --- old/lalmetaio-2.0.1/lib/LIGOLwXMLArray.c 2021-01-16 19:10:21.425477624 +0100 +++ new/lalmetaio-2.0.2/lib/LIGOLwXMLArray.c 2021-02-11 02:06:07.592966223 +0100 @@ -13,8 +13,8 @@ * * You should have received a copy of the GNU General Public License * along with with program; see the file COPYING. If not, write to the - * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301 USA */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lalmetaio-2.0.1/lib/LIGOLwXMLArray.h new/lalmetaio-2.0.2/lib/LIGOLwXMLArray.h --- old/lalmetaio-2.0.1/lib/LIGOLwXMLArray.h 2021-01-16 19:10:21.425477624 +0100 +++ new/lalmetaio-2.0.2/lib/LIGOLwXMLArray.h 2021-02-11 02:06:07.592966223 +0100 @@ -13,8 +13,8 @@ * * You should have received a copy of the GNU General Public License * along with with program; see the file COPYING. If not, write to the - * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301 USA */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lalmetaio-2.0.1/lib/LIGOLwXMLHeaders.h new/lalmetaio-2.0.2/lib/LIGOLwXMLHeaders.h --- old/lalmetaio-2.0.1/lib/LIGOLwXMLHeaders.h 2021-01-16 19:10:21.425477624 +0100 +++ new/lalmetaio-2.0.2/lib/LIGOLwXMLHeaders.h 2021-02-11 02:06:07.592966223 +0100 @@ -13,8 +13,8 @@ * * You should have received a copy of the GNU General Public License * along with with program; see the file COPYING. If not, write to the -* Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, -* MA 02111-1307 USA +* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +* MA 02110-1301 USA */ /*----------------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lalmetaio-2.0.1/lib/LIGOLwXMLRead.c new/lalmetaio-2.0.2/lib/LIGOLwXMLRead.c --- old/lalmetaio-2.0.1/lib/LIGOLwXMLRead.c 2021-01-16 19:10:21.425477624 +0100 +++ new/lalmetaio-2.0.2/lib/LIGOLwXMLRead.c 2021-02-11 02:06:07.592966223 +0100 @@ -16,8 +16,8 @@ * * You should have received a copy of the GNU General Public License along * with with program; see the file COPYING. If not, write to the Free - * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - * 02111-1307 USA + * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA */ /*----------------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lalmetaio-2.0.1/lib/LIGOLwXMLRead.h new/lalmetaio-2.0.2/lib/LIGOLwXMLRead.h --- old/lalmetaio-2.0.1/lib/LIGOLwXMLRead.h 2021-01-16 19:10:21.425477624 +0100 +++ new/lalmetaio-2.0.2/lib/LIGOLwXMLRead.h 2021-02-11 02:06:07.592966223 +0100 @@ -13,8 +13,8 @@ * * You should have received a copy of the GNU General Public License * along with with program; see the file COPYING. If not, write to the -* Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, -* MA 02111-1307 USA +* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +* MA 02110-1301 USA */ /*----------------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lalmetaio-2.0.1/lib/LIGOLwXMLlegacy.c new/lalmetaio-2.0.2/lib/LIGOLwXMLlegacy.c --- old/lalmetaio-2.0.1/lib/LIGOLwXMLlegacy.c 2021-01-16 19:10:21.426477647 +0100 +++ new/lalmetaio-2.0.2/lib/LIGOLwXMLlegacy.c 2021-02-11 02:06:07.592966223 +0100 @@ -13,8 +13,8 @@ * * You should have received a copy of the GNU General Public License * along with with program; see the file COPYING. If not, write to the -* Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, -* MA 02111-1307 USA +* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +* MA 02110-1301 USA */ /*----------------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lalmetaio-2.0.1/lib/LIGOLwXMLlegacy.h new/lalmetaio-2.0.2/lib/LIGOLwXMLlegacy.h --- old/lalmetaio-2.0.1/lib/LIGOLwXMLlegacy.h 2021-01-16 19:10:21.426477647 +0100 +++ new/lalmetaio-2.0.2/lib/LIGOLwXMLlegacy.h 2021-02-11 02:06:07.592966223 +0100 @@ -13,8 +13,8 @@ * * You should have received a copy of the GNU General Public License * along with with program; see the file COPYING. If not, write to the -* Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, -* MA 02111-1307 USA +* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +* MA 02110-1301 USA */ /*----------------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lalmetaio-2.0.1/lib/LIGOMetadataTables.h new/lalmetaio-2.0.2/lib/LIGOMetadataTables.h --- old/lalmetaio-2.0.1/lib/LIGOMetadataTables.h 2021-01-16 19:10:21.426477647 +0100 +++ new/lalmetaio-2.0.2/lib/LIGOMetadataTables.h 2021-02-11 02:06:07.592966223 +0100 @@ -13,8 +13,8 @@ * * You should have received a copy of the GNU General Public License * along with with program; see the file COPYING. If not, write to the -* Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, -* MA 02111-1307 USA +* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +* MA 02110-1301 USA */ /*----------------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lalmetaio-2.0.1/lib/LIGOMetadataUtils.c new/lalmetaio-2.0.2/lib/LIGOMetadataUtils.c --- old/lalmetaio-2.0.1/lib/LIGOMetadataUtils.c 2021-01-16 19:10:21.426477647 +0100 +++ new/lalmetaio-2.0.2/lib/LIGOMetadataUtils.c 2021-02-11 02:06:07.592966223 +0100 @@ -13,8 +13,8 @@ * * You should have received a copy of the GNU General Public License * along with with program; see the file COPYING. If not, write to the -* Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, -* MA 02111-1307 USA +* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +* MA 02110-1301 USA */ /*----------------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lalmetaio-2.0.1/lib/LIGOMetadataUtils.h new/lalmetaio-2.0.2/lib/LIGOMetadataUtils.h --- old/lalmetaio-2.0.1/lib/LIGOMetadataUtils.h 2021-01-16 19:10:21.426477647 +0100 +++ new/lalmetaio-2.0.2/lib/LIGOMetadataUtils.h 2021-02-11 02:06:07.592966223 +0100 @@ -13,8 +13,8 @@ * * You should have received a copy of the GNU General Public License * along with with program; see the file COPYING. If not, write to the -* Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, -* MA 02111-1307 USA +* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +* MA 02110-1301 USA */ /*----------------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lalmetaio-2.0.1/lib/processtable.c new/lalmetaio-2.0.2/lib/processtable.c --- old/lalmetaio-2.0.1/lib/processtable.c 2021-01-16 19:10:21.426477647 +0100 +++ new/lalmetaio-2.0.2/lib/processtable.c 2021-02-11 02:06:07.592966223 +0100 @@ -14,8 +14,8 @@ * * You should have received a copy of the GNU General Public License along * with with program; see the file COPYING. If not, write to the Free - * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - * 02111-1307 USA + * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA */ #ifndef _WIN32 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lalmetaio-2.0.1/python/lalmetaio/__init__.py new/lalmetaio-2.0.2/python/lalmetaio/__init__.py --- old/lalmetaio-2.0.1/python/lalmetaio/__init__.py 2021-01-27 17:02:04.413523921 +0100 +++ new/lalmetaio-2.0.2/python/lalmetaio/__init__.py 2021-02-18 18:08:14.065797336 +0100 @@ -1,7 +1,7 @@ # Import SWIG wrappings, if available from .lalmetaio import * -__version__ = "2.0.1" +__version__ = "2.0.2" ## \addtogroup lalmetaio_python """This package provides Python wrappings and extensions to LALMetaIO""" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lalmetaio-2.0.1/python/lalmetaio/git_version.py new/lalmetaio-2.0.2/python/lalmetaio/git_version.py --- old/lalmetaio-2.0.1/python/lalmetaio/git_version.py 2021-01-27 17:02:53.059647980 +0100 +++ new/lalmetaio-2.0.2/python/lalmetaio/git_version.py 2021-02-18 18:08:15.047820320 +0100 @@ -17,13 +17,13 @@ # # You should have received a copy of the GNU General Public License # along with with program; see the file COPYING. If not, write to the -# Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA +# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +# MA 02110-1301 USA -id = "04164ccc9fb562fd39e1fa37857d1e1846e42be5" -date = "2021-01-26 20:36:34 +0000" +id = "3e213a2342fd1bce03380418ca1d51d51130d7c8" +date = "2021-02-17 22:39:49 +0000" branch = "None" -tag = "lalmetaio-v2.0.1" +tag = "lalmetaio-v2.0.2" if tag == "None": tag = None author = "Adam Mercer <[email protected]>" @@ -32,8 +32,8 @@ status = "CLEAN: All modifications committed" version = id verbose_msg = """Branch: None -Tag: lalmetaio-v2.0.1 -Id: 04164ccc9fb562fd39e1fa37857d1e1846e42be5 +Tag: lalmetaio-v2.0.2 +Id: 3e213a2342fd1bce03380418ca1d51d51130d7c8 Builder: Adam Mercer <[email protected]> Repository status: CLEAN: All modifications committed""" @@ -54,9 +54,9 @@ """ if onmismatch not in ("raise", "warn"): raise ValueError(onmismatch + " is an unrecognized value of onmismatch") - if foreign_id == "04164ccc9fb562fd39e1fa37857d1e1846e42be5": + if foreign_id == "3e213a2342fd1bce03380418ca1d51d51130d7c8": return - msg = "Program id (04164ccc9fb562fd39e1fa37857d1e1846e42be5) does not match given id (%s)." % foreign_id + msg = "Program id (3e213a2342fd1bce03380418ca1d51d51130d7c8) does not match given id (%s)." % foreign_id if onmismatch == "raise": raise VersionMismatchError(msg) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lalmetaio-2.0.1/swig/SWIGLALMetaIOAlpha.i new/lalmetaio-2.0.2/swig/SWIGLALMetaIOAlpha.i --- old/lalmetaio-2.0.1/swig/SWIGLALMetaIOAlpha.i 2021-01-16 19:10:21.426477647 +0100 +++ new/lalmetaio-2.0.2/swig/SWIGLALMetaIOAlpha.i 2021-02-11 02:06:07.592966223 +0100 @@ -13,8 +13,8 @@ // // You should have received a copy of the GNU General Public License // along with with program; see the file COPYING. If not, write to the -// Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, -// MA 02111-1307 USA +// Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +// MA 02110-1301 USA // /// diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lalmetaio-2.0.1/swig/SWIGLALMetaIOOmega.i new/lalmetaio-2.0.2/swig/SWIGLALMetaIOOmega.i --- old/lalmetaio-2.0.1/swig/SWIGLALMetaIOOmega.i 2021-01-27 02:36:30.529519798 +0100 +++ new/lalmetaio-2.0.2/swig/SWIGLALMetaIOOmega.i 2021-02-11 02:06:07.592966223 +0100 @@ -13,8 +13,8 @@ // // You should have received a copy of the GNU General Public License // along with with program; see the file COPYING. If not, write to the -// Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, -// MA 02111-1307 USA +// Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +// MA 02110-1301 USA // /// diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lalmetaio-2.0.1/swig/SWIGLALMetaIOTest.h new/lalmetaio-2.0.2/swig/SWIGLALMetaIOTest.h --- old/lalmetaio-2.0.1/swig/SWIGLALMetaIOTest.h 2021-01-16 19:10:21.426477647 +0100 +++ new/lalmetaio-2.0.2/swig/SWIGLALMetaIOTest.h 2021-02-11 02:06:07.592966223 +0100 @@ -13,8 +13,8 @@ // // You should have received a copy of the GNU General Public License // along with with program; see the file COPYING. If not, write to the -// Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, -// MA 02111-1307 USA +// Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +// MA 02110-1301 USA // // Code for SWIG tests of the LALMetaIO bindings. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lalmetaio-2.0.1/swig/SWIGTest.c new/lalmetaio-2.0.2/swig/SWIGTest.c --- old/lalmetaio-2.0.1/swig/SWIGTest.c 2021-01-16 19:10:21.426477647 +0100 +++ new/lalmetaio-2.0.2/swig/SWIGTest.c 2021-02-11 02:06:07.592966223 +0100 @@ -13,8 +13,8 @@ // // You should have received a copy of the GNU General Public License // along with with program; see the file COPYING. If not, write to the -// Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, -// MA 02111-1307 USA +// Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +// MA 02110-1301 USA // // Code for SWIG tests of the LALMetaIO bindings. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lalmetaio-2.0.1/swig/generate_swig_iface.py new/lalmetaio-2.0.2/swig/generate_swig_iface.py --- old/lalmetaio-2.0.1/swig/generate_swig_iface.py 2021-01-16 19:10:21.707484062 +0100 +++ new/lalmetaio-2.0.2/swig/generate_swig_iface.py 2021-02-11 02:06:07.674968174 +0100 @@ -14,8 +14,8 @@ # # You should have received a copy of the GNU General Public License # along with with program; see the file COPYING. If not, write to the -# Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA +# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +# MA 02110-1301 USA """Generate the swig<package>.i interface file for a given LAL subpackage
