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

[Thomas Weber]

The following commit has been merged in the master branch:
commit fd1b295a2cd975a7930f393bfc1fd6c543e723fc
Author: Thomas Weber <tweber at debian.org>
Date:   Sun Dec 26 20:30:11 2010 +0100

    New patch: set_debian_defaults

diff --git a/debian/changelog b/debian/changelog
index 446de04..f4d9233 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ octave-epstk (2.3-1) UNRELEASED; urgency=low
       - 04_source-etc-epstk-conf.patch: Upstream changed the configuration
         system, so there's no need to source /etc/epstk.conf any longer (it's
         symlinked as einit.m)
+    - New patch: set_debian_defaults: Set sensible defaults in /etc/epstk.conf
   * debian/control: Remove Rafael Laboissiere from Uploaders (Closes: #571895)
   * Switch to dpkg-source 3.0 (quilt) format
 
diff --git a/debian/patches/series b/debian/patches/series
index 90a858e..759fa40 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 01_add-plotdecimate.patch
 02_axis-value-labels.patch
 03_psd-path.patch
+set_debian_defaults
diff --git a/debian/patches/set_debian_defaults b/debian/patches/set_debian_defaults
new file mode 100644
index 0000000..c10525a
--- /dev/null
+++ b/debian/patches/set_debian_defaults
@@ -0,0 +1,29 @@
+--- a/m/einit.m
++++ b/m/einit.m
+@@ -7,7 +7,7 @@
+ % written by stefan.mueller at fhr.fraunhofer.de (C) 2010
+ 
+ % Paths of epstk
+-eInstallPath='/usr/local/share/octave/site-m/octave-epstk/';
++eInstallPath='/usr/share/octave/site/m/octave-epstk/';
+ ePath=eInstallPath;
+ if exist('./einit.m')  % local directory
+   eInstallPath=[pwd '/../'];
+@@ -27,14 +27,14 @@
+ %eGhostscript=''; %no ghostscript
+ 
+ % Program filename of postscript-viewer  
+-eGhostview=''; %no ghostview, if empty then eBrowser is used
+-%eGhostview='gv'; %gv for linux
++%eGhostview=''; %no ghostview, if empty then eBrowser is used
++eGhostview='gv'; %gv for linux
+ %eGhostview='gv --scale=-2 --media=BBox'; %with scale option of gv-version >3.6 for linux
+ %eGhostview='ggv'; %gome-gv for linux
+ %eGhostview='"c:/gs/gsview/gsview/gsview32.exe"'; %ghostview for windows
+ 
+ % Program filename of Browser
+-eBrowser='firefox'; %firefox
++eBrowser='sensible-browser'; %firefox
+ %eBrowser='"C:/Program Files (x86)/Mozilla Firefox/firefox.exe"'; %firefox on windows
+ 
+ % Default outputfile

-- 
octave-epstk