[tachyon] 01/01: Imported Debian patch 0.99~b6+dsx-8: #855615 fix + hardenning

[Jerome Benoit]

This is an automated email from the git hooks/post-receive script.

calculus-guest pushed a commit to branch master
in repository tachyon.

commit a1dce1715f62f9139b1d52d008d1796d4eb2dc74
Author: Jerome Benoit <calculus at rezozer.net>
Date:   Fri Feb 24 17:53:57 2017 +0400

    Imported Debian patch 0.99~b6+dsx-8: #855615 fix + hardenning
---
 debian/changelog                                          | 10 ++++++++++
 debian/control                                            |  4 ++--
 debian/rules                                              |  6 ------
 debian/templates/control.in                               |  4 ++--
 debian/templates/libtachyon-LIBFLAVOUR-dev.maintscript.in |  1 +
 5 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 54dcd87..a751103 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+tachyon (0.99~b6+dsx-8) unstable; urgency=medium
+
+  * Serious bug fix release (Closes: #855615) / Debianization:
+    - d/rules:
+      - link-doc, drop (See: #747141);
+    - d/control:
+      - -dev Depends fields, harden.
+
+ -- Jerome Benoit <calculus at rezozer.net>  Fri, 24 Feb 2017 13:51:03 +0000
+
 tachyon (0.99~b6+dsx-7) unstable; urgency=medium
 
   * Serious bug fix release (Closes: #848131) / Debianization:
diff --git a/debian/control b/debian/control
index 3f75643..371db05 100644
--- a/debian/control
+++ b/debian/control
@@ -155,7 +155,7 @@ Provides: libtachyon-dev
 Section: libdevel
 Priority: extra
 Architecture: alpha amd64 arm64 armel armhf hppa hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mips64el mipsel powerpc powerpcspe ppc64 ppc64el s390x sh4 sparc64 x32
-Depends: libtachyon-dev-common (= ${source:Version}), libtachyon-openmpi-0 (= ${binary:Version}), ${misc:Depends}
+Depends: libtachyon-dev-common (= ${source:Version}), libtachyon-openmpi-0 (= ${binary:Version}), libopenmpi-dev, ${misc:Depends}
 Multi-Arch: same
 Description: Parallel/Multiprocessor Ray Tracing Library - development - OpenMPI flavour
  Tachyon is a portable, high performance parallel ray tracing system
@@ -206,7 +206,7 @@ Provides: libtachyon-dev
 Section: libdevel
 Priority: extra
 Architecture: alpha amd64 arm64 armel armhf hppa hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 m68k mips mips64el mipsel powerpc ppc64 ppc64el s390x sh4 sparc64 x32
-Depends: libtachyon-dev-common (= ${source:Version}), libtachyon-mpich-0 (= ${binary:Version}), ${misc:Depends}
+Depends: libtachyon-dev-common (= ${source:Version}), libtachyon-mpich-0 (= ${binary:Version}), libmpich-dev, ${misc:Depends}
 Multi-Arch: same
 Description: Parallel/Multiprocessor Ray Tracing Library - development - MPICH flavour
  Tachyon is a portable, high performance parallel ray tracing system
diff --git a/debian/rules b/debian/rules
index ba067d1..125b0ed 100755
--- a/debian/rules
+++ b/debian/rules
@@ -126,12 +126,6 @@ override_dh_auto_install-indep:
 	$(MAKE) -C pkgextra/volpack/data install $(DEB_AUTO_INSTALL_MAKEFLAGS)
 	$(MAKE) -C pkgextra/virtual-reality/graphics install $(DEB_AUTO_INSTALL_MAKEFLAGS)
 
-override_dh_installdocs:
-	$(foreach lf, $(DEB_VIRT_LIBTACHYON_LISTOF_FLAVOUR), \
-		dh_installdocs -plibtachyon-$(lf)-$(DEB_PKG_LT_CURRENT)-dev --link-doc=libtachyon-dev-common $(NEWLINE)\
-		)
-	dh_installdocs --remaining-packages
-
 override_dh_compress-indep:
 	dh_compress -X.pdf -Xexamples
 
diff --git a/debian/templates/control.in b/debian/templates/control.in
index 61db3b5..b0df9be 100644
--- a/debian/templates/control.in
+++ b/debian/templates/control.in
@@ -105,7 +105,7 @@ Provides: libtachyon-dev
 Section: libdevel
 Priority: extra
 Architecture: @ARCH_REVLISTOF_OPENMPI@
-Depends: libtachyon-dev-common (= ${source:Version}), libtachyon-openmpi- at LT_CURRENT@ (= ${binary:Version}), ${misc:Depends}
+Depends: libtachyon-dev-common (= ${source:Version}), libtachyon-openmpi- at LT_CURRENT@ (= ${binary:Version}), libopenmpi-dev, ${misc:Depends}
 Multi-Arch: same
 Description: @SYNOPSIS_LIBRARY@ - development - OpenMPI flavour
  ##DescriptionMainPart##
@@ -136,7 +136,7 @@ Provides: libtachyon-dev
 Section: libdevel
 Priority: extra
 Architecture: @ARCH_REVLISTOF_MPICH@
-Depends: libtachyon-dev-common (= ${source:Version}), libtachyon-mpich- at LT_CURRENT@ (= ${binary:Version}), ${misc:Depends}
+Depends: libtachyon-dev-common (= ${source:Version}), libtachyon-mpich- at LT_CURRENT@ (= ${binary:Version}), libmpich-dev, ${misc:Depends}
 Multi-Arch: same
 Description: @SYNOPSIS_LIBRARY@ - development - MPICH flavour
  ##DescriptionMainPart##
diff --git a/debian/templates/libtachyon-LIBFLAVOUR-dev.maintscript.in b/debian/templates/libtachyon-LIBFLAVOUR-dev.maintscript.in
index d74442e..898c1a4 100644
--- a/debian/templates/libtachyon-LIBFLAVOUR-dev.maintscript.in
+++ b/debian/templates/libtachyon-LIBFLAVOUR-dev.maintscript.in
@@ -1 +1,2 @@
 dir_to_symlink /usr/share/doc/libtachyon- at LIBFLAVOUR@- at LT_CURRENT@-dev /usr/share/doc/libtachyon-dev-common 0.99~b6+dsx-5~
+symlink_to_dir /usr/share/doc/libtachyon- at LIBFLAVOUR@- at LT_CURRENT@-dev /usr/share/doc/libtachyon-dev-common 0.99~b6+dsx-8~

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/tachyon.git