[Pkg-octave-commit] [octave-interval] 04/04: d/rules: Don't copy NEWS into binary package twice

[Oliver Heimlich]

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

oheim-guest pushed a commit to branch master
in repository octave-interval.

commit 09d7465b5939a7a7d3c64264dc90980328a79650
Author: Oliver Heimlich <oheim at posteo.de>
Date:   Sun Apr 24 21:23:03 2016 +0200

    d/rules: Don't copy NEWS into binary package twice
---
 debian/rules | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/debian/rules b/debian/rules
index 74ffa86..022f5e8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,8 +20,11 @@
 include /usr/share/cdbs/1/class/octave-pkg.mk
 
 pkg = $(shell awk '/^Name:/ {print $$2; exit 0}' DESCRIPTION)
+pkg_version = $(shell awk '/^Version:/ {print $$2; exit 0}' DESCRIPTION)
 
+# Don't install NEWS file twice and provide upstream description in substvar
 # FIXME: This should go into octave-pkg.m
+DEB_INSTALL_DOCS_ALL =
 DEB_DH_GENCONTROL_ARGS_ALL = -- -Vsource:Upstream-Description="$(shell grep --perl-regexp --only-matching --null-data '(?<=^Description:) .*(\n .*|\n$$)*' DESCRIPTION | sed -e 's/^\s*//' | sed --null-data -e 's/\n/\\$${Newline}/g')"
 DEB_DH_INSTALL_SOURCEDIR = debian/octave-$(pkg)
 doc_image_dir = $(DEB_DH_INSTALL_SOURCEDIR)/usr/share/doc/$(package)/image
@@ -35,6 +38,8 @@ install-docs:
 	# so we move everything in place
 	mkdir -p "$(doc_image_dir)"
 	cp doc/image/*.png doc/image/*.svg "$(doc_image_dir)/"
+	# The NEWS file is already part of the octave package installation
+	ln -fs ../../octave/packages/$(pkg)-$(pkg_version)/packinfo/NEWS $(DEB_DH_INSTALL_SOURCEDIR)/usr/share/doc/$(package)/
 
 remove-dirs:
 	rmdir --ignore-fail-on-non-empty -p	\

-- 
Alioth's /home/groups/pkg-octave/bin/git-commit-notice on /srv/git.debian.org/git/pkg-octave/octave-interval.git