[Pkg-octave-commit] rev 188 - in trunk/packages/octave-epstk/debian: . patches

[Rafael Laboissiere]

Author: rafael
Date: 2005-04-08 21:58:14 +0000 (Fri, 08 Apr 2005)
New Revision: 188

Modified:
   trunk/packages/octave-epstk/debian/changelog
   trunk/packages/octave-epstk/debian/patches/50_axis-value-labels.dpatch
   trunk/packages/octave-epstk/debian/patches/50_psd-path.dpatch
   trunk/packages/octave-epstk/debian/patches/50_source-etc-epstk-conf.dpatch
   trunk/packages/octave-epstk/debian/rules
Log:
Preparation for Debian release 2.1-1.  This needs further testing.


Modified: trunk/packages/octave-epstk/debian/changelog
===================================================================
--- trunk/packages/octave-epstk/debian/changelog	2005-04-06 13:33:24 UTC (rev 187)
+++ trunk/packages/octave-epstk/debian/changelog	2005-04-08 21:58:14 UTC (rev 188)
@@ -1,3 +1,15 @@
+octave-epstk (2.1-1) unstable; urgency=low
+
+  +++ Changes by Rafael Laboissiere
+
+  * New upstream release
+  * debian/patches/50_source-etc-epstk-conf.dpatch: Adjusted for new
+    upstream sources.
+  * debian/rules: Drop renaming of test.m, which is not distributed
+    anymore.
+
+ --
+
 octave-epstk (2.0.2-4) unstable; urgency=low
 
   +++ Changes by Rafael Laboissiere

Modified: trunk/packages/octave-epstk/debian/patches/50_axis-value-labels.dpatch
===================================================================
--- trunk/packages/octave-epstk/debian/patches/50_axis-value-labels.dpatch	2005-04-06 13:33:24 UTC (rev 187)
+++ trunk/packages/octave-epstk/debian/patches/50_axis-value-labels.dpatch	2005-04-08 21:58:14 UTC (rev 188)
@@ -1,7 +1,6 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## 50_axis-value-labels.dpatch by  <rafael@debian.org>
+## 50_axis-value-labels.dpatch by Rafael Laboissiere <rafael@debian.org>
 ##
-## All lines beginning with `## DP:' are a description of the patch.
 ## DP: Allow arbitrary labels to be plotted at axis tics
 
 @DPATCH@

Modified: trunk/packages/octave-epstk/debian/patches/50_psd-path.dpatch
===================================================================
--- trunk/packages/octave-epstk/debian/patches/50_psd-path.dpatch	2005-04-06 13:33:24 UTC (rev 187)
+++ trunk/packages/octave-epstk/debian/patches/50_psd-path.dpatch	2005-04-08 21:58:14 UTC (rev 188)
@@ -10,11 +10,11 @@
 +++ octave-epstk-2.0.2/m/edsymbol.m
 @@ -58,7 +58,7 @@
    psdFileName=symbolFileName(find(symbolFileName~=' '));
-   epsFile=fopen(psdFileName,'r');
+   epsFile=fopen(psdFileName,'rb');
    if epsFile<2
 -    psdFileName=[ePath psdFileName];
 +    psdFileName=file_in_path(ePsdPath, psdFileName);
-     epsFile=fopen(psdFileName,'r');
+     epsFile=fopen(psdFileName,'rb');
    end
    if epsFile>1
 --- octave-epstk-2.0.2.orig/m/ftria-center.psd

Modified: trunk/packages/octave-epstk/debian/patches/50_source-etc-epstk-conf.dpatch
===================================================================
--- trunk/packages/octave-epstk/debian/patches/50_source-etc-epstk-conf.dpatch	2005-04-06 13:33:24 UTC (rev 187)
+++ trunk/packages/octave-epstk/debian/patches/50_source-etc-epstk-conf.dpatch	2005-04-08 21:58:14 UTC (rev 188)
@@ -1,37 +1,18 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
 ## 50_source-etc-epstk-conf.dpatch by Rafael Laboissiere <rafael@debian.org>
 ##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Source epstk.conf file to get right default vaules
+## DP: Source /etc/epstk.conf in einit.m
 
 @DPATCH@
 
---- octave-epstk-2.0.2.orig/m/einit.m
-+++ octave-epstk-2.0.2/m/einit.m
-@@ -19,6 +19,7 @@
- else eFac=1;
- end
+--- octave-epstk-2.1.orig/m/einit.m
++++ octave-epstk-2.1/m/einit.m
+@@ -48,6 +48,8 @@
  
-+source ('/etc/epstk.conf');    % source Debian configuration file 
+ eFile=0; %fileId of eFileName
  
- %fonts  (standard fonts of postscript)
++source ("/etc/epstk.conf");    % source Debian configuration file
++
+ % fonts  (standard fonts of postscript)
  eFonts=[
---- octave-epstk-2.0.2.orig/m/eview.m
-+++ octave-epstk-2.0.2/m/eview.m
-@@ -18,10 +18,12 @@
-   if nargin<1
-     epsFileName=eFileName;
-   end
--  if exist('eGhostview')~=1
--    einit;
--    eglobpar;
--  end
-+  % Debian GNU/Linux uses a config file  
-+  %   if exist('eGhostview')~=1
-+  %     einit;
-+  %     eglobpar;
-+  %   end
-+  source ("/etc/epstk.conf");
-   if isempty(eGhostview)
-     disp('error in eview: no Postscript viewer installed');
-   else
+ 'Times-Roman                 ';      % font number 1

Modified: trunk/packages/octave-epstk/debian/rules
===================================================================
--- trunk/packages/octave-epstk/debian/rules	2005-04-06 13:33:24 UTC (rev 187)
+++ trunk/packages/octave-epstk/debian/rules	2005-04-08 21:58:14 UTC (rev 188)
@@ -42,8 +42,6 @@
 		install -p -m 0644 m/*.m m/*.ppm m/*.psd m/*.jpg \
 				   m/octave.asc m/mFileList \
 				   m/epstkbc m/epsFileList 	$(debdir)
-		## Rename test.m
-		( cd $(debdir) ; mv test.m epstk_test.m )
                 ## even more
 		install -p -m 0644 debian/epstk.conf  		$(debtmp)/etc/.
                 ##