[saods9] 01/01: Centralize support_blt patches

[Ole Streicher]

This is an automated email from the git hooks/post-receive script.

olebole-guest pushed a commit to branch debian
in repository saods9.

commit e94013445e026a9755d0f7189798ecbd72b54a26
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Tue Oct 14 14:51:36 2014 +0200

    Centralize support_blt patches
---
 debian/patches/ds9_make_linux.patch  | 43 ------------------------------------
 debian/patches/ds9_support_blt.patch | 43 ++++++++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/debian/patches/ds9_make_linux.patch b/debian/patches/ds9_make_linux.patch
index 3e47455..9f07de1 100644
--- a/debian/patches/ds9_make_linux.patch
+++ b/debian/patches/ds9_make_linux.patch
@@ -156,46 +156,3 @@ Description: Set the compile flags according to the Debian environment. We
    append cc " @TARGET_X_INC@"
    append cc " @TARGET_TK_INC@ @TARGET_BLT_INC@"
    puts "$n:	$src $dep"
---- a/src/plot.tcl
-+++ b/src/plot.tcl
-@@ -1197,12 +1197,12 @@
- 	-font "{$ds9($var(graph,title,family))} $var(graph,title,size) $var(graph,title,weight) $var(graph,title,slant)"
- 
-     $var(graph) xaxis configure \
--	-grid $var(axis,x,grid) -logscale $var(axis,x,log) \
-+	-logscale $var(axis,x,log) \
- 	-title $var(axis,x,title) \
- 	-tickfont "{$ds9($var(axis,font,family))} $var(axis,font,size) $var(axis,font,weight) $var(axis,font,slant)" \
- 	-titlefont "{$ds9($var(axis,title,family))} $var(axis,title,size) $var(axis,title,weight) $var(axis,title,slant)"
-     $var(graph) yaxis configure \
--	-grid $var(axis,y,grid) -logscale $var(axis,y,log) \
-+	-logscale $var(axis,y,log) \
- 	-title $var(axis,y,title) \
- 	-tickfont "{$ds9($var(axis,font,family))} $var(axis,font,size) $var(axis,font,weight) $var(axis,font,slant)" \
- 	-titlefont "{$ds9($var(axis,title,family))} $var(axis,title,size) $var(axis,title,weight) $var(axis,title,slant)"
---- a/src/plotbar.tcl
-+++ b/src/plotbar.tcl
-@@ -149,8 +149,7 @@
- 			-highlightthickness 0 \
- 		       ]
- 
--    $var(graph) xaxis configure -grid no -stepsize 0
--    $var(graph) yaxis configure -grid yes
-+    $var(graph) xaxis configure -stepsize 0
- 
-     pack $var(graph) -expand yes -fill both
-     PlotChangeMode $varname
---- a/src/scale.tcl
-+++ b/src/scale.tcl
-@@ -292,9 +292,9 @@
- 			 ]
- 
-     $dscale(hist) legend configure -hide yes
--    $dscale(hist) xaxis configure -hide yes -grid no -ticklength 3 \
-+    $dscale(hist) xaxis configure -hide yes -ticklength 3 \
- 	-tickfont [font actual TkDefaultFont]
--    $dscale(hist) yaxis configure -hide yes -grid yes -ticklength 3 \
-+    $dscale(hist) yaxis configure -hide yes -ticklength 3 \
- 	-tickfont [font actual TkDefaultFont]
-     set dscale(xdata) histX
-     set dscale(ydata) histY
diff --git a/debian/patches/ds9_support_blt.patch b/debian/patches/ds9_support_blt.patch
index 1dcd325..7d28698 100644
--- a/debian/patches/ds9_support_blt.patch
+++ b/debian/patches/ds9_support_blt.patch
@@ -59,3 +59,46 @@ Description: Allow the use of a standard BLT 2.X instead of tkblt
      }
  }
  
+--- a/src/scale.tcl
++++ b/src/scale.tcl
+@@ -292,9 +292,9 @@
+ 			 ]
+ 
+     $dscale(hist) legend configure -hide yes
+-    $dscale(hist) xaxis configure -hide yes -grid no -ticklength 3 \
++    $dscale(hist) xaxis configure -hide yes -ticklength 3 \
+ 	-tickfont [font actual TkDefaultFont]
+-    $dscale(hist) yaxis configure -hide yes -grid yes -ticklength 3 \
++    $dscale(hist) yaxis configure -hide yes -ticklength 3 \
+ 	-tickfont [font actual TkDefaultFont]
+     set dscale(xdata) histX
+     set dscale(ydata) histY
+--- a/src/plotbar.tcl
++++ b/src/plotbar.tcl
+@@ -149,8 +149,7 @@
+ 			-highlightthickness 0 \
+ 		       ]
+ 
+-    $var(graph) xaxis configure -grid no -stepsize 0
+-    $var(graph) yaxis configure -grid yes
++    $var(graph) xaxis configure -stepsize 0
+ 
+     pack $var(graph) -expand yes -fill both
+     PlotChangeMode $varname
+--- a/src/plot.tcl
++++ b/src/plot.tcl
+@@ -1197,12 +1197,12 @@
+ 	-font "{$ds9($var(graph,title,family))} $var(graph,title,size) $var(graph,title,weight) $var(graph,title,slant)"
+ 
+     $var(graph) xaxis configure \
+-	-grid $var(axis,x,grid) -logscale $var(axis,x,log) \
++	-logscale $var(axis,x,log) \
+ 	-title $var(axis,x,title) \
+ 	-tickfont "{$ds9($var(axis,font,family))} $var(axis,font,size) $var(axis,font,weight) $var(axis,font,slant)" \
+ 	-titlefont "{$ds9($var(axis,title,family))} $var(axis,title,size) $var(axis,title,weight) $var(axis,title,slant)"
+     $var(graph) yaxis configure \
+-	-grid $var(axis,y,grid) -logscale $var(axis,y,log) \
++	-logscale $var(axis,y,log) \
+ 	-title $var(axis,y,title) \
+ 	-tickfont "{$ds9($var(axis,font,family))} $var(axis,font,size) $var(axis,font,weight) $var(axis,font,slant)" \
+ 	-titlefont "{$ds9($var(axis,title,family))} $var(axis,title,size) $var(axis,title,weight) $var(axis,title,slant)"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/saods9.git