From 5b2489b62ff5d516a6ea5087322da3fe969ed88c Mon Sep 17 00:00:00 2001 From: Adam Mercer <adam.mercer@ligo.org> Date: Thu, 14 Jun 2018 09:08:09 -0700 Subject: [PATCH 01/12] lal: add python files to correct packages [ci skip] --- .../debian/pkg-python.install | 0 lal/debian/Makefile.am | 4 ++-- lal/debian/python-lal.install | 1 + lal/debian/{lal-python3.install => python3-lal.install} | 0 4 files changed, 3 insertions(+), 2 deletions(-) rename lal/debian/lal-python.install => gnuscripts/debian/pkg-python.install (100%) create mode 120000 lal/debian/python-lal.install rename lal/debian/{lal-python3.install => python3-lal.install} (100%) diff --git a/lal/debian/lal-python.install b/gnuscripts/debian/pkg-python.install similarity index 100% rename from lal/debian/lal-python.install rename to gnuscripts/debian/pkg-python.install diff --git a/lal/debian/Makefile.am b/lal/debian/Makefile.am index 931c7a8512..1b3d86133c 100644 --- a/lal/debian/Makefile.am +++ b/lal/debian/Makefile.am @@ -6,8 +6,8 @@ EXTRA_DIST = \ lal-dev.install \ lal.install \ lal-octave.install \ - lal-python.install \ - lal-python3.install \ + python-lal.install \ + python3-lal.install \ rules \ lalsuite.mk \ source/format diff --git a/lal/debian/python-lal.install b/lal/debian/python-lal.install new file mode 120000 index 0000000000..b564b1f854 --- /dev/null +++ b/lal/debian/python-lal.install @@ -0,0 +1 @@ +../../gnuscripts/debian/pkg-python.install \ No newline at end of file diff --git a/lal/debian/lal-python3.install b/lal/debian/python3-lal.install similarity index 100% rename from lal/debian/lal-python3.install rename to lal/debian/python3-lal.install -- GitLab From a18b4c753e7c0c8a49ce93c3e59914293d234688 Mon Sep 17 00:00:00 2001 From: Adam Mercer <adam.mercer@ligo.org> Date: Thu, 14 Jun 2018 09:42:09 -0700 Subject: [PATCH 02/12] lalframe: add python files to correct packages also ensure packages are named correctly [ci skip] --- lalframe/debian/Makefile.am | 4 ++-- lalframe/debian/control.in | 2 +- lalframe/debian/lalframe-python.install | 1 - lalframe/debian/python-lalframe.install | 1 + .../{lalframe-python3.install => python3-lalframe.install} | 0 5 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 lalframe/debian/lalframe-python.install create mode 120000 lalframe/debian/python-lalframe.install rename lalframe/debian/{lalframe-python3.install => python3-lalframe.install} (100%) diff --git a/lalframe/debian/Makefile.am b/lalframe/debian/Makefile.am index 7fda834f2e..28165c6220 100644 --- a/lalframe/debian/Makefile.am +++ b/lalframe/debian/Makefile.am @@ -5,8 +5,8 @@ EXTRA_DIST = \ copyright \ lalframe-dev.install \ lalframe-octave.install \ - lalframe-python.install \ - lalframe-python3.install \ + python-lalframe.install \ + python3-lalframe.install \ lalframe.install \ rules \ lalsuite.mk \ diff --git a/lalframe/debian/control.in b/lalframe/debian/control.in index fd3762edcd..713f36bd24 100644 --- a/lalframe/debian/control.in +++ b/lalframe/debian/control.in @@ -73,7 +73,7 @@ Description: Python bindings for LALFrame This package contains Python bindings for the LAL Frame library. Package: lalframe-python3 -Depends: python-lalframe3, ${misc:Depends} +Depends: python3-lalframe, ${misc:Depends} Architecture: all Priority: optional Section: oldlibs diff --git a/lalframe/debian/lalframe-python.install b/lalframe/debian/lalframe-python.install deleted file mode 100644 index b2cc1360ac..0000000000 --- a/lalframe/debian/lalframe-python.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/python2* diff --git a/lalframe/debian/python-lalframe.install b/lalframe/debian/python-lalframe.install new file mode 120000 index 0000000000..b564b1f854 --- /dev/null +++ b/lalframe/debian/python-lalframe.install @@ -0,0 +1 @@ +../../gnuscripts/debian/pkg-python.install \ No newline at end of file diff --git a/lalframe/debian/lalframe-python3.install b/lalframe/debian/python3-lalframe.install similarity index 100% rename from lalframe/debian/lalframe-python3.install rename to lalframe/debian/python3-lalframe.install -- GitLab From 8af3908d289b356896db64a83236fc2a46a5019c Mon Sep 17 00:00:00 2001 From: Adam Mercer <adam.mercer@ligo.org> Date: Thu, 14 Jun 2018 09:46:19 -0700 Subject: [PATCH 03/12] lalmetaio: add python files to correct packages also ensure packages are named correctly [ci skip] --- lalmetaio/debian/Makefile.am | 4 ++-- lalmetaio/debian/control.in | 2 +- lalmetaio/debian/lalmetaio-python.install | 1 - lalmetaio/debian/python-lalmetaio.install | 1 + .../{lalmetaio-python3.install => python3-lalmetaio.install} | 0 5 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 lalmetaio/debian/lalmetaio-python.install create mode 120000 lalmetaio/debian/python-lalmetaio.install rename lalmetaio/debian/{lalmetaio-python3.install => python3-lalmetaio.install} (100%) diff --git a/lalmetaio/debian/Makefile.am b/lalmetaio/debian/Makefile.am index cecdd7136b..1244e10d94 100644 --- a/lalmetaio/debian/Makefile.am +++ b/lalmetaio/debian/Makefile.am @@ -6,8 +6,8 @@ EXTRA_DIST = \ lalmetaio-dev.install \ lalmetaio.install \ lalmetaio-octave.install \ - lalmetaio-python.install \ - lalmetaio-python3.install \ + python-lalmetaio.install \ + python3-lalmetaio.install \ rules \ lalsuite.mk \ source/format diff --git a/lalmetaio/debian/control.in b/lalmetaio/debian/control.in index 377ba2ed1b..af3bdd3a07 100644 --- a/lalmetaio/debian/control.in +++ b/lalmetaio/debian/control.in @@ -68,7 +68,7 @@ Description: Python bindings for LALMetaIO This package contains Python bindings for the LAL MetaIO library. Package: lalmetaio-python3 -Depends: python-lalmetaio3, ${misc:Depends} +Depends: python3-lalmetaio, ${misc:Depends} Architecture: all Priority: optional Section: oldlibs diff --git a/lalmetaio/debian/lalmetaio-python.install b/lalmetaio/debian/lalmetaio-python.install deleted file mode 100644 index b2cc1360ac..0000000000 --- a/lalmetaio/debian/lalmetaio-python.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/python2* diff --git a/lalmetaio/debian/python-lalmetaio.install b/lalmetaio/debian/python-lalmetaio.install new file mode 120000 index 0000000000..b564b1f854 --- /dev/null +++ b/lalmetaio/debian/python-lalmetaio.install @@ -0,0 +1 @@ +../../gnuscripts/debian/pkg-python.install \ No newline at end of file diff --git a/lalmetaio/debian/lalmetaio-python3.install b/lalmetaio/debian/python3-lalmetaio.install similarity index 100% rename from lalmetaio/debian/lalmetaio-python3.install rename to lalmetaio/debian/python3-lalmetaio.install -- GitLab From ad52c31d4abb5cdedf37fb1fa5d2a6a02e626663 Mon Sep 17 00:00:00 2001 From: Adam Mercer <adam.mercer@ligo.org> Date: Thu, 14 Jun 2018 09:51:53 -0700 Subject: [PATCH 04/12] lalxml: add python files to correct packages [ci skip] --- lalxml/debian/Makefile.am | 4 ++-- lalxml/debian/lalxml-python.install | 1 - lalxml/debian/python-lalxml.install | 1 + .../debian/{lalxml-python3.install => python3-lalxml.install} | 0 4 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 lalxml/debian/lalxml-python.install create mode 120000 lalxml/debian/python-lalxml.install rename lalxml/debian/{lalxml-python3.install => python3-lalxml.install} (100%) diff --git a/lalxml/debian/Makefile.am b/lalxml/debian/Makefile.am index c288554411..9b37e61848 100644 --- a/lalxml/debian/Makefile.am +++ b/lalxml/debian/Makefile.am @@ -5,8 +5,8 @@ EXTRA_DIST = \ copyright \ lalxml-dev.install \ lalxml-octave.install \ - lalxml-python.install \ - lalxml-python3.install \ + python-lalxml.install \ + python3-lalxml.install \ lalxml.install \ rules \ lalsuite.mk \ diff --git a/lalxml/debian/lalxml-python.install b/lalxml/debian/lalxml-python.install deleted file mode 100644 index b2cc1360ac..0000000000 --- a/lalxml/debian/lalxml-python.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/python2* diff --git a/lalxml/debian/python-lalxml.install b/lalxml/debian/python-lalxml.install new file mode 120000 index 0000000000..b564b1f854 --- /dev/null +++ b/lalxml/debian/python-lalxml.install @@ -0,0 +1 @@ +../../gnuscripts/debian/pkg-python.install \ No newline at end of file diff --git a/lalxml/debian/lalxml-python3.install b/lalxml/debian/python3-lalxml.install similarity index 100% rename from lalxml/debian/lalxml-python3.install rename to lalxml/debian/python3-lalxml.install -- GitLab From e12646e4dbcd73a3f19bd09a1de7edddda599206 Mon Sep 17 00:00:00 2001 From: Adam Mercer <adam.mercer@ligo.org> Date: Thu, 14 Jun 2018 09:53:34 -0700 Subject: [PATCH 05/12] lalsimulation: add python files to correct packages also ensure packages are named correctly [ci skip] --- lalsimulation/debian/Makefile.am | 4 ++-- lalsimulation/debian/control.in | 2 +- lalsimulation/debian/lalsimulation-python.install | 1 - lalsimulation/debian/python-lalsimulation.install | 1 + ...mulation-python3.install => python3-lalsimulation.install} | 0 5 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 lalsimulation/debian/lalsimulation-python.install create mode 120000 lalsimulation/debian/python-lalsimulation.install rename lalsimulation/debian/{lalsimulation-python3.install => python3-lalsimulation.install} (100%) diff --git a/lalsimulation/debian/Makefile.am b/lalsimulation/debian/Makefile.am index 815dc27427..1167ab6fe7 100644 --- a/lalsimulation/debian/Makefile.am +++ b/lalsimulation/debian/Makefile.am @@ -5,8 +5,8 @@ EXTRA_DIST = \ copyright \ lalsimulation-dev.install \ lalsimulation-octave.install \ - lalsimulation-python.install \ - lalsimulation-python3.install \ + python-lalsimulation.install \ + python3-lalsimulation.install \ lalsimulation.install \ rules \ lalsuite.mk \ diff --git a/lalsimulation/debian/control.in b/lalsimulation/debian/control.in index 0dc12deeba..9c71fab4bb 100644 --- a/lalsimulation/debian/control.in +++ b/lalsimulation/debian/control.in @@ -70,7 +70,7 @@ Description: Python bindings for LALSimulation This package contains Python bindings for the LAL Simulation library. Package: lalsimulation-python3 -Depends: python-lalsimulation3, ${misc:Depends} +Depends: python3-lalsimulation, ${misc:Depends} Architecture: all Priority: optional Section: oldlibs diff --git a/lalsimulation/debian/lalsimulation-python.install b/lalsimulation/debian/lalsimulation-python.install deleted file mode 100644 index b2cc1360ac..0000000000 --- a/lalsimulation/debian/lalsimulation-python.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/python2* diff --git a/lalsimulation/debian/python-lalsimulation.install b/lalsimulation/debian/python-lalsimulation.install new file mode 120000 index 0000000000..b564b1f854 --- /dev/null +++ b/lalsimulation/debian/python-lalsimulation.install @@ -0,0 +1 @@ +../../gnuscripts/debian/pkg-python.install \ No newline at end of file diff --git a/lalsimulation/debian/lalsimulation-python3.install b/lalsimulation/debian/python3-lalsimulation.install similarity index 100% rename from lalsimulation/debian/lalsimulation-python3.install rename to lalsimulation/debian/python3-lalsimulation.install -- GitLab From 79592ebab6b2524e7f4a3da90ac895d8fd6645e1 Mon Sep 17 00:00:00 2001 From: Adam Mercer <adam.mercer@ligo.org> Date: Thu, 14 Jun 2018 09:56:42 -0700 Subject: [PATCH 06/12] lalburst: add python files to correct packages [ci skip] --- lalburst/debian/Makefile.am | 4 ++-- lalburst/debian/lalburst-python.install | 1 - lalburst/debian/python-lalburst.install | 1 + .../{lalburst-python3.install => python3-lalburst.install} | 0 4 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 lalburst/debian/lalburst-python.install create mode 120000 lalburst/debian/python-lalburst.install rename lalburst/debian/{lalburst-python3.install => python3-lalburst.install} (100%) diff --git a/lalburst/debian/Makefile.am b/lalburst/debian/Makefile.am index d0be40b605..ad11114b9c 100644 --- a/lalburst/debian/Makefile.am +++ b/lalburst/debian/Makefile.am @@ -6,8 +6,8 @@ EXTRA_DIST = \ lalburst-dev.install \ lalburst.install \ lalburst-octave.install \ - lalburst-python.install \ - lalburst-python3.install \ + python-lalburst.install \ + python3-lalburst.install \ rules \ lalsuite.mk \ source/format diff --git a/lalburst/debian/lalburst-python.install b/lalburst/debian/lalburst-python.install deleted file mode 100644 index b2cc1360ac..0000000000 --- a/lalburst/debian/lalburst-python.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/python2* diff --git a/lalburst/debian/python-lalburst.install b/lalburst/debian/python-lalburst.install new file mode 120000 index 0000000000..b564b1f854 --- /dev/null +++ b/lalburst/debian/python-lalburst.install @@ -0,0 +1 @@ +../../gnuscripts/debian/pkg-python.install \ No newline at end of file diff --git a/lalburst/debian/lalburst-python3.install b/lalburst/debian/python3-lalburst.install similarity index 100% rename from lalburst/debian/lalburst-python3.install rename to lalburst/debian/python3-lalburst.install -- GitLab From c153bcbfdaa0adcc634062767a52b36c5691c74b Mon Sep 17 00:00:00 2001 From: Adam Mercer <adam.mercer@ligo.org> Date: Thu, 14 Jun 2018 09:58:31 -0700 Subject: [PATCH 07/12] laldetchar: add python files to correct packages [ci skip] --- laldetchar/debian/Makefile.am | 2 +- laldetchar/debian/laldetchar-python.install | 2 -- laldetchar/debian/python-laldetchar.install | 1 + 3 files changed, 2 insertions(+), 3 deletions(-) delete mode 100644 laldetchar/debian/laldetchar-python.install create mode 120000 laldetchar/debian/python-laldetchar.install diff --git a/laldetchar/debian/Makefile.am b/laldetchar/debian/Makefile.am index fa77ff23a0..6d0bd4cf63 100644 --- a/laldetchar/debian/Makefile.am +++ b/laldetchar/debian/Makefile.am @@ -5,7 +5,7 @@ EXTRA_DIST = \ copyright \ laldetchar-dev.install \ laldetchar-octave.install \ - laldetchar-python.install \ + python-laldetchar.install \ laldetchar.install \ rules \ lalsuite.mk \ diff --git a/laldetchar/debian/laldetchar-python.install b/laldetchar/debian/laldetchar-python.install deleted file mode 100644 index e2c1f36380..0000000000 --- a/laldetchar/debian/laldetchar-python.install +++ /dev/null @@ -1,2 +0,0 @@ -usr/bin/laldetchar-* -usr/lib/python2* diff --git a/laldetchar/debian/python-laldetchar.install b/laldetchar/debian/python-laldetchar.install new file mode 120000 index 0000000000..b564b1f854 --- /dev/null +++ b/laldetchar/debian/python-laldetchar.install @@ -0,0 +1 @@ +../../gnuscripts/debian/pkg-python.install \ No newline at end of file -- GitLab From 0e749a1a9dd139fd4ff156093159f3aa9f440475 Mon Sep 17 00:00:00 2001 From: Adam Mercer <adam.mercer@ligo.org> Date: Thu, 14 Jun 2018 10:01:29 -0700 Subject: [PATCH 08/12] lalinspiral: add python files to correct packages also ensure packages are named correctly [ci skip] --- lalinspiral/debian/Makefile.am | 4 ++-- lalinspiral/debian/control.in | 2 +- lalinspiral/debian/lalinspiral-python.install | 1 - lalinspiral/debian/python-lalinspiral.install | 1 + ...alinspiral-python3.install => python3-lalinspiral.install} | 0 5 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 lalinspiral/debian/lalinspiral-python.install create mode 120000 lalinspiral/debian/python-lalinspiral.install rename lalinspiral/debian/{lalinspiral-python3.install => python3-lalinspiral.install} (100%) diff --git a/lalinspiral/debian/Makefile.am b/lalinspiral/debian/Makefile.am index 9ff59dde83..41b38570c8 100644 --- a/lalinspiral/debian/Makefile.am +++ b/lalinspiral/debian/Makefile.am @@ -5,8 +5,8 @@ EXTRA_DIST = \ copyright \ lalinspiral-dev.install \ lalinspiral-octave.install \ - lalinspiral-python.install \ - lalinspiral-python3.install \ + python-lalinspiral.install \ + python3-lalinspiral.install \ lalinspiral.install \ rules \ lalsuite.mk \ diff --git a/lalinspiral/debian/control.in b/lalinspiral/debian/control.in index 8323bfcf91..325cefd04d 100644 --- a/lalinspiral/debian/control.in +++ b/lalinspiral/debian/control.in @@ -95,7 +95,7 @@ Description: Python bindings for LALInspiral This package contains Python bindings for the LAL Inspiral library. Package: lalinspiral-python3 -Depends: python-lalinspiral3, ${misc:Depends} +Depends: python3-lalinspiral, ${misc:Depends} Architecture: all Priority: optional Section: oldlibs diff --git a/lalinspiral/debian/lalinspiral-python.install b/lalinspiral/debian/lalinspiral-python.install deleted file mode 100644 index b2cc1360ac..0000000000 --- a/lalinspiral/debian/lalinspiral-python.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/python2* diff --git a/lalinspiral/debian/python-lalinspiral.install b/lalinspiral/debian/python-lalinspiral.install new file mode 120000 index 0000000000..b564b1f854 --- /dev/null +++ b/lalinspiral/debian/python-lalinspiral.install @@ -0,0 +1 @@ +../../gnuscripts/debian/pkg-python.install \ No newline at end of file diff --git a/lalinspiral/debian/lalinspiral-python3.install b/lalinspiral/debian/python3-lalinspiral.install similarity index 100% rename from lalinspiral/debian/lalinspiral-python3.install rename to lalinspiral/debian/python3-lalinspiral.install -- GitLab From 8cff7d1dc4ce29a4da3406d51f89a87b06fddc82 Mon Sep 17 00:00:00 2001 From: Adam Mercer <adam.mercer@ligo.org> Date: Thu, 14 Jun 2018 10:10:47 -0700 Subject: [PATCH 09/12] lalpulsar: add python files to correct packages also ensure packages are named correctly [ci skip] --- lalpulsar/debian/Makefile.am | 4 ++-- lalpulsar/debian/control.in | 2 +- lalpulsar/debian/lalpulsar-python.install | 1 - lalpulsar/debian/python-lalpulsar.install | 1 + .../{lalpulsar-python3.install => python3-lalpulsar.install} | 0 5 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 lalpulsar/debian/lalpulsar-python.install create mode 120000 lalpulsar/debian/python-lalpulsar.install rename lalpulsar/debian/{lalpulsar-python3.install => python3-lalpulsar.install} (100%) diff --git a/lalpulsar/debian/Makefile.am b/lalpulsar/debian/Makefile.am index edf9081b6d..70c501ec1d 100644 --- a/lalpulsar/debian/Makefile.am +++ b/lalpulsar/debian/Makefile.am @@ -5,8 +5,8 @@ EXTRA_DIST = \ copyright \ lalpulsar-dev.install \ lalpulsar-octave.install \ - lalpulsar-python.install \ - lalpulsar-python3.install \ + python-lalpulsar.install \ + python3-lalpulsar.install \ lalpulsar.install \ rules \ lalsuite.mk \ diff --git a/lalpulsar/debian/control.in b/lalpulsar/debian/control.in index a382b19508..6535e131c7 100644 --- a/lalpulsar/debian/control.in +++ b/lalpulsar/debian/control.in @@ -71,7 +71,7 @@ Description: Python bindings for LALPulsar. This package contains Python bindings for the LAL Pulsar library. Package: lalpulsar-python3 -Depends: python-lalpulsar3, ${misc:Depends} +Depends: python3-lalpulsar, ${misc:Depends} Architecture: all Priority: optional Section: oldlibs diff --git a/lalpulsar/debian/lalpulsar-python.install b/lalpulsar/debian/lalpulsar-python.install deleted file mode 100644 index b2cc1360ac..0000000000 --- a/lalpulsar/debian/lalpulsar-python.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/python2* diff --git a/lalpulsar/debian/python-lalpulsar.install b/lalpulsar/debian/python-lalpulsar.install new file mode 120000 index 0000000000..b564b1f854 --- /dev/null +++ b/lalpulsar/debian/python-lalpulsar.install @@ -0,0 +1 @@ +../../gnuscripts/debian/pkg-python.install \ No newline at end of file diff --git a/lalpulsar/debian/lalpulsar-python3.install b/lalpulsar/debian/python3-lalpulsar.install similarity index 100% rename from lalpulsar/debian/lalpulsar-python3.install rename to lalpulsar/debian/python3-lalpulsar.install -- GitLab From f7d798f225b1e365234d28b1ac02ac8a71cb6cb4 Mon Sep 17 00:00:00 2001 From: Adam Mercer <adam.mercer@ligo.org> Date: Thu, 14 Jun 2018 10:12:13 -0700 Subject: [PATCH 10/12] lalinference: edd python files to correct packages [ci skip] --- lalinference/debian/Makefile.am | 2 +- lalinference/debian/lalinference-python.install | 5 ----- lalinference/debian/python-lalinference.install | 1 + 3 files changed, 2 insertions(+), 6 deletions(-) delete mode 100644 lalinference/debian/lalinference-python.install create mode 120000 lalinference/debian/python-lalinference.install diff --git a/lalinference/debian/Makefile.am b/lalinference/debian/Makefile.am index 82a28d1b4e..e549aed4ed 100644 --- a/lalinference/debian/Makefile.am +++ b/lalinference/debian/Makefile.am @@ -5,7 +5,7 @@ EXTRA_DIST = \ copyright \ lalinference-dev.install \ lalinference-octave.install \ - lalinference-python.install \ + python-lalinference.install \ lalinference.install \ rules \ lalsuite.mk \ diff --git a/lalinference/debian/lalinference-python.install b/lalinference/debian/lalinference-python.install deleted file mode 100644 index 22a093acbf..0000000000 --- a/lalinference/debian/lalinference-python.install +++ /dev/null @@ -1,5 +0,0 @@ -usr/bin/bayestar_* -usr/bin/lalinference_pipe -usr/bin/rapidpe_* -usr/bin/cbcBayes* -usr/lib/python2* diff --git a/lalinference/debian/python-lalinference.install b/lalinference/debian/python-lalinference.install new file mode 120000 index 0000000000..b564b1f854 --- /dev/null +++ b/lalinference/debian/python-lalinference.install @@ -0,0 +1 @@ +../../gnuscripts/debian/pkg-python.install \ No newline at end of file -- GitLab From fa1d8202b40e50bf0e0e0b45b19b84b995fd98da Mon Sep 17 00:00:00 2001 From: Adam Mercer <adam.mercer@ligo.org> Date: Thu, 14 Jun 2018 10:17:42 -0700 Subject: [PATCH 11/12] lalstochastic: add python files to correct packages also ensure packages are name correctly [ci skip] --- lalstochastic/debian/Makefile.am | 4 ++-- lalstochastic/debian/control.in | 2 +- lalstochastic/debian/lalstochastic-python.install | 1 - lalstochastic/debian/python-lalstochastic.install | 1 + ...ochastic-python3.install => python3-lalstochastic.install} | 0 5 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 lalstochastic/debian/lalstochastic-python.install create mode 120000 lalstochastic/debian/python-lalstochastic.install rename lalstochastic/debian/{lalstochastic-python3.install => python3-lalstochastic.install} (100%) diff --git a/lalstochastic/debian/Makefile.am b/lalstochastic/debian/Makefile.am index 01dfd8e9f7..074b7f2502 100644 --- a/lalstochastic/debian/Makefile.am +++ b/lalstochastic/debian/Makefile.am @@ -5,8 +5,8 @@ EXTRA_DIST = \ copyright \ lalstochastic-dev.install \ lalstochastic-octave.install \ - lalstochastic-python.install \ - lalstochastic-python3.install \ + python-lalstochastic.install \ + python3-lalstochastic.install \ lalstochastic.install \ rules \ lalsuite.mk \ diff --git a/lalstochastic/debian/control.in b/lalstochastic/debian/control.in index 3b423e90ff..9f1d3660d0 100644 --- a/lalstochastic/debian/control.in +++ b/lalstochastic/debian/control.in @@ -77,7 +77,7 @@ Description: Python bindings for LALStochastic This package contains Python bindings for the LAL Stochastic library. Package: lalstochastic-python3 -Depends: python-lalstochastic3, ${misc:Depends} +Depends: python3-lalstochastic, ${misc:Depends} Architecture: all Priority: optional Section: oldlibs diff --git a/lalstochastic/debian/lalstochastic-python.install b/lalstochastic/debian/lalstochastic-python.install deleted file mode 100644 index b2cc1360ac..0000000000 --- a/lalstochastic/debian/lalstochastic-python.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/python2* diff --git a/lalstochastic/debian/python-lalstochastic.install b/lalstochastic/debian/python-lalstochastic.install new file mode 120000 index 0000000000..b564b1f854 --- /dev/null +++ b/lalstochastic/debian/python-lalstochastic.install @@ -0,0 +1 @@ +../../gnuscripts/debian/pkg-python.install \ No newline at end of file diff --git a/lalstochastic/debian/lalstochastic-python3.install b/lalstochastic/debian/python3-lalstochastic.install similarity index 100% rename from lalstochastic/debian/lalstochastic-python3.install rename to lalstochastic/debian/python3-lalstochastic.install -- GitLab From 8b6692072265f2e06cd403f3d9251fc78b754555 Mon Sep 17 00:00:00 2001 From: Adam Mercer <adam.mercer@ligo.org> Date: Thu, 14 Jun 2018 14:19:46 -0700 Subject: [PATCH 12/12] lalapps: fix python-lalstochastic package name [ci skip] --- lalapps/debian/control.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lalapps/debian/control.in b/lalapps/debian/control.in index b805c66d71..a34d31f20a 100644 --- a/lalapps/debian/control.in +++ b/lalapps/debian/control.in @@ -31,7 +31,7 @@ Build-Depends: bc, lalpulsar-dev (>= @MIN_LALPULSAR_VERSION@~), python-lalpulsar (>= @MIN_LALPULSAR_VERSION@~), lalstochastic-dev (>= @MIN_LALSTOCHASTIC_VERSION@~), - python-stochastic (>= @MIN_LALSTOCHASTIC_VERSION@~), + python-lalstochastic (>= @MIN_LALSTOCHASTIC_VERSION@~), lalinference-dev (>= @MIN_LALINFERENCE_VERSION@~), python-lalinference (>= @MIN_LALINFERENCE_VERSION@~) X-Python-Version: >= 2.7 -- GitLab