[Debian-astro-commits] [skycat] 02/05: Use replacement for tclx' lempty function

[Ole Streicher]

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

olebole pushed a commit to branch debian
in repository skycat.

commit 0657a2a8b3b14fbc725bf17886ff3bb9961560bc
Author: Ole Streicher <ole at aip.de>
Date:   Mon Feb 22 14:03:13 2016 +0100

    Use replacement for tclx' lempty function
---
 debian/patches/remove_tclx.patch | 72 +++++++++++++++++++++++++++++++++++-----
 1 file changed, 64 insertions(+), 8 deletions(-)

diff --git a/debian/patches/remove_tclx.patch b/debian/patches/remove_tclx.patch
index 54ca6c1..7769b75 100644
--- a/debian/patches/remove_tclx.patch
+++ b/debian/patches/remove_tclx.patch
@@ -115,7 +115,16 @@ Note: For backporting to tcl8.5 and before, remove this patch and add
  
 --- a/rtd/library/RtdImageFitsHeader.tcl
 +++ b/rtd/library/RtdImageFitsHeader.tcl
-@@ -160,7 +160,7 @@
+@@ -14,6 +14,8 @@
+ # pdraper     20/02/07   Formatting changes: keep empty lines (one anyway) 
+ #                        and print blank COMMENT/HISTORY lines with blanks, do
+ #                        not fake that they start with COMMENT/HISTORY.
++# check for empty list. Replacement for TclX.
++package require Tclutil
+ 
+ itk::usual RtdImageFitsHeader {}
+ 
+@@ -160,7 +162,7 @@
  	set tconfig_(sort_cols) $sort_cols
  	set tconfig_(sort_order) $sort_order
  
@@ -124,7 +133,7 @@ Note: For backporting to tcl8.5 and before, remove this patch and add
              $tabnotebook_(table$i) config -sort_cols $sort_cols \
  		    -sort_order $sort_order
  	    $tabnotebook_(table$i) new_info
-@@ -173,7 +173,7 @@
+@@ -173,7 +175,7 @@
  	global $var
  	set val [set $var]
  	set tconfig_($label) $val
@@ -133,7 +142,7 @@ Note: For backporting to tcl8.5 and before, remove this patch and add
  	    $tabnotebook_(table$i) set_option $label Show $val
  	    $tabnotebook_(table$i) new_info
  	}
-@@ -220,7 +220,7 @@
+@@ -220,7 +222,7 @@
  
  	set length [string length [$listbox get 0]]
  
@@ -142,7 +151,7 @@ Note: For backporting to tcl8.5 and before, remove this patch and add
  	    set row [string tolower [$listbox get $n]]
              if {[catch {regexp -indices $string $row indices} idx] } { continue }
  	    if { $idx > 0 } {
-@@ -278,7 +278,7 @@
+@@ -278,7 +280,7 @@
  	set hlist [$image_ hdu list]
  
  	set ExtName "HDU 1"
@@ -153,7 +162,15 @@ Note: For backporting to tcl8.5 and before, remove this patch and add
  	    
 --- a/rtd/library/RtdImageHduChooser.tcl
 +++ b/rtd/library/RtdImageHduChooser.tcl
-@@ -443,7 +443,7 @@
+@@ -17,6 +17,7 @@
+ # pbiereic        11/10/08   Break image display loop after failure.
+ # pbiereic        26/11/08   Using 'view update' for HDU images display.
+ #                            Using a toplevel window for the HDU images display.
++package require Tclutil
+ 
+ itk::usual RtdImageHduChooser {}
+ 
+@@ -443,7 +444,7 @@
      
      private method svinfo {} {
  	set list [array get ext_ *NAXIS*]
@@ -164,7 +181,15 @@ Note: For backporting to tcl8.5 and before, remove this patch and add
  	set newlist [lsort -increasing -index 0 $newlist]
 --- a/rtd/library/RtdImagePick2.tcl
 +++ b/rtd/library/RtdImagePick2.tcl
-@@ -127,7 +127,7 @@
+@@ -62,6 +62,7 @@
+ # NOTES
+ # - In contrast to RtdImagePick, RtdImagePick2 does not use tkwait which may
+ #   cause problem for an inheriting class due to nested calls to tkwait.
++package require Tclutil
+ 
+ itk::usual RtdImagePick2 { }
+ 
+@@ -127,7 +128,7 @@
  		{Set the magnification factor of the zoom} \
  		-menu [menu $magMenu_]
  
@@ -212,7 +237,7 @@ Note: For backporting to tcl8.5 and before, remove this patch and add
  	set pid [fork]
  	if {$pid == 0} {
  	    # child
-@@ -98,8 +99,8 @@
+@@ -98,7 +99,7 @@
  	    puts $wfd $status
  	    flush $wfd
  	    close $wfd
@@ -221,7 +246,6 @@ Note: For backporting to tcl8.5 and before, remove this patch and add
  	} else {
  	    set bg_pid_ $pid
  	    fileevent $rfd readable [code $this read_pipe $rfd $wfd]
- 	}
 --- a/cat/library/AstroImage.tcl
 +++ b/cat/library/AstroImage.tcl
 @@ -401,7 +401,7 @@
@@ -244,3 +268,35 @@ Note: For backporting to tcl8.5 and before, remove this patch and add
  	    fileevent $rfd_ readable [code $this feedback]
  	    $w_.cat feedback $wfd_
  	} elseif {[info exists rfd_]} {
+--- a/tclutil/library/list.tcl
++++ b/tclutil/library/list.tcl
+@@ -50,3 +50,9 @@
+     }
+     return $l
+ }
++
++proc lempty {list} {
++    if {[catch {llength $list} len]} { return 0 }
++    return [expr {$len == 0}]
++}
++
+--- a/rtd/library/RtdImagePerf.tcl
++++ b/rtd/library/RtdImagePerf.tcl
+@@ -9,6 +9,7 @@
+ # D. Hopkinson    31 Jan 97  Created
+ # P.Biereichel    21/07/97   % display is the default + some bug fixes
+ # P.Biereichel    01/03/01   Only % display suported + code revised
++package require Tclutil
+ 
+ itk::usual RtdImagePerf {}
+ 
+--- a/rtd/library/tRtd.tcl
++++ b/rtd/library/tRtd.tcl
+@@ -10,6 +10,7 @@
+ # who             when       what
+ # --------------  ---------  ----------------------------------------
+ # pbiereic        01/03/01   Created
++package require Tclutil
+ 
+ itk::usual tRtd {}
+ 

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