[Pkg-octave-commit] r1004 - in octave-epstk/trunk/debian: . patches

[Rafael Laboissiere]

Author: rafael
Date: 2007-08-28 16:35:29 +0000 (Tue, 28 Aug 2007)
New Revision: 1004

Added:
   octave-epstk/trunk/debian/patches/06_edsymbol-for-octave-2.9.13.patch
Modified:
   octave-epstk/trunk/debian/changelog
Log:
* debian/patches/06_edsymbol-for-octave-2.9.13.patch: Patch proposed by
  the upstream author, Stefan Mueller, for making edsymbol.m work with
  Octave 2.9.13
* debian/changelog: In the elisp section at the end of the file, do not
  include the string "NOT YET RELEASED"


Modified: octave-epstk/trunk/debian/changelog
===================================================================
--- octave-epstk/trunk/debian/changelog	2007-08-22 07:53:23 UTC (rev 1003)
+++ octave-epstk/trunk/debian/changelog	2007-08-28 16:35:29 UTC (rev 1004)
@@ -1,3 +1,12 @@
+octave-epstk (2.2-6) UNRELEASED; urgency=low
+
+  [ Rafael Laboissiere ]
+  * debian/patches/06_edsymbol-for-octave-2.9.13.patch: Patch proposed by
+    the upstream author, Stefan Müller, for making edsymbol.m work with
+    Octave 2.9.13
+
+ -- Rafael Laboissiere <rafael at debian.org>  Tue, 28 Aug 2007 17:53:42 +0200
+
 octave-epstk (2.2-5) unstable; urgency=low
 
   * debian/patches/05_faster-ebbox.patch: New patch.  Make ebbox 25%
@@ -320,7 +329,7 @@
       (save-excursion
         (forward-line -1)
         (beginning-of-line)
-        (insert "\n  NOT YET RELEASED!\n\n  [ "
+        (insert "\n  [ "
           (or (getenv "DEBFULLNAME") (user-full-name)) " ]")))
     nil t))
 End:

Added: octave-epstk/trunk/debian/patches/06_edsymbol-for-octave-2.9.13.patch
===================================================================
--- octave-epstk/trunk/debian/patches/06_edsymbol-for-octave-2.9.13.patch	                        (rev 0)
+++ octave-epstk/trunk/debian/patches/06_edsymbol-for-octave-2.9.13.patch	2007-08-28 16:35:29 UTC (rev 1004)
@@ -0,0 +1,45 @@
+diff -Nur epstk22/m/edsymbol.m epstk22.new/m/edsymbol.m
+--- epstk22/m/edsymbol.m	2007-05-21 11:48:37.000000000 +0200
++++ epstk22.new/m/edsymbol.m	2007-08-28 17:42:53.000000000 +0200
+@@ -54,21 +54,20 @@
+     fprintf(eFile,'%1.2f %1.2f %1.2f setrgbcolor\n',...
+           color(1),color(2),color(3));
+   end
+-
++  % test file
+   psdFileName=symbolFileName(find(symbolFileName~=' '));
+-  epsFile=fopen(psdFileName,'rb');
+-  if epsFile<2
+-    if exist('matlabpath')~=5
+-      psdFileName=file_in_path(ePsdPath, psdFileName); % only octave
+-    else
+-      psdFileName=[ePsdPath psdFileName];
+-    end
+-    if length(psdFileName)>0
+-      epsFile=fopen(psdFileName,'rb');
+-    end
++  testName=['./' psdFileName];
++  epsFile=fopen(testName,'rb');
++  if epsFile==-1
++    testName=[ePsdPath psdFileName];
++    epsFile=fopen(testName,'rb');
+   end
+-  if epsFile>1
+-    % get file length
++  if epsFile==-1
++    % symbolFileName  is a symbol definition
++    fprintf(eFile,'%s',symbolFileName);
++  else
++    psdFileName=testName;
++    % load symbol from file
+     fseek(epsFile,0,1); 
+     epsFileLength=ftell(epsFile);
+     fclose(epsFile);
+@@ -85,7 +84,5 @@
+       fwrite(eFile,buffer,'char');
+     end
+     fclose(epsFile);
+-  else
+-    fprintf(eFile,'%s',symbolFileName);
+   end
+   fprintf(eFile,' grestore }def\n');