[Pkg-octave-commit] rev 708 - in trunk/packages/octave-epstk/debian: . patches

[Rafael Laboissiere]

Author: rafael
Date: 2006-08-16 16:03:16 +0000 (Wed, 16 Aug 2006)
New Revision: 708

Added:
   trunk/packages/octave-epstk/debian/NEWS.Debian
   trunk/packages/octave-epstk/debian/epstk.conf-demos
   trunk/packages/octave-epstk/debian/patches/60_source-etc-epstk-conf.patch
Removed:
   trunk/packages/octave-epstk/debian/patches/50_source-etc-epstk-conf.patch
Modified:
   trunk/packages/octave-epstk/debian/changelog
   trunk/packages/octave-epstk/debian/rules
Log:
Debian release octave-epstk_2.1-6

Added: trunk/packages/octave-epstk/debian/NEWS.Debian
===================================================================
--- trunk/packages/octave-epstk/debian/NEWS.Debian	2006-08-16 08:34:43 UTC (rev 707)
+++ trunk/packages/octave-epstk/debian/NEWS.Debian	2006-08-16 16:03:16 UTC (rev 708)
@@ -0,0 +1,14 @@
+octave-epstk (2.1-6) unstable; urgency=low
+
+    Starting with version 2.1-5, octave-epstk works with both octave2.1 and
+    octave2.9.
+
+    The user can also specify the name of the configuration file to be
+    sourced by einit, overriding the default /etc/epstk.conf.  This is
+    accomplished by storing the file name in the eConfigFile
+    variable prior to calling any of the epstk functions.  Notice that
+    the variable eConfigFile must be declared global, otherwise the above
+    won't work.
+
+ -- Rafael Laboissiere <rafael at debian.org>  Wed, 16 Aug 2006 14:50:07 +0200
+

Modified: trunk/packages/octave-epstk/debian/changelog
===================================================================
--- trunk/packages/octave-epstk/debian/changelog	2006-08-16 08:34:43 UTC (rev 707)
+++ trunk/packages/octave-epstk/debian/changelog	2006-08-16 16:03:16 UTC (rev 708)
@@ -1,3 +1,15 @@
+octave-epstk (2.1-6) unstable; urgency=low
+
+  * debian/patches/60_source-etc-epstk-conf.patch: Allow the user to
+    specify another configuration file through the variable
+    eConfigFile
+  * debian/NEWS.Debian: Document the change above
+  * debian/epstk.conf-demos: Configuration file for running the demos
+    at package building
+  * debian/rules: Use the above
+
+ -- Rafael Laboissiere <rafael at debian.org>  Wed, 16 Aug 2006 14:55:16 +0200
+
 octave-epstk (2.1-5) unstable; urgency=low
 
   * debian/rules:

Added: trunk/packages/octave-epstk/debian/epstk.conf-demos
===================================================================
--- trunk/packages/octave-epstk/debian/epstk.conf-demos	2006-08-16 08:34:43 UTC (rev 707)
+++ trunk/packages/octave-epstk/debian/epstk.conf-demos	2006-08-16 16:03:16 UTC (rev 708)
@@ -0,0 +1,6 @@
+## -*- octave -*-
+## Configuration file for running the demos during the building of
+## the Debian GNU/Linux package of octave-epstk
+
+ePath = "./";
+ePsdPath = ePath;

Deleted: trunk/packages/octave-epstk/debian/patches/50_source-etc-epstk-conf.patch

Copied: trunk/packages/octave-epstk/debian/patches/60_source-etc-epstk-conf.patch (from rev 707, trunk/packages/octave-epstk/debian/patches/50_source-etc-epstk-conf.patch)
===================================================================
--- trunk/packages/octave-epstk/debian/patches/50_source-etc-epstk-conf.patch	2006-08-16 08:34:43 UTC (rev 707)
+++ trunk/packages/octave-epstk/debian/patches/60_source-etc-epstk-conf.patch	2006-08-16 16:03:16 UTC (rev 708)
@@ -0,0 +1,25 @@
+--- octave-epstk-2.1.orig/m/eglobpar.m  2006-08-16 15:10:23.662736944 +0200
++++ octave-epstk-2.1/m/eglobpar.m      2006-08-16 15:11:11.049533056 +0200
+@@ -1,4 +1,5 @@
+ global ...
++eConfigFile...
+ ePath...
+ ePsdPath...
+ eGhostview...
+--- octave-epstk-2.1.orig/m/einit.m
++++ octave-epstk-2.1/m/einit.m
+@@ -48,6 +48,14 @@
+
+ eFile=0; %fileId of eFileName
+
++### Use default value for the config file in case it is not already
++### defined by the user
++if exist ("eConfigFile") != 1 || ! isstr (eConfigFile)
++  eConfigFile = "/etc/epstk.conf";
++endif
++
++source (eConfigFile);    % source Debian configuration file
++
+ % fonts  (standard fonts of postscript)
+ eFonts=[
+ 'Times-Roman                 ';      % font number 1

Modified: trunk/packages/octave-epstk/debian/rules
===================================================================
--- trunk/packages/octave-epstk/debian/rules	2006-08-16 08:34:43 UTC (rev 707)
+++ trunk/packages/octave-epstk/debian/rules	2006-08-16 16:03:16 UTC (rev 708)
@@ -9,10 +9,13 @@
 # Poor man's "make check"
 build/octave-epstk:: build-stamp
 build-stamp:
-	for v in 2.1 2.9 ; do					\
-		echo "### Running demos with octave$$v"	;	\
-		( cd m ; echo 'ePsdPath=".";edemos;'	\
-			| octave$$v -qf ) ;			\
+	for v in 2.1 2.9 ; do						\
+		echo "### Running demos with octave$$v"	;		\
+		( cd m ; 						\
+		  echo 'global eConfigFile;				\
+			eConfigFile = "../debian/epstk.conf-demos";	\
+			edemos;'					\
+			| octave$$v -qf ) ;				\
 	done
 	touch build-stamp