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

Rafael Laboissiere rafael@costa.debian.org
Thu, 10 Feb 2005 23:25:55 +0100


Author: rafael
Date: 2005-02-10 23:25:55 +0100 (Thu, 10 Feb 2005)
New Revision: 38

Added:
   trunk/packages/octave-epstk/debian/README.Debian
   trunk/packages/octave-epstk/debian/patches/50_psd-path.dpatch
Modified:
   trunk/packages/octave-epstk/debian/changelog
   trunk/packages/octave-epstk/debian/epstk.conf
   trunk/packages/octave-epstk/debian/patches/00list
   trunk/packages/octave-epstk/debian/patches/50_source-etc-epstk-conf.dpatch
Log:
Debian release octave-epstk_2.0.2-2


Added: trunk/packages/octave-epstk/debian/README.Debian
===================================================================
--- trunk/packages/octave-epstk/debian/README.Debian	2005-02-10 16:51:44 UTC (rev 37)
+++ trunk/packages/octave-epstk/debian/README.Debian	2005-02-10 22:25:55 UTC (rev 38)
@@ -0,0 +1,16 @@
+octave-epstk for Debian
+-----------------------
+
+The Debian package for epsTK introduces an improvement as regards the path
+for searching *.psd files (files containing symbols used in the edsymbol
+function).  A new global variable called ePsdPath is available.  This
+variable should contain a real path, like LOADPATH, allowing users to put
+its own *.psd files in a private directory, without losing the access to the
+*.psd files in ePath.  ePsdPath defaults to the value of ePath.
+
+Two new symbol files are added: tria-center.psd and ftria-center.psd,
+containing centered triangles.  The original tria.psd and ftria.psd symbols
+have their reference points on one of the sides of the triangle.
+
+
+ -- Rafael Laboissiere <rafael@debian.org>, 2005-01-10

Modified: trunk/packages/octave-epstk/debian/changelog
===================================================================
--- trunk/packages/octave-epstk/debian/changelog	2005-02-10 16:51:44 UTC (rev 37)
+++ trunk/packages/octave-epstk/debian/changelog	2005-02-10 22:25:55 UTC (rev 38)
@@ -1,3 +1,16 @@
+octave-epstk (2.0.2-2) unstable; urgency=low
+
+  +++ Changes by Rafael Laboissiere:
+
+  * debian/patches/50_source-etc-epstk-conf.dpatch: Added patch for file
+    m/eview.m, which also needs to source /etc/epstk.conf
+  * debian/patches/50_psd-path.dpatch: Implement the global variable
+    ePsdPath for searching *.psd files
+  * debian/epstk.conf: Set default value for ePsdPath
+  * debian/README.Debian: Added file
+  
+ -- Debian Octave Group <pkg-octave-devel@lists.alioth.debian.org>  Thu, 10 Feb 2005 20:35:43 +0100
+
 octave-epstk (2.0.2-1) unstable; urgency=low
 
   +++ Changes by Rafael Laboissiere:
@@ -107,7 +120,7 @@
     as README as it is the only document which provides a quick overview
 
   * Created a conffile /etc/epstk.conf for default variables (thanks to
-    Rafael Laboissier for the suggestion)
+    Rafael Laboissiere for the suggestion)
   * einit.m: source("/etc/epstk.conf"); to read Debian configuration
   * eview.m: source("/etc/epstk.conf"); to get value of eViewCommand
 

Modified: trunk/packages/octave-epstk/debian/epstk.conf
===================================================================
--- trunk/packages/octave-epstk/debian/epstk.conf	2005-02-10 16:51:44 UTC (rev 37)
+++ trunk/packages/octave-epstk/debian/epstk.conf	2005-02-10 22:25:55 UTC (rev 38)
@@ -5,6 +5,7 @@
 ## You can override it from your ~/.octaverc file
 
 ePath='/usr/share/octave/site/m/octave-epstk/'; % default directory of epstk-mfiles
+ePsdPath=ePath;                         % default path for the psd symbol files
 eFileName=tmpnam;                       % default eps-outputfile 
 eUserUnit='mm';                         % or 'cm' or 'inch' or 'inch/72'
 					 

Modified: trunk/packages/octave-epstk/debian/patches/00list
===================================================================
--- trunk/packages/octave-epstk/debian/patches/00list	2005-02-10 16:51:44 UTC (rev 37)
+++ trunk/packages/octave-epstk/debian/patches/00list	2005-02-10 22:25:55 UTC (rev 38)
@@ -1 +1,3 @@
 50_source-etc-epstk-conf
