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

[Thomas Weber]

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

    Drop patch 05_faster-ebbox.patch

diff --git a/debian/changelog b/debian/changelog
index 0c1de15..8dbe78b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 octave-epstk (2.3-1) UNRELEASED; urgency=low
 
   * New upstream release
+    - Dropped patches (applied upstream):
+      - 05_faster-ebbox.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/05_faster-ebbox.patch b/debian/patches/05_faster-ebbox.patch
deleted file mode 100644
index 0189651..0000000
--- a/debian/patches/05_faster-ebbox.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Author: Rafael Laboissiere <rafael at debian.org>
-Description: Make ebbox 25% faster (according to the upstream author)
-
-diff -Nur epstk22/m/ebbox.m epstk22.new/m/ebbox.m
---- epstk22/m/ebbox.m	2007-05-21 11:48:37.000000000 +0200
-+++ epstk22.new/m/ebbox.m	2007-05-30 16:21:34.000000000 +0200
-@@ -37,12 +37,14 @@
-     epsFileName=eFileName;
-   end
-   headsize=500;
-+  % read file
-   epsFile=fopen(epsFileName,'rb');
--  data=fread(epsFile,headsize,'uchar');
-+  [data n]=fread(epsFile,inf,'uchar');
-   fclose(epsFile);
--  head=setstr(data');
--  pos=findstr(head,'BoundingBox:')+12;
--  currentBBox=sscanf(head(pos(1):pos(1)+40),'%f',4)';
-+  % get head
-+  head=setstr(data(1:headsize)');
-+  pos=findstr(head,'BoundingBox:');
-+  currentBBox=sscanf(head(pos(1)+12:pos(1)+40),'%f',4)';
-   if newBBox>=0
-     if size(newBBox,2)~=4
-       % autoresize
-@@ -65,12 +67,6 @@
-       newBBox=fix(newBBox);
-     end
-     % set new BBox
--    epsFile=fopen(epsFileName,'rb');
--    [data n]=fread(epsFile,inf,'uchar');
--    fclose(epsFile);
--    headsize=500;
--    head=setstr(data(1:headsize)');
--    pos=findstr(head,'BoundingBox:');
-     endpos=findstr(head(pos(1)+12:pos(1)+80),'%');
-     endpos=endpos+pos(1)+10;
-     epsFile=fopen(epsFileName,'wb');
diff --git a/debian/patches/series b/debian/patches/series
index eedca45..bcf3baa 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
-05_faster-ebbox.patch
 06_edsymbol-for-octave-2.9.13.patch
 plot_whole_line
 tickless_axes

-- 
octave-epstk