[Pkg-octave-commit] [octave-interval] 02/02: d/control: Build-depend on octave-pkg-dev >= 1.4.0

[Rafael Laboissière]

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

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

commit 58eb05c71b08bd57b5141ab49574745d0577d323
Author: Rafael Laboissiere <rafael at laboissiere.net>
Date:   Sun May 29 18:01:07 2016 -0300

    d/control: Build-depend on octave-pkg-dev >= 1.4.0
    
    This allows the use of the new features introduced in this new version
    of octave-pkg-dev, namely (1) the new double-colon rules install-docs
    and remove-dirs, (2) the new substitution variable
    octave:Upstream-Description, and (3) the automatic symlink to the NEWS
    file.
---
 debian/control |  4 ++--
 debian/rules   | 13 ++-----------
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/debian/control b/debian/control
index 1594f85..249c9e2 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: math
 Priority: optional
 Maintainer: Debian Octave Group <pkg-octave-devel at lists.alioth.debian.org>
 Uploaders: Oliver Heimlich <oheim at posteo.de>,
-Build-Depends: debhelper (>= 9), cdbs, octave-pkg-dev (>> 1.2.0),
+Build-Depends: debhelper (>= 9), cdbs, octave-pkg-dev (>= 1.4.0),
  libmpfr-dev (>= 3.1.0), texinfo, texlive, texlive-generic-recommended,
  imagemagick, gnuplot-nox
 Standards-Version: 3.9.8
@@ -15,5 +15,5 @@ Package: octave-interval
 Architecture: any
 Depends: ${misc:Depends}, ${octave:Depends}, ${shlibs:Depends},
 Description: real-valued interval arithmetic for Octave
- ${source:Upstream-Description}
+ ${octave:Upstream-Description}
  This Octave add-on package is part of the Octave-Forge project.
diff --git a/debian/rules b/debian/rules
index fef2a33..6df315f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,14 +22,10 @@ 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
 
-install-docs:
+install-docs::
 	# The documentation build needs to load the package,
 	# so we have to set paths for the build process.
 	OCTAVE="$(octave) $(octave_options) --eval \"pkg ('prefix', [pwd(),'/../$(debpkg)/$(mpath)'], [pwd(),'/../$(debpkg)/$(bpath)']); pkg ('local_list', [pwd(),'/../local-list']); pkg ('global_list', [pwd(),'/../global-list']); pkg ('load', '$(pkg)');\"" \
@@ -38,13 +34,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	\
-		 $(CURDIR)/$(debpkg)/$(mpath)	\
-		 $(CURDIR)/$(debpkg)/$(bpath)
+remove-dirs::
 	rm -rf \
 		 $(CURDIR)/$(debpkg)/$(mpath)/*/doc \
 		 $(CURDIR)/$(debpkg)/$(mpath)/*/test

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