From 3809000ccba143287b06610f3cf6fc2d7d7d857a Mon Sep 17 00:00:00 2001
From: Oliver Heimlich <oheim@posteo.de>
Date: Fri, 13 Nov 2015 21:59:02 +0100
Subject: [PATCH] Improved DESCRIPTION generation for octave-api

* Use version number from C++ api
* Use current date for release date
* Shortened package description
---
 client-api/Octave/DESCRIPTION | 15 +++++----------
 client-api/Octave/Makefile    |  6 ++++--
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/client-api/Octave/DESCRIPTION b/client-api/Octave/DESCRIPTION
index dc53801..edadb90 100644
--- a/client-api/Octave/DESCRIPTION
+++ b/client-api/Octave/DESCRIPTION
@@ -1,16 +1,11 @@
 Name: vibes
-Version: 0.2.0
-Date: 2015-11-12
+Version: %VERSION%
+Date: %DATE%
 Author: Oliver Heimlich <oheim@posteo.de>
 Maintainer: ENSTA Bretagne Robotics
 Title: Interface to VIBes, Visualizer for Intervals and Boxes
-Description: VIBes is a visualization system that aims at providing people
- working with interval methods a way to display results (boxes, pavings),
- without worrying with GUI programming. It provides drawing functions
- accessible from a lot of programming languages, without complex installation
- and library dependencies. The main design goal of VIBes is to be
- cross-platform, available from different programming languages, simple to
- set-up, easy to port to a new language.
+Description: The VIBes API allows one to easily display results (boxes, pavings)
+ from interval methods.
  
  VIBes consists in two parts: (1) the VIBes application that features viewing,
  annotating and exporting figures, and (2) the VIBes API that enables your
@@ -18,6 +13,6 @@ Description: VIBes is a visualization system that aims at providing people
  
  This package integrates the VIBes API into Octave. The VIBes application
  is required for operation and must be installed seperately. Data types from
- third-party interval arithmetic libraries for Octave are also supportd.
+ third-party interval arithmetic libraries for Octave are also supported.
 Depends: octave (>= 4.0.0)
 License: GPLv3+
diff --git a/client-api/Octave/Makefile b/client-api/Octave/Makefile
index 1081385..8257306 100644
--- a/client-api/Octave/Makefile
+++ b/client-api/Octave/Makefile
@@ -20,8 +20,8 @@ SHELL = /bin/sh
 
 CUT ?= cut
 PACKAGE = $(shell grep "^Name: " DESCRIPTION | $(CUT) -f2 -d" ")
-VERSION = $(shell grep "^Version: " DESCRIPTION | $(CUT) -f2 -d" ")
-DATE = $(shell grep "^Date: " DESCRIPTION | $(CUT) -f2 -d" ")
+VERSION = $(shell grep "^/// \\\\version " ../C++/src/vibes.h | $(CUT) -f3 -d" " | sed -e "s/[^0-9.]//g")
+DATE = $(shell date "+%Y-%m-%d")
 
 ##
 ## Release Process
@@ -44,6 +44,8 @@ $(RELEASE_TARBALL): ../../.git/index
 		(cd "$(PACKAGE)-bundle" && tar xf -)
 	@(cd ../C++/; git archive --format=tar --prefix="$(PACKAGE)-$(VERSION)/" HEAD src) | \
 		(cd "$(PACKAGE)-bundle" && tar xf -)
+	@sed -i -e "s/%VERSION%/$(VERSION)/" "$(PACKAGE)-bundle/$(PACKAGE)-$(VERSION)/DESCRIPTION"
+	@sed -i -e "s/%DATE%/$(DATE)/" "$(PACKAGE)-bundle/$(PACKAGE)-$(VERSION)/DESCRIPTION"
 	@(cd "$(PACKAGE)-bundle" && tar czf "../$@" "$(PACKAGE)-$(VERSION)")
 
 ##