[Pkg-octave-commit] [SCM] octave-epstk branch, master, updated. d49304a95baeb330382a9bb92a4acfbebee60083

[Thomas Weber]

The following commit has been merged in the master branch:
commit aa3b3f4be6d7215652a1c649be7ed3e66f131d60
Author: Thomas Weber <tweber at debian.org>
Date:   Sun Dec 5 21:13:13 2010 +0100

    Drop patch 06_edsymbol-for-octave-2.9.13.patch

diff --git a/debian/changelog b/debian/changelog
index 8dbe78b..01cf453 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ octave-epstk (2.3-1) UNRELEASED; urgency=low
   * New upstream release
     - Dropped patches (applied upstream):
       - 05_faster-ebbox.patch
+      - 06_edsymbol-for-octave-2.9.13.patch
   * debian/control: Remove Rafael Laboissiere from Uploaders (Closes: #571895)
 
  -- Thomas Weber <thomas.weber.mail at gmail.com>  Sun, 28 Feb 2010 22:25:19 +0100
diff --git a/debian/patches/06_edsymbol-for-octave-2.9.13.patch b/debian/patches/06_edsymbol-for-octave-2.9.13.patch
deleted file mode 100644
index e16cca7..0000000
--- a/debian/patches/06_edsymbol-for-octave-2.9.13.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Author: Stefan Müller <stefan.mueller at fgan.de>
-Description: Make edsymbol.m work with Octave >= 2.9.13
-
-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');
diff --git a/debian/patches/series b/debian/patches/series
index bcf3baa..a731b82 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,7 +2,6 @@
 02_axis-value-labels.patch
 03_psd-path.patch
 04_source-etc-epstk-conf.patch
-06_edsymbol-for-octave-2.9.13.patch
 plot_whole_line
 tickless_axes
 update_documentation

-- 
octave-epstk