Switched to python3 and updated debian packaging files

configure.ac

@@ -196,9 +196,6 @@ fi
 #  fi
 #fi
 
-AM_PATH_PYTHON
-AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != :])
-
 AC_PROG_CC
 AC_PROG_LIBTOOL
 
@@ -337,7 +334,9 @@ AC_ARG_WITH([python],
     [AS_HELP_STRING([--without-python], [ignore the presence of Python and disable PyMUSIC])])
 
 AS_IF([test "x$with_python" != "xno"],
-      [AM_PATH_PYTHON([2.6], [have_python=yes], [have_python=no])],
+      [AS_IF([test "x$with_python" != "xyes"],
+             [PYTHON="$with_python"])
+       AM_PATH_PYTHON([2.6], [have_python=yes], [have_python=no])],
       [have_python=no])
 
 AS_IF([test "x$have_python" = "xyes"], [
@@ -368,9 +367,23 @@ fi
 
 AM_CONDITIONAL([HAVE_PYTHON], [test "x$have_python" = "xyes"])
 
+AC_ARG_ENABLE([deb],
+              [  --enable-deb            use deb package layout for install],
+              [case "${enableval}" in
+	         yes) deb_package=true ;;
+		 no) deb_package=false ;;
+		 *) deb_package=true ;;
+	       esac],[deb_package=false])
+AM_CONDITIONAL([DEB_PACKAGE], [test x$deb_package = xtrue])
+if test x$deb_package = xtrue; then
+  pythondir="\${exec_prefix}/lib/python3/dist-packages"
+  pyexecdir="\${exec_prefix}/lib/python3/dist-packages"
+fi
+
 # if Python is found, configure and compile PyMUSIC
 if test "x$have_python" = "xyes" ; then
  AC_CONFIG_FILES(pymusic/Makefile)
+ AC_CONFIG_FILES(pymusic/examples/Makefile)
  AC_CONFIG_FILES(pymusic/setup.py)
 fi
 

debian/changelog

 music (1.1.16-1) unstable; urgency=medium
 
   * Upstream release 1.1.16.
+  * Added package python3-music (python bindings for MUSIC).
 
  -- Mikael Djurfeldt <mdj@debian.org>  Sun, 01 Dec 2019 22:31:44 +0100
 

debian/control

@@ -11,7 +11,11 @@ Build-Depends:
  texlive-latex-extra,
  asymptote,
  chrpath,
-Standards-Version: 3.9.8
+ dh-python,
+ python3,
+ cython,
+ python-mpi4py
+Standards-Version: 4.4.1
 Section: libs
 Homepage: http://software.incf.org/software/music/home
 
@@ -44,6 +48,18 @@ Description: Multi-Simulation Coordinator for MPI -- Runtime library
  .
  This package contains the MUSIC library.
 
+Package: python3-music
+Architecture: any
+Depends: python3-mpi4py, python3-six, ${python3:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Description: Multi-Simulation Coordinator for MPI -- Runtime library
+ MUSIC allows spike events and continuous time series to be
+ communicated between parallel applications within the same MPI job in
+ a cluster computer.  Typical usage cases are connecting models
+ developed for different simulators and connecting a parallel
+ simulator to a post-processing tool.
+ .
+ This package contains the MUSIC library python bindings.
+
 Package: music-bin
 Section: science
 Architecture: any

debian/music-bin.install

-usr/bin/*
-usr/share/man/man1/*
+usr/bin/music
+usr/lib/*/music-*
+usr/share/man/man1/contsink.1
+usr/share/man/man1/eventcounter.1
+usr/share/man/man1/eventgenerator.1
+usr/share/man/man1/eventlogger.1
+usr/share/man/man1/eventselect.1
+usr/share/man/man1/eventsink.1
+usr/share/man/man1/eventsource.1
+usr/share/man/man1/messagesource.1
+usr/share/man/man1/music.1
+usr/share/man/man1/viewevents.1
+usr/share/music-*

debian/python3-music.docs

+AUTHORS
+README
+NEWS

debian/python3-music.examples

+usr/share/music-*/examples/python/*

debian/python3-music.install

+usr/lib/python*/dist-packages/music-*.egg-info
+usr/lib/python*/dist-packages/music/*.py
+usr/lib/python*/dist-packages/music/*.so
+usr/lib/python*/dist-packages/music/config/*.py

debian/rules

@@ -4,7 +4,10 @@
 #export DH_VERBOSE=1
 
 %:
-	dh $@
+	dh $@ --parallel --with python3
+
+override_dh_auto_configure:
+	dh_auto_configure -- --enable-deb --with-python=python3
 
 override_dh_auto_install:
 	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install

pymusic/Makefile.am

+## Process this file with Automake to create Makefile.in
+
+SUBDIRS = examples
 
 EXTRA_DIST = setup.py.in tests.py pymusic.pyx pymusic.pxd pybuffer.pyx pybuffer.pxd \
              music/__init__.py music/music_c.h music/pybuffer.pxd music/pymusic.pxd \
@@ -47,13 +50,21 @@ pybuffer_la_CXXFLAGS = \
 	$(PYBUFFER_CXXFLAGS) \
 	$(MPI_CXXFLAGS)
 
+if DEB_PACKAGE
+install-exec-hook:
+	$(PYTHON) setup.py build \
+	  --build-base=$(abs_builddir)/build install \
+	  --install-layout=deb \
+	  --prefix=$(DESTDIR)$(prefix)
+else
 install-exec-hook:
 	$(PYTHON) setup.py build \
 	  --build-base=$(abs_builddir)/build install \
-	  --prefix=$(DESTDIR)$(prefix) \
+	  --prefix=$(DESTDIR)$(prefix)
 	  --install-lib=$(DESTDIR)$(pyexecdir) \
 	  --install-scripts=$(DESTDIR)$(bindir) \
 	  --install-data=$(DESTDIR)$(pkgdatadir)
+endif
 
 clean-local:
 	-rm -rf $(abs_builddir)/build

pymusic/examples/Makefile.am

+## Process this file with Automake to create Makefile.in
+
+exdatadir = $(datadir)/@PACKAGE@-@PACKAGE_VERSION@/examples/python
+dist_exdata_DATA = eventlogger.py   \
+		   event.music      \
+		   eventsource.py   \
+		   helloworld.music \
+		   messagelogger.py \
+		   message.music    \
+		   message.py       \
+		   messagesource.py \
+		   receivers.py     \
+		   senders.py       \
+		   test.music       \
+		   testsink.py      \
+		   testsource.py

pymusic/examples/eventlogger.py

-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import music
 import sys

pymusic/examples/eventsource.py

-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import music
 from itertools import groupby, takewhile

pymusic/examples/messagelogger.py

-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import music
 import sys

pymusic/examples/messagesource.py

-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import music
 from itertools import groupby, takewhile

pymusic/examples/receivers.py

-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 import music
 

pymusic/examples/senders.py

-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 import music
 

pymusic/examples/testsink.py

-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import music
 import sys

pymusic/examples/testsource.py

-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import music
 from itertools import groupby, takewhile