[Pkg-octave-commit] rev 524 - in
trunk/packages/octave-epstk/debian: . patches
Rafael Laboissiere
rafael at costa.debian.org
Mon Mar 20 07:05:08 UTC 2006
Author: rafael
Date: 2006-03-20 07:05:05 +0000 (Mon, 20 Mar 2006)
New Revision: 524
Added:
trunk/packages/octave-epstk/debian/patches/50_axis-value-labels.patch
trunk/packages/octave-epstk/debian/patches/50_fix_legend_scaling.patch
trunk/packages/octave-epstk/debian/patches/50_psd-path.patch
trunk/packages/octave-epstk/debian/patches/50_source-etc-epstk-conf.patch
trunk/packages/octave-epstk/debian/patches/README
Removed:
trunk/packages/octave-epstk/debian/patches/00list
trunk/packages/octave-epstk/debian/patches/50_axis-value-labels.dpatch
trunk/packages/octave-epstk/debian/patches/50_fix_legend_scaling.dpatch
trunk/packages/octave-epstk/debian/patches/50_psd-path.dpatch
trunk/packages/octave-epstk/debian/patches/50_source-etc-epstk-conf.dpatch
Modified:
trunk/packages/octave-epstk/debian/
trunk/packages/octave-epstk/debian/changelog
trunk/packages/octave-epstk/debian/patches/
trunk/packages/octave-epstk/debian/rules
Log:
* Switched from dpatch to CDBS' simple-patchsys
* Added some entries to the exclusion lists
Property changes on: trunk/packages/octave-epstk/debian
___________________________________________________________________
Name: svn:ignore
- files
patched
tmp
+ files
tmp
octave-epstk
stamp-patch*
Modified: trunk/packages/octave-epstk/debian/changelog
===================================================================
--- trunk/packages/octave-epstk/debian/changelog 2006-03-19 18:35:28 UTC (rev 523)
+++ trunk/packages/octave-epstk/debian/changelog 2006-03-20 07:05:05 UTC (rev 524)
@@ -5,14 +5,20 @@
[ Thomas Weber ]
* Update FSF postal address in copyright file
* Bumped standards version to 3.6.2. No changes needed.
- * Bumped debhelper compat version to 5.
+ * Bumped debhelper compat version to 5.
* Switch to CDBS.
* Add 50_fix_legend_scaling.dpatch (Closes: #347665)
- --
+ [ Rafael Laboissiere ]
+ * debian/rules: Use CDBS' simple-patchsys instead of dpatch
+ * debian/patches/*.patch: Renamed from *.dpatch
+ * debian/patches/README: Description of the patches. This information
+ used to be in the headers of the old dpatches.
-Octave-epstk (2.1-1) unstable; urgency=low
+ --
+octave-epstk (2.1-1) unstable; urgency=low
+
+++ Changes by Rafael Laboissiere
* New upstream release
Property changes on: trunk/packages/octave-epstk/debian/patches
___________________________________________________________________
Name: svn:ignore
+ *.patch.level-*.log
Deleted: trunk/packages/octave-epstk/debian/patches/00list
Deleted: trunk/packages/octave-epstk/debian/patches/50_axis-value-labels.dpatch
Copied: trunk/packages/octave-epstk/debian/patches/50_axis-value-labels.patch (from rev 523, trunk/packages/octave-epstk/debian/patches/50_axis-value-labels.dpatch)
===================================================================
--- trunk/packages/octave-epstk/debian/patches/50_axis-value-labels.dpatch 2006-03-19 18:35:28 UTC (rev 523)
+++ trunk/packages/octave-epstk/debian/patches/50_axis-value-labels.patch 2006-03-20 07:05:05 UTC (rev 524)
@@ -0,0 +1,65 @@
+--- octave-epstk-2.0.2.orig/m/escalexy.m
++++ octave-epstk-2.0.2/m/escalexy.m
+@@ -58,22 +58,23 @@
+ signOfDelta=sign(step);
+ deltaLabel=signOfDelta*step;
+ end
+- if vForm==0
+- expo=-log10(deltaLabel);
+- if rem(expo,1)>0
+- expo=expo+1;
++ if is_scalar (vForm)
++ if vForm==0
++ expo=-log10(deltaLabel);
++ if rem(expo,1)>0
++ expo=expo+1;
++ end
++ autoForm=fix(expo);
++ if autoForm>0
++ vForm=autoForm;
++ end
+ end
+- autoForm=fix(expo);
+- if autoForm>0
+- vForm=autoForm;
++ if vForm<0
++ valueForm='%g';
++ else
++ valueForm=sprintf('%%1.%df',vForm);
+ end
+- end
+- if vForm<0
+- valueForm='%g';
+- else
+- valueForm=sprintf('%%1.%df',vForm);
+- end
+-
++ end
+
+ %start ticNo and offset
+ nShortTics=rem(startValue,deltaLabel)/deltaLabel*5*signOfDelta;
+@@ -104,6 +105,7 @@
+ currentTic=0;
+ currentValue=firstTicValue;
+ longTicPos=0;
++ currentLabel=1;
+ nPos=0;
+ while signOfDelta*currentValue<=signOfDelta*endValue
+ currentPos=startPos+axisFac*(currentValue-startValue);
+@@ -122,6 +124,16 @@
+ currentValue=0;
+ end
+ fprintf(epsFile,moveValueForm);
++ if ! is_scalar (vForm)
++ valueForm='%s';
++ if size(vForm,1) >= currentLabel
++ currentValue=vForm(currentLabel,:);
++ currentValue=currentValue(find(currentValue~=' '));
++ currentLabel=currentLabel+1;
++ else
++ currentValue=' ';
++ end
++ end
+ valueStr=sprintf(valueForm,currentValue);
+ fprintf(epsFile,showForm,valueStr);
+ end
Deleted: trunk/packages/octave-epstk/debian/patches/50_fix_legend_scaling.dpatch
Copied: trunk/packages/octave-epstk/debian/patches/50_fix_legend_scaling.patch (from rev 523, trunk/packages/octave-epstk/debian/patches/50_fix_legend_scaling.dpatch)
===================================================================
--- trunk/packages/octave-epstk/debian/patches/50_fix_legend_scaling.dpatch 2006-03-19 18:35:28 UTC (rev 523)
+++ trunk/packages/octave-epstk/debian/patches/50_fix_legend_scaling.patch 2006-03-20 07:05:05 UTC (rev 524)
@@ -0,0 +1,20 @@
+diff -urNad octave-epstk-2.1~/m/eplotlg.m octave-epstk-2.1/m/eplotlg.m
+--- octave-epstk-2.1~/m/eplotlg.m 2005-04-08 09:47:39.000000000 +0200
++++ octave-epstk-2.1/m/eplotlg.m 2006-03-19 19:28:09.000000000 +0100
+@@ -6,6 +6,7 @@
+ if (nargin~=10)
+ eusage('eplotlg(epsFile,x,y,color,dash,lineWidth,text,textFont,textSize,textColor)');
+ end
++ eglobpar;
+ textH=textSize*0.75;
+ lineLength=3*textH;
+
+@@ -23,7 +24,7 @@
+ elseif max(size(dash))==1
+ if dash>=0
+ y=y+textSize/4;
+- exyline(epsFile,0,0,[x;x+lineLength],[y;y],color,dash,lineWidth);
++ exyline(epsFile,0,0,[x;x+lineLength],[y;y],color,dash*eFac,lineWidth);
+ else
+ erect(epsFile,x,y,lineLength,textH,0,color,dash,0)
+ erect(epsFile,x,y,lineLength,textH,0,textColor,0,0)
Deleted: trunk/packages/octave-epstk/debian/patches/50_psd-path.dpatch
Copied: trunk/packages/octave-epstk/debian/patches/50_psd-path.patch (from rev 523, trunk/packages/octave-epstk/debian/patches/50_psd-path.dpatch)
===================================================================
--- trunk/packages/octave-epstk/debian/patches/50_psd-path.dpatch 2006-03-19 18:35:28 UTC (rev 523)
+++ trunk/packages/octave-epstk/debian/patches/50_psd-path.patch 2006-03-20 07:05:05 UTC (rev 524)
@@ -0,0 +1,53 @@
+--- 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,'rb');
+ if epsFile<2
+- psdFileName=[ePath psdFileName];
++ psdFileName=file_in_path(ePsdPath, psdFileName);
+ epsFile=fopen(psdFileName,'rb');
+ 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...
Deleted: trunk/packages/octave-epstk/debian/patches/50_source-etc-epstk-conf.dpatch
Copied: trunk/packages/octave-epstk/debian/patches/50_source-etc-epstk-conf.patch (from rev 523, trunk/packages/octave-epstk/debian/patches/50_source-etc-epstk-conf.dpatch)
===================================================================
--- trunk/packages/octave-epstk/debian/patches/50_source-etc-epstk-conf.dpatch 2006-03-19 18:35:28 UTC (rev 523)
+++ trunk/packages/octave-epstk/debian/patches/50_source-etc-epstk-conf.patch 2006-03-20 07:05:05 UTC (rev 524)
@@ -0,0 +1,11 @@
+--- octave-epstk-2.1.orig/m/einit.m
++++ octave-epstk-2.1/m/einit.m
+@@ -48,6 +48,8 @@
+
+ eFile=0; %fileId of eFileName
+
++source ("/etc/epstk.conf"); % source Debian configuration file
++
+ % fonts (standard fonts of postscript)
+ eFonts=[
+ 'Times-Roman '; % font number 1
Added: trunk/packages/octave-epstk/debian/patches/README
===================================================================
--- trunk/packages/octave-epstk/debian/patches/README 2006-03-19 18:35:28 UTC (rev 523)
+++ trunk/packages/octave-epstk/debian/patches/README 2006-03-20 07:05:05 UTC (rev 524)
@@ -0,0 +1,20 @@
+50_axis-value-labels
+ author: Rafael Laboissiere <rafael at debian.org>
+ description: Allow arbitrary labels to be plotted at axis tics
+
+50_fix_legend_scaling
+ author: Thomas Weber <thomas.weber.mail at gmail.com>
+ description: Scaling of the legend is the same as the scaling of the plot,
+ see #347665
+
+50_psd-path
+ author: Rafael Laboissiere <rafael at debian.org>
+ description: Allow PSD files to be found in the path defined by ePsdPath;
+ also, defines two new centered symbols ftria-center and
+ tria-center
+
+50_source-etc-epstk-conf
+ author: Rafael Laboissiere <rafael at debian.org>
+ description: Source /etc/epstk.conf in einit.m
+
+
Modified: trunk/packages/octave-epstk/debian/rules
===================================================================
--- trunk/packages/octave-epstk/debian/rules 2006-03-19 18:35:28 UTC (rev 523)
+++ trunk/packages/octave-epstk/debian/rules 2006-03-20 07:05:05 UTC (rev 524)
@@ -6,5 +6,5 @@
include /usr/share/octave/debian/defs.make
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
More information about the Pkg-octave-commit
mailing list