diff --git a/debian/changelog b/debian/changelog
index a48a5a6bfdcb0ff17c34c7fd09ef8027367643e3..07838367c583a01cc632ec648b5fccee90c1d2f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,55 @@
+music (1.1.16) unstable; urgency=medium
+
+ * Upstream release 1.1.16.
+
+ -- Mikael Djurfeldt <mdj@debian.org> Sun, 01 Dec 2019 22:31:44 +0100
+
+music (1.0.7-4) unstable; urgency=medium
+
+ * Suggest music-doc in music-bin and libmusic-dev. (Closes: #849607)
+ * Bug #759332 was closed by nmu 1.0.7-1.3. (Closes: #759332)
+
+ -- Mikael Djurfeldt <mdj@debian.org> Sat, 07 Oct 2017 13:07:20 +0200
+
+music (1.0.7-3) unstable; urgency=high
+
+ * Fix FTBFS on non-amd64 archs. (Closes: #877907)
+
+ -- Mikael Djurfeldt <mdj@debian.org> Sat, 07 Oct 2017 12:48:54 +0200
+
+music (1.0.7-2) unstable; urgency=high
+
+ * Fix FTBFS with GCC 7. (Closes: #853566)
+ * Updated standards version to 3.9.8.
+
+ -- Mikael Djurfeldt <mdj@debian.org> Fri, 06 Oct 2017 16:31:52 +0200
+
+music (1.0.7-1.3) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Switch to source format 3.0 (quilt).
+ * Fix FTBFS with GCC 6, thanks to Graham Inggs. (Closes: #811907)
+ * Rename libmusic1 to libmusic1v5 for the GCC 5 transition.
+ (Closes: #791210)
+ * Switch to minimal dh rules. (Closes: #805951, #822005)
+
+ -- Andreas Beckmann <anbe@debian.org> Fri, 16 Dec 2016 11:30:20 +0100
+
+music (1.0.7-1.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix ftbfs with GCC-4.7: add "#include <unistd.h>" to
+ utils/VisualiseNeurons.cpp (Closes: #667291).
+
+ -- Mònica RamÃrez Arceda <monica@debian.org> Thu, 10 May 2012 13:40:31 +0200
+
+music (1.0.7-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Stop shipping .la files (Closes: #622439).
+
+ -- Luk Claes <luk@debian.org> Mon, 06 Jun 2011 08:01:00 +0200
+
music (1.0.7-1) unstable; urgency=high
* Upstream release 1.0.7 (containing urgent bugfix).
diff --git a/debian/compat b/debian/compat
index 7f8f011eb73d6043d2e6db9d2c101195ae2801f2..ec635144f60048986bc560c5576355344005e6e7 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 479d33fc71ccc157fb822fd8dfa1904065d34a25..d4b8ea2f70a2369c18aa7dfc2f91b6e5e8285839 100644
--- a/debian/control
+++ b/debian/control
@@ -1,15 +1,25 @@
Source: music
Priority: extra
Maintainer: Mikael Djurfeldt <mdj@debian.org>
-Build-Depends: debhelper (>= 7), autotools-dev, autoconf, automake, libtool, libopenmpi-dev, libibverbs-dev, freeglut3-dev, texlive-latex-base, texlive-latex-extra, asymptote, chrpath
-Standards-Version: 3.9.0
+Build-Depends:
+ debhelper (>= 10),
+ autotools-dev,
+ libopenmpi-dev,
+ libibverbs-dev,
+ freeglut3-dev,
+ texlive-latex-base,
+ texlive-latex-extra,
+ asymptote,
+ chrpath,
+Standards-Version: 3.9.8
Section: libs
Homepage: http://software.incf.org/software/music/home
Package: libmusic-dev
Section: libdevel
Architecture: any
-Depends: libmusic1 (= ${binary:Version}), ${misc:Depends}
+Depends: libmusic1v5 (= ${binary:Version}), ${misc:Depends}
+Suggests: music-doc
Description: Multi-Simulation Coordinator for MPI -- Development files
MUSIC allows spike events and continuous time series to be
communicated between parallel applications within the same MPI job in
@@ -20,10 +30,11 @@ Description: Multi-Simulation Coordinator for MPI -- Development files
This package contains the header files which are needed to compile
and link programs against libmusic.
-Package: libmusic1
-Section: libs
+Package: libmusic1v5
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Breaks: libmusic1
+Replaces: libmusic1
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
@@ -37,6 +48,7 @@ Package: music-bin
Section: science
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Suggests: music-doc
Description: Multi-Simulation Coordinator for MPI -- Utilities
MUSIC allows spike events and continuous time series to be
communicated between parallel applications within the same MPI job in
@@ -49,7 +61,7 @@ Description: Multi-Simulation Coordinator for MPI -- Utilities
Package: music-doc
Section: doc
Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}
Description: Multi-Simulation Coordinator for MPI -- Manual
MUSIC allows spike events and continuous time series to be
communicated between parallel applications within the same MPI job in
diff --git a/debian/copyright b/debian/copyright
index 4a9d0647105e5261bc0ce33474b0df266bbdc621..ff8f1a4b48cbd0e55abd300ce7d41faedb1f6676 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -23,7 +23,7 @@ License:
along with this program. If not, see <http://www.gnu.org/licenses/>.
On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+Public License can be found in `/usr/share/common-licenses/GPL-3'.
Files in subdirectory rudeconfig have copyright:
diff --git a/debian/libmusic-dev.dirs b/debian/libmusic-dev.dirs
deleted file mode 100644
index 6319218ca46af139203996e36ea22e1e69244c41..0000000000000000000000000000000000000000
--- a/debian/libmusic-dev.dirs
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib
-usr/include
-usr/share/doc/libmusic-dev/examples
diff --git a/debian/libmusic-dev.examples b/debian/libmusic-dev.examples
new file mode 100644
index 0000000000000000000000000000000000000000..b93e931befee20aca13f7e510692ad2b2c23a626
--- /dev/null
+++ b/debian/libmusic-dev.examples
@@ -0,0 +1,5 @@
+test/README
+test/*.cc
+test/*.music
+test/*.data
+test/*.dat
diff --git a/debian/libmusic-dev.install b/debian/libmusic-dev.install
index f882277c004bd38437bc465b370126abe25a1cd7..a3c8f6cabaa8f1cc8c3d822a0334c1ecf2b58f31 100644
--- a/debian/libmusic-dev.install
+++ b/debian/libmusic-dev.install
@@ -1,4 +1,3 @@
usr/include/*
-usr/lib/lib*.a
-usr/lib/lib*.so
-usr/lib/*.la
+usr/lib/*/lib*.a
+usr/lib/*/lib*.so
diff --git a/debian/libmusic1.dirs b/debian/libmusic1.dirs
deleted file mode 100644
index 68457717bd8efb8ba6291fca9d862dd5eb0d3b1e..0000000000000000000000000000000000000000
--- a/debian/libmusic1.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib
diff --git a/debian/libmusic1.install b/debian/libmusic1.install
deleted file mode 100644
index d0dbfd18ace910a77b0cfa9bcb567242ad5b88d8..0000000000000000000000000000000000000000
--- a/debian/libmusic1.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/lib*.so.*
diff --git a/debian/libmusic1.docs b/debian/libmusic1v5.docs
similarity index 100%
rename from debian/libmusic1.docs
rename to debian/libmusic1v5.docs
diff --git a/debian/libmusic1v5.install b/debian/libmusic1v5.install
new file mode 100644
index 0000000000000000000000000000000000000000..3ddde584198421f0d2a3fef9d36cc110f3b8b76d
--- /dev/null
+++ b/debian/libmusic1v5.install
@@ -0,0 +1 @@
+usr/lib/*/lib*.so.*
diff --git a/debian/music-bin.dirs b/debian/music-bin.dirs
deleted file mode 100644
index e77248175524d9f63749c2d6ca67159eeb4aa635..0000000000000000000000000000000000000000
--- a/debian/music-bin.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/bin
diff --git a/debian/music-doc.dirs b/debian/music-doc.dirs
deleted file mode 100644
index 35149a0b97e487560eac266a1566a58198360d8e..0000000000000000000000000000000000000000
--- a/debian/music-doc.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/doc/music-doc
diff --git a/debian/rules b/debian/rules
index 65111530e89ea1f269e2af988633c6432e2c127b..42d915c28bd468088df71d40b2d06081ed1bdd71 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,116 +1,17 @@
#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+%:
+ dh $@ --with autotools_dev
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
-CROSS= --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
-else
-CROSS= --build $(DEB_BUILD_GNU_TYPE)
-endif
-
-
-
-
-# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so
-version=`ls src/.libs/lib*.so.* | \
- awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'`
-major=`ls src/.libs/lib*.so.* | \
- awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
-
-config.status: configure
- dh_testdir
-
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
- cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
- cp -f /usr/share/misc/config.guess config.guess
-endif
- ./configure $(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
-
-
-build: build-stamp
-build-stamp: config.status
- dh_testdir
-
- $(MAKE)
-
- touch $@
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp
-
- [ ! -f Makefile ] || $(MAKE) distclean
- rm -f config.sub config.guess
-
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_prep
- dh_installdirs
-
+override_dh_auto_install:
$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
# Remove rpaths in libraries and binaries
- ( cd $(CURDIR)/debian/tmp/usr/lib; chrpath -d libmusic.so libmusic-c.so )
+ ( cd $(CURDIR)/debian/tmp/usr/lib/*; chrpath -d libmusic.so libmusic-c.so )
( cd $(CURDIR)/debian/tmp/usr/bin; chrpath -d eventcounter eventgenerator eventlogger eventselect eventsink eventsource music viewevents )
# Build manual
# ( cd $(CURDIR)/doc; make music-manual.pdf )
-
-# Fill up examples directory
- ( cd $(CURDIR)/test; cp -p README clocksource.cc contsink.cc constsource.cc eventdelay.cc contdelay.cc waveproducer.cc waveconsumer.cc messagesource.cc *.music *.data *.dat $(CURDIR)/debian/libmusic-dev/usr/share/doc/libmusic-dev/examples/ )
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs ChangeLog
- dh_installdocs
- dh_installexamples
- dh_install
-# dh_installmenu
-# dh_installdebconf
-# dh_installlogrotate
-# dh_installemacsen
-# dh_installpam
-# dh_installmime
-# dh_installinit
-# dh_installcron
-# dh_installinfo
- dh_installman
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
-# dh_perl
-# dh_python
- dh_makeshlibs
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000000000000000000000000000000000000..163aaf8d82b6c54f23c45f32895dbdfdcc27b047
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)