+50_psd-path
+

Added: trunk/packages/octave-epstk/debian/patches/50_psd-path.dpatch
===================================================================
--- trunk/packages/octave-epstk/debian/patches/50_psd-path.dpatch	2005-02-10 16:51:44 UTC (rev 37)
+++ trunk/packages/octave-epstk/debian/patches/50_psd-path.dpatch	2005-02-10 22:25:55 UTC (rev 38)
@@ -0,0 +1,61 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 50_psd-path.dpatch by  <rafael@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: New patch generated from octave-epstk 2.0.2-2 diff.gz
+
+@DPATCH@
+
+--- octave-epstk-2.0.2.orig/m/edsymbol.m
++++ octave-epstk-2.0.2/m/edsymbol.m
+@@ -58,7 +58,7 @@
+   psdFileName=symbolFileName(find(symbolFileName~=' '));
+   epsFile=fopen(psdFileName,'r');
+   if epsFile<2
+-    psdFileName=[ePath psdFileName];
++    psdFileName=file_in_path(ePsdPath, psdFileName);
+     epsFile=fopen(psdFileName,'r');
+   end
+   if epsFile>1
+--- octave-epstk-2.0.2.orig/m/ftria-center.psd
++++ octave-epstk-2.0.2/m/ftria-center.psd
+@@ -0,0 +1,13 @@
++% -*- postscript -*-
++/mm {2.83 mul} def
++/height {8.6603 mm} def
++/width {10 mm} def
++%draw filled triangle
++newpath
++width 2 div neg height 3 div neg 2 copy moveto
++0 height 3 div 2 mul lineto
++width 2 div height 3 div neg lineto lineto
++closepath
++fill
++stroke
++
+--- octave-epstk-2.0.2.orig/m/tria-center.psd
++++ octave-epstk-2.0.2/m/tria-center.psd
+@@ -0,0 +1,14 @@
++% -*- postscript -*-
++/mm {2.83 mul} def
++/height {8.6603 mm} def
++/width {10 mm} def
++/lineWidth {0.2 mm} def
++%draw triangle
++newpath
++30 mm 30 mm moveto
++%width 2 div neg height 3 div neg 2 copy moveto
++0 height 3 div 2 mul lineto
++width 2 div height 3 div neg lineto lineto
++closepath
++stroke
++
+--- octave-epstk-2.0.2.orig/m/eglobpar.m
++++ octave-epstk-2.0.2/m/eglobpar.m
+@@ -1,5 +1,6 @@
+ global ...
+ ePath...
++ePsdPath...
+ eGhostview...
+ eGhostscript...
+ eFileName...


Property changes on: trunk/packages/octave-epstk/debian/patches/50_psd-path.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/packages/octave-epstk/debian/patches/50_source-etc-epstk-conf.dpatch
===================================================================
--- trunk/packages/octave-epstk/debian/patches/50_source-etc-epstk-conf.dpatch	2005-02-10 16:51:44 UTC (rev 37)
+++ trunk/packages/octave-epstk/debian/patches/50_source-etc-epstk-conf.dpatch	2005-02-10 22:25:55 UTC (rev 38)
@@ -1,8 +1,8 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## 50_source-etc-epstk-conf.dpatch by  <rafael@debian.org>
+## 50_source-etc-epstk-conf.dpatch by Rafael Laboissiere <rafael@debian.org>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: New patch generated from octave-epstk 2.0.2-1 diff.gz
+## DP: Source epstk.conf file to get right default vaules
 
 @DPATCH@
 
@@ -16,3 +16,22 @@
  
  %fonts  (standard fonts of postscript)
  eFonts=[
+--- octave-epstk-2.0.2.orig/m/eview.m
++++ octave-epstk-2.0.2/m/eview.m
+@@ -18,10 +18,12 @@
+   if nargin<1
+     epsFileName=eFileName;
+   end
+-  if exist('eGhostview')~=1
+-    einit;
+-    eglobpar;
+-  end
++  % Debian GNU/Linux uses a config file  
++  %   if exist('eGhostview')~=1
++  %     einit;
++  %     eglobpar;
++  %   end
++  source ("/etc/epstk.conf");
+   if isempty(eGhostview)
+     disp('error in eview: no Postscript viewer installed');
+   else