Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/106747


Change subject: Retrieve $PACKAGE_VERSION from debian/changelog
......................................................................

Retrieve $PACKAGE_VERSION from debian/changelog

Change-Id: I00d10ca2e1be236334f27d513b130ed922ce9b28
---
M configure.ac
M debian/changelog
2 files changed, 17 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/toollabs 
refs/changes/47/106747/1

diff --git a/configure.ac b/configure.ac
index 92d1b80..3e95745 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,17 @@
-AC_INIT([toollabs], [1.0.4dev], [mpellet...@wikimedia.org])
+AC_INIT([toollabs], m4_esyscmd_s([sed -ne '1s/^toollabs (\(.\+\)) .*$/\1/p;' 
debian/changelog]), [mpellet...@wikimedia.org])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_TESTDIR([tests])
 
+# If parsing the current version from debian/changelog did not work
+# (debian/changelog mangled, wrong pattern, sed not available, etc.),
+# autoreconf usually aborts with an obscure error message ("should be
+# called with package and version arguments").  In case it would
+# nevertheless continue, PACKAGE_VERSION would be empty.  So check
+# that it is set, otherwise abort.
+if test -z "$PACKAGE_VERSION"; then
+  AC_MSG_ERROR([PACKAGE_VERSION was not properly set.])
+fi
+
 AM_INIT_AUTOMAKE([foreign no-dist silent-rules -Wall -Werror])
 AC_PROG_INSTALL
 AC_PROG_LN_S
diff --git a/debian/changelog b/debian/changelog
index 262df44..0c2d710 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+toollabs (1.0.6dev) unstable; urgency=low
+
+  * Retrieve $PACKAGE_VERSION from debian/changelog
+
+ -- Tim Landscheidt <t...@tim-landscheidt.de>  Fri, 10 Jan 2014 18:11:00 +0000
+
 toollabs (1.0.5) unstable; urgency=low
 
   * Marc-André Pelletier: jsub should allow -q to override

-- 
To view, visit https://gerrit.wikimedia.org/r/106747
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I00d10ca2e1be236334f27d513b130ed922ce9b28
Gerrit-PatchSet: 1
Gerrit-Project: labs/toollabs
Gerrit-Branch: master
Gerrit-Owner: Tim Landscheidt <t...@tim-landscheidt.de>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to