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

[Rafael Laboissiere]

Author: rafael
Date: 2007-09-23 17:56:54 +0000 (Sun, 23 Sep 2007)
New Revision: 1015

Modified:
   octave/trunk/debian/changelog
   octave/trunk/debian/rules
Log:
* debian/rules: Patch the examples/octave.desktop.in file, such that the
  referenced command exists.  This fixes a Lintian warning.
* debian/changelog: Restores the "UNRELEASED" tag, which was wrongly replaced
  by "unstable" in the last commits


Modified: octave/trunk/debian/changelog
===================================================================
--- octave/trunk/debian/changelog	2007-09-23 17:47:02 UTC (rev 1014)
+++ octave/trunk/debian/changelog	2007-09-23 17:56:54 UTC (rev 1015)
@@ -1,4 +1,4 @@
-octave2.9 (1:2.9.14-1) unstable; urgency=low
+octave2.9 (1:2.9.14-1) UNRELEASED; urgency=low
 
   [ Thomas Weber ]
   * New upstream release
@@ -22,6 +22,8 @@
     + Added Homepage field
   * debian/in/PACKAGE-htmldoc.doc-base.faq: Reference the correct HTML
     files of the FAQ
+  * debian/rules: Patch the examples/octave.desktop.in file, such that the
+    referenced command exists
 
  -- Thomas Weber <thomas.weber.mail at gmail.com>  Sat, 22 Sep 2007 17:13:51 +0000
 

Modified: octave/trunk/debian/rules
===================================================================
--- octave/trunk/debian/rules	2007-09-23 17:47:02 UTC (rev 1014)
+++ octave/trunk/debian/rules	2007-09-23 17:56:54 UTC (rev 1015)
@@ -39,7 +39,8 @@
 debini		:= $(debtmp)/usr/share/octave/site/m/startup
 debininew	:= $(debtmp)/usr/share/octave/$(version)/m/startup
 
-savefiles	:= configure config.h.in scripts/configure doc/conf.texi
+savefiles	:= configure config.h.in scripts/configure	\
+			doc/conf.texi examples/octave.desktop.in
 texifiles	:= doc/interpreter/octave.texi		\
 			doc/liboctave/liboctave.texi	\
 			doc/faq/Octave-FAQ.texi
@@ -123,6 +124,10 @@
 
 	[ -f autogen.sh ] &&  ./autogen.sh && chmod 0755 configure
 
+	# Patch desktop file such that the referenced command exists
+	perl -pi -e 's:/bin/octave:/bin/octave-$(version):' \
+		examples/octave.desktop.in
+
 	DEFAULT_PAGER=pager				\
 	CC=$(c_compiler) 				\
 	CXX=$(cxx_compiler)				\