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

[Thomas Weber]

The following commit has been merged in the master branch:
commit 979fd7d076595fedf14cae5fb42edc2a597f2c50
Author: Thomas Weber <tweber at debian.org>
Date:   Sat Dec 18 21:30:59 2010 +0100

    Drop patch 04_source-etc-epstk-conf.patch

diff --git a/debian/changelog b/debian/changelog
index 6858cd0..446de04 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,10 @@ octave-epstk (2.3-1) UNRELEASED; urgency=low
       - tickless_axes
       - update_documentation
       - modern-str-functions
+    - Dropped patch:
+      - 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)
   * debian/control: Remove Rafael Laboissiere from Uploaders (Closes: #571895)
   * Switch to dpkg-source 3.0 (quilt) format
 
diff --git a/debian/patches/04_source-etc-epstk-conf.patch b/debian/patches/04_source-etc-epstk-conf.patch
deleted file mode 100644
index 127c706..0000000
--- a/debian/patches/04_source-etc-epstk-conf.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Author: Rafael Laboissiere <rafael at debian.org>
-Description: Source /etc/epstk.conf in einit.m
-
---- octave-epstk-2.1.orig/m/eglobpar.m  2006-08-16 15:10:23.662736944 +0200
-+++ octave-epstk-2.1/m/eglobpar.m      2006-08-16 15:11:11.049533056 +0200
-@@ -1,4 +1,5 @@
- global ...
-+eConfigFile...
- ePath...
- ePsdPath...
- 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,10 @@
- 
- % read config-file on octave/linux systems
- if exist('matlabpath')~=5
--  if exist('eConfigFile')~=2
-+  if exist('eConfigFile')~=1 || isempty(eConfigFile)
-     eConfigFile='/etc/epstk.conf';
-   end
--  if exist('eConfigFile')~=2
-+  if exist(eConfigFile)==2
-     source(eConfigFile); 
-   end
- end
diff --git a/debian/patches/series b/debian/patches/series
index 0f9c399..90a858e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 01_add-plotdecimate.patch
 02_axis-value-labels.patch
 03_psd-path.patch
-04_source-etc-epstk-conf.patch

-- 
octave-epstk