[Pkg-octave-commit] r928 - in octave-epstk/trunk/debian: . patches
Rafael Laboissiere
rafael at alioth.debian.org
Wed May 23 10:25:05 UTC 2007
Author: rafael
Date: 2007-05-23 10:25:05 +0000 (Wed, 23 May 2007)
New Revision: 928
Removed:
octave-epstk/trunk/debian/patches/50_clean-tmp-files.patch
octave-epstk/trunk/debian/patches/50_fix_legend_scaling.patch
octave-epstk/trunk/debian/patches/60_autoscale-small-numbers.patch
Modified:
octave-epstk/trunk/debian/README.Debian
octave-epstk/trunk/debian/changelog
octave-epstk/trunk/debian/patches/50_axis-value-labels.patch
octave-epstk/trunk/debian/patches/50_psd-path.patch
octave-epstk/trunk/debian/patches/60_source-etc-epstk-conf.patch
octave-epstk/trunk/debian/patches/README
octave-epstk/trunk/debian/rules
Log:
Further changes for release 2.2-1 (see new parts of changelog for a
description of the changes)
Modified: octave-epstk/trunk/debian/README.Debian
===================================================================
--- octave-epstk/trunk/debian/README.Debian 2007-05-22 15:44:34 UTC (rev 927)
+++ octave-epstk/trunk/debian/README.Debian 2007-05-23 10:25:05 UTC (rev 928)
@@ -12,22 +12,19 @@
containing centered triangles. The original tria.psd and ftria.psd symbols
have their reference points on one of the sides of the triangle.
-Another patch was applied to the Debian package, which allows arbitrary text
-in the tics labels for the plot axes. An example of an output EPS file is
-attached below. The desired labels are put in the *ValueFormat global
-variables. Below is an example:
+Another patch was applied to the Debian package, which allows arbitrary
+text in the tics labels for the plot axes. The desired labels are put in
+the *ValueFormat global variables. Below is an example:
- eXAxisNorthValueFormat = [" ";"FELL";" ";" ";" ";" ";" ";" ";" ";" "; \
- " ";"FEHL"];
- eXAxisSouthValueFormat = "";
- for i=1:11
- eXAxisSouthValueFormat = [eXAxisSouthValueFormat; (sprintf ("%d", i))];
+ eXAxisNorthValueFormat = {"","A","","","","","","","","","","B"};
+ eXAxisSouthValueFormat = {""};
+ for i = 2 : 12
+ eXAxisSouthValueFormat {i} = sprintf ("%d", i);
endfor
In upstream epsTK, these variables are scalar integers specifying the
-decimal precision of the labels. With my patch, I detect if they are
-vectors and, if it is the case, the elements of the vectors are printed
-instead of the numeric tic labels. This patch keeps the API backwards
-compatible.
+decimal precision of the labels. With the patch, the variables are checked
+to be cells and, if it is the case, their elements are printed instead of
+the numeric tic labels. This patch keeps the API backwards compatible.
-- Rafael Laboissiere <rafael at debian.org>, 2005-27-02
Modified: octave-epstk/trunk/debian/changelog
===================================================================
--- octave-epstk/trunk/debian/changelog 2007-05-22 15:44:34 UTC (rev 927)
+++ octave-epstk/trunk/debian/changelog 2007-05-23 10:25:05 UTC (rev 928)
@@ -2,8 +2,18 @@
NOT YET RELEASED!
- [ Rafael Laboissiere ]
* New upstream release
+ * debian/patches:
+ + 50_axis-value-labels, 60_source-etc-epstk-conf: Adapted to new
+ upstream version
+ + 50_clean-tmp-files, 50_fix_legend_scaling,
+ 60_autoscale-small-numbers: Removed (applied upstream)
+ + 50_psd-path: Removed parts that were applied upstream
+ * debian/README.Debian: Reworded text about patch 50_axis-value-labels
+ * debian/rules:
+ + When calling the demo batch, undefine ehelp such that a web browser
+ is not invoked by edemos.m
+ + Remove m/demo*.html files created by edemos
--
Modified: octave-epstk/trunk/debian/patches/50_axis-value-labels.patch
===================================================================
--- octave-epstk/trunk/debian/patches/50_axis-value-labels.patch 2007-05-22 15:44:34 UTC (rev 927)
+++ octave-epstk/trunk/debian/patches/50_axis-value-labels.patch 2007-05-23 10:25:05 UTC (rev 928)
@@ -1,65 +1,26 @@
--- 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;
+@@ -62,7 +62,7 @@
+ if isstr(vForm)
+ valueForm=vForm;
+ else
+- if vForm==0
++ if isscalar (vForm) && vForm==0
+ expo=-log10(valueStep*signOfDelta);
+ if rem(expo,1)>0
+ expo=expo+1;
+@@ -128,6 +128,14 @@
+ valueCurrent=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
++ if iscell (vForm)
++ valueForm = '%s';
++ if size (vForm, 1) >= currentLabel
++ valueCurrent = vForm {currentLabel++};
++ else
++ currentValue = ' ';
++ end
+ end
- valueStr=sprintf(valueForm,currentValue);
+ valueStr=sprintf(valueForm,valueCurrent);
fprintf(epsFile,showForm,valueStr);
end
Deleted: octave-epstk/trunk/debian/patches/50_clean-tmp-files.patch
===================================================================
--- octave-epstk/trunk/debian/patches/50_clean-tmp-files.patch 2007-05-22 15:44:34 UTC (rev 927)
+++ octave-epstk/trunk/debian/patches/50_clean-tmp-files.patch 2007-05-23 10:25:05 UTC (rev 928)
@@ -1,22 +0,0 @@
-diff -Nur octave-epstk-2.1/m/ebbox.m octave-epstk-2.1.new/m/ebbox.m
---- octave-epstk-2.1/m/ebbox.m 2006-12-22 14:13:17.000000000 +0100
-+++ octave-epstk-2.1.new/m/ebbox.m 2006-12-22 14:19:19.000000000 +0100
-@@ -49,6 +49,7 @@
- resolution=72;
- mapName=ebitmap(3,resolution,'bbox.ppm.tmp',epsFileName);
- img=eimgread('bbox.ppm.tmp');
-+ unlink ("bbox.ppm.tmp");
- imgH=size(img,1);
- xpos=find(min(img)<16777215);
- xn=size(xpos,2);
-diff -Nur octave-epstk-2.1/m/ebitmap.m octave-epstk-2.1.new/m/ebitmap.m
---- octave-epstk-2.1/m/ebitmap.m 2005-04-08 09:47:39.000000000 +0200
-+++ octave-epstk-2.1.new/m/ebitmap.m 2006-12-22 14:18:53.000000000 +0100
-@@ -154,6 +154,7 @@
- else
- unix(ghostscript);
- end
-+ unlink (tmpFileName);
- if message
- message=sprintf('%s is written',mapFileName);
- disp(message);
Deleted: octave-epstk/trunk/debian/patches/50_fix_legend_scaling.patch
===================================================================
--- octave-epstk/trunk/debian/patches/50_fix_legend_scaling.patch 2007-05-22 15:44:34 UTC (rev 927)
+++ octave-epstk/trunk/debian/patches/50_fix_legend_scaling.patch 2007-05-23 10:25:05 UTC (rev 928)
@@ -1,20 +0,0 @@
-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)
Modified: octave-epstk/trunk/debian/patches/50_psd-path.patch
===================================================================
--- octave-epstk/trunk/debian/patches/50_psd-path.patch 2007-05-22 15:44:34 UTC (rev 927)
+++ octave-epstk/trunk/debian/patches/50_psd-path.patch 2007-05-23 10:25:05 UTC (rev 928)
@@ -1,18 +1,3 @@
---- octave-epstk-2.0.2.orig/m/edsymbol.m
-+++ octave-epstk-2.0.2/m/edsymbol.m
-@@ -58,8 +58,10 @@
- psdFileName=symbolFileName(find(symbolFileName~=' '));
- epsFile=fopen(psdFileName,'rb');
- if epsFile<2
-- psdFileName=[ePath psdFileName];
-- epsFile=fopen(psdFileName,'rb');
-+ psdFileName=file_in_path(ePsdPath, psdFileName);
-+ if ! isempty (psdFileName)
-+ epsFile=fopen(psdFileName,'rb');
-+ end
- end
- if epsFile>1
- % get file length
--- octave-epstk-2.0.2.orig/m/ftria-center.psd
+++ octave-epstk-2.0.2/m/ftria-center.psd
@@ -0,0 +1,13 @@
@@ -31,7 +16,7 @@
+
--- octave-epstk-2.0.2.orig/m/tria-center.psd
+++ octave-epstk-2.0.2/m/tria-center.psd
-@@ -0,0 +1,14 @@
+@@ -0,0 +1,13 @@
+% -*- postscript -*-
+/mm {2.83 mul} def
+/height {8.6603 mm} def
@@ -45,13 +30,4 @@
+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...
++
\ No newline at end of file
Deleted: octave-epstk/trunk/debian/patches/60_autoscale-small-numbers.patch
===================================================================
--- octave-epstk/trunk/debian/patches/60_autoscale-small-numbers.patch 2007-05-22 15:44:34 UTC (rev 927)
+++ octave-epstk/trunk/debian/patches/60_autoscale-small-numbers.patch 2007-05-23 10:25:05 UTC (rev 928)
@@ -1,27 +0,0 @@
-diff -Nur octave-epstk-2.1/m/escalexy.m octave-epstk-2.1.new/m/escalexy.m
---- octave-epstk-2.1/m/escalexy.m 2006-12-22 14:42:41.000000000 +0100
-+++ octave-epstk-2.1.new/m/escalexy.m 2006-12-22 14:42:51.000000000 +0100
-@@ -53,10 +53,12 @@
- %autoscale
- signOfDelta=sign(startEndDiff);
- deltaLabel=eticdis(signOfDelta*startEndDiff,maxValues);
-+ LabelEps=deltaLabel*1e-2;
- else
- %fixscale
- signOfDelta=sign(step);
- deltaLabel=signOfDelta*step;
-+ LabelEps=deltaLabel*sqrt(eps);
- end
- if is_scalar (vForm)
- if vForm==0
-@@ -119,8 +121,8 @@
- nPos=nPos+1;
- fprintf(epsFile,ticLineForm,longTicLength);
- % value
-- if vVisible & (offset>=0 | abs(currentValue)>1e-14)
-- if abs(currentValue)<1e-14
-+ if vVisible & (offset>=0 | abs(currentValue)>LabelEps)
-+ if abs(currentValue)<LabelEps
- currentValue=0;
- end
- fprintf(epsFile,moveValueForm);
Modified: octave-epstk/trunk/debian/patches/60_source-etc-epstk-conf.patch
===================================================================
--- octave-epstk/trunk/debian/patches/60_source-etc-epstk-conf.patch 2007-05-22 15:44:34 UTC (rev 927)
+++ octave-epstk/trunk/debian/patches/60_source-etc-epstk-conf.patch 2007-05-23 10:25:05 UTC (rev 928)
@@ -5,21 +5,20 @@
+eConfigFile...
ePath...
ePsdPath...
- eGhostview...
---- octave-epstk-2.1.orig/m/einit.m
-+++ octave-epstk-2.1/m/einit.m
-@@ -48,6 +48,14 @@
-
- eFile=0; %fileId of eFileName
-
-+### Use default value for the config file in case it is not already
-+### defined by the user
-+if exist ("eConfigFile") != 1 || ! isstr (eConfigFile)
-+ eConfigFile = "/etc/epstk.conf";
-+endif
-+
-+source (eConfigFile); % source Debian configuration file
-+
- % fonts (standard fonts of postscript)
- eFonts=[
- 'Times-Roman '; % font number 1
+ eDocUrl...
+diff -Nur epstk22/m/einit.m epstk22.new/m/einit.m
+--- epstk22/m/einit.m 2007-05-21 11:48:37.000000000 +0200
++++ epstk22.new/m/einit.m 2007-05-23 12:12:59.000000000 +0200
+@@ -345,10 +345,9 @@
+
+ % read config-file on octave/linux systems
+ if exist('matlabpath')~=5
+- if exist('eConfigFile')~=2
++ if exist('eConfigFile')~=1
+ eConfigFile='/etc/epstk.conf';
+- end
+- if exist('eConfigFile')~=2
++ else
+ source(eConfigFile);
+ end
+ end
Modified: octave-epstk/trunk/debian/patches/README
===================================================================
--- octave-epstk/trunk/debian/patches/README 2007-05-22 15:44:34 UTC (rev 927)
+++ octave-epstk/trunk/debian/patches/README 2007-05-23 10:25:05 UTC (rev 928)
@@ -2,11 +2,6 @@
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;
Modified: octave-epstk/trunk/debian/rules
===================================================================
--- octave-epstk/trunk/debian/rules 2007-05-22 15:44:34 UTC (rev 927)
+++ octave-epstk/trunk/debian/rules 2007-05-23 10:25:05 UTC (rev 928)
@@ -6,11 +6,11 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
-# kick out files created during 'make check';
+# kick out files created during 'make check';
# without this, we can't use globbing parameters in octave-epstk.install
# (difficulties arise for example with .jpg, as default.jpg should be included,
# but no other .jpg files)
-DEB_DH_INSTALL_ARGS += --exclude=myNewSymbol.psd
+DEB_DH_INSTALL_ARGS += --exclude=myNewSymbol.psd
# Poor man's "make check"
build/octave-epstk:: build-stamp
@@ -20,6 +20,7 @@
( cd m ; \
echo 'global eConfigFile; \
eConfigFile = "../debian/epstk.conf-demos"; \
+ ehelp = "No call to ehelp in demo batch"; \
edemos;' \
| octave$$v -qf ) ; \
done
@@ -32,7 +33,7 @@
rm -f build-stamp
( cd m ; \
rm -f *-center.psd *.eps *.tmp img* myNewSymbol.psd \
- demo*.ppm demo*.jpg demo_* )
+ demo*.ppm demo*.jpg demo_* demo*.html)
More information about the Pkg-octave-commit
mailing list