[Pkg-octave-commit] rev 704 - in
trunk/packages/octave-epstk/debian: . patches
Rafael Laboissiere
rafael at costa.debian.org
Tue Aug 15 22:42:46 UTC 2006
Author: rafael
Date: 2006-08-15 22:42:44 +0000 (Tue, 15 Aug 2006)
New Revision: 704
Modified:
trunk/packages/octave-epstk/debian/changelog
trunk/packages/octave-epstk/debian/control
trunk/packages/octave-epstk/debian/epstk.conf
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/rules
Log:
Debian release octave-epstk_2.1-5
Modified: trunk/packages/octave-epstk/debian/changelog
===================================================================
--- trunk/packages/octave-epstk/debian/changelog 2006-08-15 21:48:02 UTC (rev 703)
+++ trunk/packages/octave-epstk/debian/changelog 2006-08-15 22:42:44 UTC (rev 704)
@@ -1,14 +1,25 @@
octave-epstk (2.1-5) unstable; urgency=low
- NOT YET RELEASED!
+ * debian/rules:
+ - Call both octave2.1-depends and octave2.9-depends
+ - Run the demos in batch mode using both octave2.1 and octave2.9
+ - Remove files in m/ left by running the demos
+ * debian/control:
+ - In the Depends field, use the new substvars ${octave<major>:Depends}
+ - Build-depends on recent versions of the octave2.{1,9}-headers packages
- [ Rafael Laboissiere ]
* debian/patches/50_add_plotdecimate.patch: New plotdecimate function
provided by Francesco Potorti` (renamed from the old patch
50_add_plotcollapse.patch)
- --
+ * debian/patches/50_source-etc-epstk-conf.patch: Only sources
+ /etc/epstk.conf if this file exists
+ * debian/patches/50_psd-path.patch: Avoid warning "implicit conversion
+ from matrix to string" when calling edsymbol
+
+ -- Rafael Laboissiere <rafael at debian.org> Mon, 14 Aug 2006 17:31:09 +0200
+
octave-epstk (2.1-4) unstable; urgency=low
[ Thomas Weber ]
Modified: trunk/packages/octave-epstk/debian/control
===================================================================
--- trunk/packages/octave-epstk/debian/control 2006-08-15 21:48:02 UTC (rev 703)
+++ trunk/packages/octave-epstk/debian/control 2006-08-15 22:42:44 UTC (rev 704)
@@ -5,12 +5,12 @@
Uploaders: Rafael Laboissiere <rafael at debian.org>
Standards-Version: 3.7.2
Build-Depends: debhelper (>= 5), cdbs
-Build-Depends-Indep: octave2.1-headers (>= 2.1.65)
- | octave2.9-headers (>= 2.9.1)
+Build-Depends-Indep: octave2.1-headers (>= 2.1.73-10),
+ octave2.9-headers (>= 2.9.7-2)
Package: octave-epstk
Architecture: all
-Depends: octave2.9 (>= 2.9.7) | octave2.1 (>= 2.1.73)
+Depends: ${octave-2-9:Depends} | ${octave-2-1:Depends}
Suggests: gv | postscript-viewer
Description: GNU Octave encapsulated postscript toolkit
The octave-epstk package provides, via a set of .m functions, a toolkit to
Modified: trunk/packages/octave-epstk/debian/epstk.conf
===================================================================
--- trunk/packages/octave-epstk/debian/epstk.conf 2006-08-15 21:48:02 UTC (rev 703)
+++ trunk/packages/octave-epstk/debian/epstk.conf 2006-08-15 22:42:44 UTC (rev 704)
@@ -1,18 +1,18 @@
## -*- octave -*-
-## Configuration file for the Debian GNU/Linux package of octave-epstk
+## Configuration file for the Debian GNU/Linux package of octave-epstk
##
-## This file is sourced by einit.m.
+## This file is sourced by einit.m.
## You can override it from your ~/.octaverc file
ePath='/usr/share/octave/site/m/octave-epstk/'; % default directory of epstk-mfiles
ePsdPath=ePath; % default path for the psd symbol files
-eFileName=tmpnam; % default eps-outputfile
+eFileName=tmpnam; % default eps-outputfile
eUserUnit='mm'; % or 'cm' or 'inch' or 'inch/72'
-
+
%eGhostview='ghostview -magstep -1'; % ghostview for linux
eGhostview='gv'; % gv for linux
-## See /usr/share/octave/site/m/epstk/einit.m for other values that you might
-## want to customize, and /usr/doc/octave-epstk/ for documentation.
+## See /usr/share/octave/site/m/epstk/einit.m for other values that you might
+## want to customize, and /usr/share/doc/octave-epstk/ for documentation.
Modified: trunk/packages/octave-epstk/debian/patches/50_psd-path.patch
===================================================================
--- trunk/packages/octave-epstk/debian/patches/50_psd-path.patch 2006-08-15 21:48:02 UTC (rev 703)
+++ trunk/packages/octave-epstk/debian/patches/50_psd-path.patch 2006-08-15 22:42:44 UTC (rev 704)
@@ -1,14 +1,18 @@
--- octave-epstk-2.0.2.orig/m/edsymbol.m
+++ octave-epstk-2.0.2/m/edsymbol.m
-@@ -58,7 +58,7 @@
+@@ -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);
- epsFile=fopen(psdFileName,'rb');
++ 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 @@
Modified: trunk/packages/octave-epstk/debian/patches/50_source-etc-epstk-conf.patch
===================================================================
--- trunk/packages/octave-epstk/debian/patches/50_source-etc-epstk-conf.patch 2006-08-15 21:48:02 UTC (rev 703)
+++ trunk/packages/octave-epstk/debian/patches/50_source-etc-epstk-conf.patch 2006-08-15 22:42:44 UTC (rev 704)
@@ -1,10 +1,12 @@
--- octave-epstk-2.1.orig/m/einit.m
+++ octave-epstk-2.1/m/einit.m
-@@ -48,6 +48,8 @@
-
+@@ -48,6 +48,10 @@
+
eFile=0; %fileId of eFileName
-
-+source ("/etc/epstk.conf"); % source Debian configuration file
+
++if length (glob ("/etc/epstk.conf")) == 1
++ source ("/etc/epstk.conf"); % source Debian configuration file
++endif
+
% fonts (standard fonts of postscript)
eFonts=[
Modified: trunk/packages/octave-epstk/debian/rules
===================================================================
--- trunk/packages/octave-epstk/debian/rules 2006-08-15 21:48:02 UTC (rev 703)
+++ trunk/packages/octave-epstk/debian/rules 2006-08-15 22:42:44 UTC (rev 704)
@@ -6,11 +6,24 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
+# Poor man's "make check"
+build/octave-epstk:: build-stamp
+build-stamp:
+ for v in 2.1 2.9 ; do \
+ echo "### Running demos with octave$$v" ; \
+ ( cd m ; echo 'ePsdPath=".";edemos;' \
+ | octave$$v -qf ) ; \
+ done
+ touch build-stamp
+
install/octave-epstk::
- octave-depends
+ for v in 2.1 2.9 ; do octave$$v-depends ; done
clean::
- rm -f m/*-center.psd
+ rm -f build-stamp
+ ( cd m ; \
+ rm -f *-center.psd *.eps *.tmp img* myNewSymbol.psd \
+ demo*.ppm demo*.jpg demo_* )
More information about the Pkg-octave-commit
mailing list