[Pkg-octave-commit] r2715 - octave/trunk/debian

[Rafael Laboissiere]

Author: rafael
Date: 2009-03-09 12:56:04 +0000 (Mon, 09 Mar 2009)
New Revision: 2715

Modified:
   octave/trunk/debian/changelog
   octave/trunk/debian/rules
Log:
Get API version directly from the upstream version.h file

Modified: octave/trunk/debian/changelog
===================================================================
--- octave/trunk/debian/changelog	2009-03-09 12:52:55 UTC (rev 2714)
+++ octave/trunk/debian/changelog	2009-03-09 12:56:04 UTC (rev 2715)
@@ -4,8 +4,10 @@
   * debian/in/control: Build-Depend on libqrupdate-dev for octave3.1
   * debian/patches/remove-y.tab.h-in-maintainer-clean.dpatch: New patch
     for avoiding src/y.tab.h to be removed by make distclean
-  * debian/rules: Do not install the enscript directory into the common
-    package.  This is now obsolete
+  * debian/rules:
+    + Do not install the enscript directory into the common package.  This
+      is now obsolete.
+    + Get API version directly from the upstream version.h file
 
  -- Rafael Laboissiere <rafael at debian.org>  Mon, 09 Mar 2009 01:36:46 +0100
 

Modified: octave/trunk/debian/rules
===================================================================
--- octave/trunk/debian/rules	2009-03-09 12:52:55 UTC (rev 2714)
+++ octave/trunk/debian/rules	2009-03-09 12:56:04 UTC (rev 2715)
@@ -23,19 +23,20 @@
 			perl -nle 'm/.*(\d.\d)/ and print $$1')
 
 hack:
-	@echo $(version)
+	@echo $(api_version)
 
 ifeq ($(major),3.1)
 priority	:= 70
-api_version	:= 34
 else
 ifeq ($(major),3.0)
 priority	:= 90
-api_version	:= 32
 else
 endif
 endif
 
+api_version = $(shell perl -ne 'if (/OCTAVE_API_VERSION\s+"api-v(.*)"/)	\
+	                          { print "$$1\n" ; last }' < src/version.h)
+
 ## The following is necessary when building the documentation file octave.pdf
 export TEXMFCNF = $(CURDIR)/debian: