From 37d2a9b344aa1e0a28387997cf0bd2a372023e94 Mon Sep 17 00:00:00 2001 From: "duncan.macleod" Date: Tue, 6 Sep 2022 14:46:41 +0100 Subject: [PATCH 01/10] lalpulsar: remove debian packages for octave --- lalpulsar/debian/Makefile.am | 1 - lalpulsar/debian/control.in | 20 -------------------- lalpulsar/debian/lalpulsar-octave.install | 1 - 3 files changed, 22 deletions(-) delete mode 120000 lalpulsar/debian/lalpulsar-octave.install diff --git a/lalpulsar/debian/Makefile.am b/lalpulsar/debian/Makefile.am index b2aa8dac0d..c782836934 100644 --- a/lalpulsar/debian/Makefile.am +++ b/lalpulsar/debian/Makefile.am @@ -5,7 +5,6 @@ EXTRA_DIST = \ copyright \ lalpulsar.install \ lalpulsar-data.install \ - lalpulsar-octave.install \ liblalpulsar-dev.install \ liblalpulsar@LIBMAJOR@.install \ python3-lalpulsar.install \ diff --git a/lalpulsar/debian/control.in b/lalpulsar/debian/control.in index 84112cd39e..ae52e90911 100644 --- a/lalpulsar/debian/control.in +++ b/lalpulsar/debian/control.in @@ -8,10 +8,6 @@ Build-Depends: debhelper (>= 9), dh-python, help2man (>= 1.37), - lal-octave (>= @MIN_LAL_VERSION@~), - lalframe-octave (>= @MIN_LALFRAME_VERSION@~), - lalsimulation-octave (>= @MIN_LALSIMULATION_VERSION@~), - lalinference-octave (>= @MIN_LALINFERENCE_VERSION@~), libcfitsio3-dev | libcfitsio-dev, libfftw3-dev, libgsl-dev | libgsl0-dev (>= 1.9), @@ -19,7 +15,6 @@ Build-Depends: liblalframe-dev (>= @MIN_LALFRAME_VERSION@~), liblalsimulation-dev (>= @MIN_LALSIMULATION_VERSION@~), liblalinference-dev (>= @MIN_LALINFERENCE_VERSION@~), - liboctave-dev, pkg-config (>= 0.18.0), python3-all-dev, python3-astropy, @@ -97,21 +92,6 @@ Description: Python 3 bindings for LALPulsar. The LSC Algorithm Pulsar Library for gravitational wave data analysis. This package contains Python 3 bindings for the LAL Pulsar library. -Package: lalpulsar-octave -Architecture: any -Depends: - ${misc:Depends}, - ${shlibs:Depends}, - lal-octave (>= @MIN_LAL_VERSION@~), - lalframe-octave (>= @MIN_LALFRAME_VERSION@~), - lalsimulation-octave (>= @MIN_LALSIMULATION_VERSION@~), - lalinference-octave (>= @MIN_LALINFERENCE_VERSION@~), - liblalpulsar@LIBMAJOR@ (= ${binary:Version}), - octave, -Description: Octave bindings for LALPulsar. - The LSC Algorithm Pulsar Library for gravitational wave data analysis. - This package contains Octave bindings for the LAL Pulsar library. - Package: lalpulsar Architecture: any Depends: diff --git a/lalpulsar/debian/lalpulsar-octave.install b/lalpulsar/debian/lalpulsar-octave.install deleted file mode 120000 index f46af4a9de..0000000000 --- a/lalpulsar/debian/lalpulsar-octave.install +++ /dev/null @@ -1 +0,0 @@ -../../common/debian/pkg-octave.install \ No newline at end of file -- GitLab From 26094d870f96c6603f7fbeea2c5d4ad9639aa82a Mon Sep 17 00:00:00 2001 From: "duncan.macleod" Date: Tue, 6 Sep 2022 14:46:59 +0100 Subject: [PATCH 02/10] lalinference: remove debian packages for octave --- lalinference/debian/Makefile.am | 1 - lalinference/debian/control.in | 24 ------------------- .../debian/lalinference-octave.install | 1 - 3 files changed, 26 deletions(-) delete mode 120000 lalinference/debian/lalinference-octave.install diff --git a/lalinference/debian/Makefile.am b/lalinference/debian/Makefile.am index bfd486c926..b8a96edd5d 100644 --- a/lalinference/debian/Makefile.am +++ b/lalinference/debian/Makefile.am @@ -5,7 +5,6 @@ EXTRA_DIST = \ copyright \ lalinference.install \ lalinference-data.install \ - lalinference-octave.install \ liblalinference@LIBMAJOR@.install \ liblalinference-dev.install \ python3-lalinference.install \ diff --git a/lalinference/debian/control.in b/lalinference/debian/control.in index da04537a26..e239491698 100644 --- a/lalinference/debian/control.in +++ b/lalinference/debian/control.in @@ -7,12 +7,6 @@ Build-Depends: debhelper (>= 9), dh-python, help2man (>= 1.37), - lal-octave (>= @MIN_LAL_VERSION@~), - lalframe-octave (>= @MIN_LALFRAME_VERSION@~), - lalmetaio-octave (>= @MIN_LALMETAIO_VERSION@~), - lalsimulation-octave (>= @MIN_LALSIMULATION_VERSION@~), - lalburst-octave (>= @MIN_LALBURST_VERSION@~), - lalinspiral-octave (>= @MIN_LALINSPIRAL_VERSION@~), libgsl-dev | libgsl0-dev (>= 1.15), liblal-dev (>= @MIN_LAL_VERSION@~), liblalframe-dev (>= @MIN_LALFRAME_VERSION@~), @@ -20,7 +14,6 @@ Build-Depends: liblalsimulation-dev (>= @MIN_LALSIMULATION_VERSION@~), liblalburst-dev (>= @MIN_LALBURST_VERSION@~), liblalinspiral-dev (>= @MIN_LALINSPIRAL_VERSION@~), - liboctave-dev, libopenmpi-dev, pkg-config (>= 0.18.0), python3-all-dev, @@ -110,23 +103,6 @@ Description: Python 3 bindings for LALInference The LSC Algorithm Inference Library for gravitational wave data analysis. This package contains Python 3 bindings for the LAL Inference library. -Package: lalinference-octave -Architecture: any -Depends: - ${misc:Depends}, - ${shlibs:Depends}, - lal-octave (>= @MIN_LAL_VERSION@~), - lalframe-octave (>= @MIN_LALFRAME_VERSION@~), - lalmetaio-octave (>= @MIN_LALMETAIO_VERSION@~), - lalsimulation-octave (>= @MIN_LALSIMULATION_VERSION@~), - lalburst-octave (>= @MIN_LALBURST_VERSION@~), - lalinspiral-octave (>= @MIN_LALINSPIRAL_VERSION@~), - liblalinference@LIBMAJOR@ (= ${binary:Version}), - octave, -Description: Octave bindings for LALInference - The LSC Algorithm Inference Library for gravitational wave data analysis. - This package contains Octave bindings for the LAL Inference library. - Package: lalinference Architecture: any Depends: diff --git a/lalinference/debian/lalinference-octave.install b/lalinference/debian/lalinference-octave.install deleted file mode 120000 index f46af4a9de..0000000000 --- a/lalinference/debian/lalinference-octave.install +++ /dev/null @@ -1 +0,0 @@ -../../common/debian/pkg-octave.install \ No newline at end of file -- GitLab From a2d9cd8404833f20edafcdd3f7a664ac9b56bec9 Mon Sep 17 00:00:00 2001 From: "duncan.macleod" Date: Tue, 6 Sep 2022 14:47:20 +0100 Subject: [PATCH 03/10] lalinspiral: remove debian packages for octave --- lalinspiral/debian/Makefile.am | 1 - lalinspiral/debian/control.in | 22 ------------------- lalinspiral/debian/lalinspiral-octave.install | 1 - 3 files changed, 24 deletions(-) delete mode 120000 lalinspiral/debian/lalinspiral-octave.install diff --git a/lalinspiral/debian/Makefile.am b/lalinspiral/debian/Makefile.am index 94f95c5173..c54e69e788 100644 --- a/lalinspiral/debian/Makefile.am +++ b/lalinspiral/debian/Makefile.am @@ -4,7 +4,6 @@ EXTRA_DIST = \ control \ copyright \ lalinspiral.install \ - lalinspiral-octave.install \ liblalinspiral@LIBMAJOR@.install \ liblalinspiral-dev.install \ python3-lalinspiral.install \ diff --git a/lalinspiral/debian/control.in b/lalinspiral/debian/control.in index 0981bb098e..00b80fdb89 100644 --- a/lalinspiral/debian/control.in +++ b/lalinspiral/debian/control.in @@ -7,11 +7,6 @@ Build-Depends: debhelper (>= 9), dh-python, help2man (>= 1.37), - lal-octave (>= @MIN_LAL_VERSION@~), - lalframe-octave (>= @MIN_LALFRAME_VERSION@~), - lalmetaio-octave (>= @MIN_LALMETAIO_VERSION@~), - lalsimulation-octave (>= @MIN_LALSIMULATION_VERSION@~), - lalburst-octave (>= @MIN_LALBURST_VERSION@~), libgsl-dev | libgsl0-dev (>= 1.9), liblal-dev (>= @MIN_LAL_VERSION@~), liblalframe-dev (>= @MIN_LALFRAME_VERSION@~), @@ -19,7 +14,6 @@ Build-Depends: liblalsimulation-dev (>= @MIN_LALSIMULATION_VERSION@~), liblalburst-dev (>= @MIN_LALBURST_VERSION@~), libmetaio-dev (>= 8.2), - liboctave-dev, pkg-config (>= 0.18.0), python3-all-dev, python3-glue, @@ -101,22 +95,6 @@ Description: Python 3 bindings for LALInspiral The LSC Algorithm Inspiral Library for gravitational wave data analysis. This package contains Python 3 bindings for the LAL Inspiral library. -Package: lalinspiral-octave -Architecture: any -Depends: - ${misc:Depends}, - ${shlibs:Depends}, - lal-octave (>= @MIN_LAL_VERSION@~), - lalburst-octave (>= @MIN_LALBURST_VERSION@~), - lalframe-octave (>= @MIN_LALFRAME_VERSION@~), - lalmetaio-octave (>= @MIN_LALMETAIO_VERSION@~), - lalsimulation-octave (>= @MIN_LALSIMULATION_VERSION@~), - liblalinspiral@LIBMAJOR@ (= ${binary:Version}), - octave, -Description: Octave bindings for LALInspiral - The LSC Algorithm Inspiral Library for gravitational wave data analysis. - This package contains Octave bindings for the LAL Inspiral library. - Package: lalinspiral Architecture: any Depends: diff --git a/lalinspiral/debian/lalinspiral-octave.install b/lalinspiral/debian/lalinspiral-octave.install deleted file mode 120000 index f46af4a9de..0000000000 --- a/lalinspiral/debian/lalinspiral-octave.install +++ /dev/null @@ -1 +0,0 @@ -../../common/debian/pkg-octave.install \ No newline at end of file -- GitLab From 367f7b7663bb6a67e8ea065b18d43fa2427b21e8 Mon Sep 17 00:00:00 2001 From: "duncan.macleod" Date: Tue, 6 Sep 2022 14:47:41 +0100 Subject: [PATCH 04/10] lalburst: remove debian packages for octave --- lalburst/debian/Makefile.am | 1 - lalburst/debian/control.in | 18 ------------------ lalburst/debian/lalburst-octave.install | 1 - 3 files changed, 20 deletions(-) delete mode 120000 lalburst/debian/lalburst-octave.install diff --git a/lalburst/debian/Makefile.am b/lalburst/debian/Makefile.am index 85864b2759..190dd1f019 100644 --- a/lalburst/debian/Makefile.am +++ b/lalburst/debian/Makefile.am @@ -4,7 +4,6 @@ EXTRA_DIST = \ control \ copyright \ lalburst.install \ - lalburst-octave.install \ liblalburst@LIBMAJOR@.install \ liblalburst-dev.install \ python3-lalburst.install \ diff --git a/lalburst/debian/control.in b/lalburst/debian/control.in index 8d38939025..a3c6ca2122 100644 --- a/lalburst/debian/control.in +++ b/lalburst/debian/control.in @@ -8,15 +8,11 @@ Build-Depends: dh-python, help2man (>= 1.37), pkg-config (>= 0.18.0), - lal-octave (>= @MIN_LAL_VERSION@~), - lalmetaio-octave (>= @MIN_LALMETAIO_VERSION@~), - lalsimulation-octave (>= @MIN_LALSIMULATION_VERSION@~), libgsl-dev | libgsl0-dev (>= 1.9), liblal-dev (>= @MIN_LAL_VERSION@~), liblalmetaio-dev (>= @MIN_LALMETAIO_VERSION@~), liblalsimulation-dev (>= @MIN_LALSIMULATION_VERSION@~), libmetaio-dev (>= 8.2), - liboctave-dev, python3-all-dev, python3-glue, python3-numpy (>= @MIN_NUMPY_VERSION@), @@ -100,20 +96,6 @@ Description: Python 3 bindings foar LALBurst The LSC Algorithm Burst Library for gravitational wave data analysis. This package contains Python 3 bindings for the LAL Burst library. -Package: lalburst-octave -Architecture: any -Depends: - ${misc:Depends}, - ${shlibs:Depends}, - lal-octave (>= @MIN_LAL_VERSION@~), - lalmetaio-octave (>= @MIN_LALMETAIO_VERSION@~), - lalsimulation-octave (>= @MIN_LALSIMULATION_VERSION@~), - liblalburst@LIBMAJOR@ (= ${binary:Version}), - octave, -Description: Octave bindings for LALBurst - The LSC Algorithm Burst Library for gravitational wave data analysis. - This package contains Octave bindings for the LAL Burst library. - Package: lalburst Architecture: any Depends: diff --git a/lalburst/debian/lalburst-octave.install b/lalburst/debian/lalburst-octave.install deleted file mode 120000 index f46af4a9de..0000000000 --- a/lalburst/debian/lalburst-octave.install +++ /dev/null @@ -1 +0,0 @@ -../../common/debian/pkg-octave.install \ No newline at end of file -- GitLab From 69c2b522aa4b35ac8c62f45b40a247e589256e81 Mon Sep 17 00:00:00 2001 From: "duncan.macleod" Date: Tue, 6 Sep 2022 14:47:55 +0100 Subject: [PATCH 05/10] lalsimulation: remove debian packages for octave --- lalsimulation/debian/Makefile.am | 1 - lalsimulation/debian/control.in | 14 -------------- lalsimulation/debian/lalsimulation-octave.install | 1 - 3 files changed, 16 deletions(-) delete mode 120000 lalsimulation/debian/lalsimulation-octave.install diff --git a/lalsimulation/debian/Makefile.am b/lalsimulation/debian/Makefile.am index ce34e20ac1..9e00fb5569 100644 --- a/lalsimulation/debian/Makefile.am +++ b/lalsimulation/debian/Makefile.am @@ -5,7 +5,6 @@ EXTRA_DIST = \ copyright \ lalsimulation.install \ lalsimulation-data.install \ - lalsimulation-octave.install \ liblalsimulation-dev.install \ liblalsimulation@LIBMAJOR@.install \ python3-lalsimulation.install \ diff --git a/lalsimulation/debian/control.in b/lalsimulation/debian/control.in index 7c7223024f..9bdf88c690 100644 --- a/lalsimulation/debian/control.in +++ b/lalsimulation/debian/control.in @@ -7,10 +7,8 @@ Build-Depends: debhelper (>= 9), dh-python, help2man (>= 1.37), - lal-octave (>= @MIN_LAL_VERSION@~), libgsl-dev | libgsl0-dev (>= 1.9), liblal-dev (>= @MIN_LAL_VERSION@~), - liboctave-dev, pkg-config (>= 0.18.0), python3-all-dev, python3-lal (>= @MIN_LAL_VERSION@~), @@ -76,18 +74,6 @@ Description: Python 3 bindings for LALSimulation The LSC Algorithm Simulation Library for gravitational wave data analysis. This package contains Python 3 bindings for the LAL Simulation library. -Package: lalsimulation-octave -Architecture: any -Depends: - ${misc:Depends}, - ${shlibs:Depends}, - lal-octave (>= @MIN_LAL_VERSION@~), - liblalsimulation@LIBMAJOR@ (= ${binary:Version}), - octave, -Description: Octave bindings for LALSimulation - The LSC Algorithm Simulation Library for gravitational wave data analysis. - This package contains Octave bindings for the LAL Simulation library. - Package: lalsimulation Architecture: any Depends: diff --git a/lalsimulation/debian/lalsimulation-octave.install b/lalsimulation/debian/lalsimulation-octave.install deleted file mode 120000 index f46af4a9de..0000000000 --- a/lalsimulation/debian/lalsimulation-octave.install +++ /dev/null @@ -1 +0,0 @@ -../../common/debian/pkg-octave.install \ No newline at end of file -- GitLab From a37e24afb33a5d102f5f6b8a04357af87a9b1db0 Mon Sep 17 00:00:00 2001 From: "duncan.macleod" Date: Tue, 6 Sep 2022 14:48:09 +0100 Subject: [PATCH 06/10] lalmetaio: remove debian packages for octave --- lalmetaio/debian/Makefile.am | 1 - lalmetaio/debian/control.in | 14 -------------- lalmetaio/debian/lalmetaio-octave.install | 1 - 3 files changed, 16 deletions(-) delete mode 120000 lalmetaio/debian/lalmetaio-octave.install diff --git a/lalmetaio/debian/Makefile.am b/lalmetaio/debian/Makefile.am index 36badf71f7..93b33324eb 100644 --- a/lalmetaio/debian/Makefile.am +++ b/lalmetaio/debian/Makefile.am @@ -4,7 +4,6 @@ EXTRA_DIST = \ control \ copyright \ lalmetaio.install \ - lalmetaio-octave.install \ liblalmetaio-dev.install \ liblalmetaio@LIBMAJOR@.install \ python3-lalmetaio.install \ diff --git a/lalmetaio/debian/control.in b/lalmetaio/debian/control.in index 72441a6750..d7c95a9072 100644 --- a/lalmetaio/debian/control.in +++ b/lalmetaio/debian/control.in @@ -7,10 +7,8 @@ Build-Depends: debhelper (>= 9), dh-python, help2man (>= 1.37), - lal-octave (>= @MIN_LAL_VERSION@~), liblal-dev (>= @MIN_LAL_VERSION@~), libmetaio-dev (>= @MIN_METAIO_VERSION@), - liboctave-dev, pkg-config (>= 0.18.0), python3-all-dev, python3-lal (>= @MIN_LAL_VERSION@~), @@ -73,18 +71,6 @@ Description: Python 3 bindings for LALMetaIO The LSC Algorithm MetaIO Library for gravitational wave data analysis. This package contains Python 3 bindings for the LAL MetaIO library. -Package: lalmetaio-octave -Architecture: any -Depends: - ${misc:Depends}, - ${shlibs:Depends}, - lal-octave (>= @MIN_LAL_VERSION@~), - liblalmetaio@LIBMAJOR@ (= ${binary:Version}), - octave, -Description: Octave bindings for LALMetaIO - The LSC Algorithm MetaIO Library for gravitational wave data analysis. - This package contains Octave bindings for the LAL MetaIO library. - Package: lalmetaio Architecture: any Depends: diff --git a/lalmetaio/debian/lalmetaio-octave.install b/lalmetaio/debian/lalmetaio-octave.install deleted file mode 120000 index f46af4a9de..0000000000 --- a/lalmetaio/debian/lalmetaio-octave.install +++ /dev/null @@ -1 +0,0 @@ -../../common/debian/pkg-octave.install \ No newline at end of file -- GitLab From dfa1a8d6cc10d3f820eebe164ba71e3fb5a0852c Mon Sep 17 00:00:00 2001 From: "duncan.macleod" Date: Tue, 6 Sep 2022 14:48:24 +0100 Subject: [PATCH 07/10] lalframe: remove debian packages for octave --- lalframe/debian/Makefile.am | 1 - lalframe/debian/control.in | 14 -------------- lalframe/debian/lalframe-octave.install | 1 - 3 files changed, 16 deletions(-) delete mode 120000 lalframe/debian/lalframe-octave.install diff --git a/lalframe/debian/Makefile.am b/lalframe/debian/Makefile.am index 1680b5af36..012ebc9472 100644 --- a/lalframe/debian/Makefile.am +++ b/lalframe/debian/Makefile.am @@ -4,7 +4,6 @@ EXTRA_DIST = \ control \ copyright \ lalframe.install \ - lalframe-octave.install \ liblalframe@LIBMAJOR@.install \ liblalframe-dev.install \ python3-lalframe.install \ diff --git a/lalframe/debian/control.in b/lalframe/debian/control.in index d73aac7e10..3ba1e2d36c 100644 --- a/lalframe/debian/control.in +++ b/lalframe/debian/control.in @@ -7,11 +7,9 @@ Build-Depends: debhelper (>= 9), dh-python, help2man (>= 1.37), - lal-octave (>= @MIN_LAL_VERSION@~), ldas-tools-framecpp-c-dev (>= @MIN_FRAMECPPC_VERSION@), libframel-dev (>= @MIN_FRAMEL_VERSION@), liblal-dev (>= @MIN_LAL_VERSION@~), - liboctave-dev, pkg-config (>= 0.18.0), python3-all-dev, python3-lal (>= @MIN_LAL_VERSION@~), @@ -78,18 +76,6 @@ Description: Python 3 bindings for LALFrame The LSC Algorithm Frame Library for gravitational wave data analysis. This package contains Python 3 bindings for the LAL Frame library. -Package: lalframe-octave -Architecture: any -Depends: - ${misc:Depends}, - ${shlibs:Depends}, - lal-octave (>= @MIN_LAL_VERSION@~), - lalframe (= ${binary:Version}), - octave, -Description: Octave bindings for LALFrame - The LSC Algorithm Frame Library for gravitational wave data analysis. - This package contains Octave bindings for the LAL Frame library. - Package: lalframe Architecture: any Depends: diff --git a/lalframe/debian/lalframe-octave.install b/lalframe/debian/lalframe-octave.install deleted file mode 120000 index f46af4a9de..0000000000 --- a/lalframe/debian/lalframe-octave.install +++ /dev/null @@ -1 +0,0 @@ -../../common/debian/pkg-octave.install \ No newline at end of file -- GitLab From 5a40405190a73dcf1a71647c898d2edff135fe03 Mon Sep 17 00:00:00 2001 From: "duncan.macleod" Date: Tue, 6 Sep 2022 14:48:38 +0100 Subject: [PATCH 08/10] lal: remove debian packages for octave --- lal/debian/Makefile.am | 1 - lal/debian/control.in | 13 ------------- lal/debian/lal-octave.install | 1 - 3 files changed, 15 deletions(-) delete mode 120000 lal/debian/lal-octave.install diff --git a/lal/debian/Makefile.am b/lal/debian/Makefile.am index 93f11a02ea..80a73efd3e 100644 --- a/lal/debian/Makefile.am +++ b/lal/debian/Makefile.am @@ -4,7 +4,6 @@ EXTRA_DIST = \ control \ copyright \ lal.install \ - lal-octave.install \ liblal-dev.install \ liblal@LIBMAJOR@.install \ liblalsupport@LIBMAJOR_SUPPORT@.install \ diff --git a/lal/debian/control.in b/lal/debian/control.in index 3eafcc1b4d..1849ad960f 100644 --- a/lal/debian/control.in +++ b/lal/debian/control.in @@ -12,7 +12,6 @@ Build-Depends: libfftw3-dev, libgsl0-dev (>= 1.9) | libgsl-dev, libhdf5-dev, - liboctave-dev, pkg-config (>= 0.18.0), python3-all-dev, python3-dateutil, @@ -104,18 +103,6 @@ Description: Python 3 bindings for LAL The LSC Algorithm Library for gravitational wave analysis. This package contains Python 3 bindings for the LAL library. -Package: lal-octave -Architecture: any -Depends: - ${misc:Depends}, - ${shlibs:Depends}, - liblal@LIBMAJOR@ (= ${binary:Version}), - liblalsupport@LIBMAJOR_SUPPORT@ (= ${binary:Version}), - octave, -Description: Octave bindings for LAL - The LSC Algorithm Library for gravitational wave analysis. - This package contains Octave bindings for the LAL library. - Package: lal Architecture: any Depends: diff --git a/lal/debian/lal-octave.install b/lal/debian/lal-octave.install deleted file mode 120000 index f46af4a9de..0000000000 --- a/lal/debian/lal-octave.install +++ /dev/null @@ -1 +0,0 @@ -../../common/debian/pkg-octave.install \ No newline at end of file -- GitLab From 2314a5be5cc2e2f1976e0a658a947f5c2b7e16b6 Mon Sep 17 00:00:00 2001 From: "duncan.macleod" Date: Tue, 6 Sep 2022 14:48:48 +0100 Subject: [PATCH 09/10] debian: disable octave builds closes #551 --- common/debian/lalsuite.mk | 10 +--------- common/debian/pkg-octave.install | 1 - 2 files changed, 1 insertion(+), 10 deletions(-) delete mode 100644 common/debian/pkg-octave.install diff --git a/common/debian/lalsuite.mk b/common/debian/lalsuite.mk index 657bb9eb7c..24157232fc 100644 --- a/common/debian/lalsuite.mk +++ b/common/debian/lalsuite.mk @@ -4,7 +4,6 @@ include /usr/share/dpkg/buildflags.mk include /usr/share/dpkg/pkg-info.mk DH_PACKAGES := $(shell dh_listpackages) -WITH_OCTAVE := $(if $(filter $(DEB_SOURCE)-octave,$(DH_PACKAGES)),yes) PYTHON := /usr/bin/python3 # handle parallelism @@ -22,7 +21,7 @@ override_dh_auto_configure: # configure the build for the 'main' python version dh_auto_configure -- \ --disable-gcc-flags \ - $(if $(WITH_OCTAVE),,--disable-swig-octave) \ + --disable-swig-octave \ $(CONFIGUREARGS) \ PYTHON=$(PYTHON) @@ -36,15 +35,8 @@ override_dh_auto_install: override_dh_auto_test: dh_auto_test -override_dh_fixperms: - dh_fixperms $(if $(WITH_OCTAVE),&& find debian -name '*.oct' | xargs chmod -x) - -override_dh_strip: - dh_strip $(if $(WITH_OCTAVE),&& find debian -name '*.oct' | xargs strip --strip-unneeded) - override_dh_shlibdeps: dh_shlibdeps \ && find debian -name '*.la' -delete \ && dh_numpy3 \ - $(if $(WITH_OCTAVE),&& dpkg-shlibdeps -Odebian/$(DEB_SOURCE)-octave.substvars $$(find debian -name '*.oct')) \ ; diff --git a/common/debian/pkg-octave.install b/common/debian/pkg-octave.install deleted file mode 100644 index 58f7ce7171..0000000000 --- a/common/debian/pkg-octave.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/*/octave/*/site/oct/*/*.oct* -- GitLab From 12832e9fe0668147757022c0995a8e818a2580f2 Mon Sep 17 00:00:00 2001 From: "duncan.macleod" Date: Tue, 6 Sep 2022 14:49:09 +0100 Subject: [PATCH 10/10] ci: clean up octave references on debian --- .gitlab-ci.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 88883cb41a..c067a7f415 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -374,7 +374,6 @@ default: - "${CI_JOB_NAME%%:*}*/**/config.log" - "${CI_JOB_NAME%%:*}*/**/test-suite.log" # generated sources - - "${CI_JOB_NAME%%:*}*/**/swiglal_lal*_octave.cpp" - "${CI_JOB_NAME%%:*}*/**/swiglal_lal*_python.c" # the orig tarball - "${CI_JOB_NAME%%:*}*.orig.*" @@ -1591,9 +1590,9 @@ upgrade:debian:buster: - rm *.changes *.dsc *.orig.tar.xz - ls | grep -P "lal.*-\d+(\.\d+)+" | xargs -d"\n" rm -rf # install latest lalsuite release - - apt-get -y -q install lalsuite lalsuite-dev lalsuite-octave + - apt-get -y -q install lalsuite lalsuite-dev # remove lalsuite meta-packages - - dpkg -r lalsuite lalsuite-dev lalsuite-octave + - dpkg -r lalsuite lalsuite-dev # generate local apt repository metadata - /usr/lib/local-apt-repository/rebuild # install new packages -- GitLab