[Pkg-octave-commit] [octave-pkg-dev] 01/03: Cope with release-candidate versions of Octave

[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-pkg-dev.

commit 6766d56811e3fdce8419ee6d63c344b478685cb4
Author: Rafael Laboissiere <rafael at laboissiere.net>
Date:   Thu Jan 2 17:04:23 2014 +0100

    Cope with release-candidate versions of Octave
---
 octave-pkg-helper | 1 +
 octave-pkg.mk     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/octave-pkg-helper b/octave-pkg-helper
index 29087ee..8fadeb0 100755
--- a/octave-pkg-helper
+++ b/octave-pkg-helper
@@ -30,6 +30,7 @@ init ();
 my %depends = ();
 
 my $octave_version = qx {/usr/bin/octave-config --print VERSION};
+$octave_version =~ s/-rc/~rc/;
 
 my $deps;
 if (open (DESC, "< DESCRIPTION")) {
diff --git a/octave-pkg.mk b/octave-pkg.mk
index 9908acf..070c7c2 100644
--- a/octave-pkg.mk
+++ b/octave-pkg.mk
@@ -30,7 +30,7 @@ shrpkg = /usr/share/octave/debian
 mpath = usr/share/octave/packages
 bpath = usr/lib/$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)/octave/packages
 hosttype = $(shell octave-config -p CANONICAL_HOST_TYPE)
-version = $(shell octave-config -p VERSION)
+version = $(shell octave-config -p VERSION | sed 's/-rc/~rc/')
 apiversion = $(shell octave-config -p API_VERSION)
 octave = /usr/bin/octave
 octave_options = --no-history --silent --no-init-file --no-window-system

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