[Debian-astro-commits] [saods9] 02/07: Don't close DS9 when closing the tkcon console

[Ole Streicher]

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

olebole pushed a commit to branch debian
in repository saods9.

commit 08057f0b5afc88990fa0649e6e51f5cc33df9621
Author: Ole Streicher <olebole at debian.org>
Date:   Sat May 28 21:17:12 2016 +0200

    Don't close DS9 when closing the tkcon console
---
 debian/changelog                            |  1 +
 debian/patches/ds9_dont_exit_on_tkcon.patch | 24 ++++++++++++++++++++++++
 debian/patches/series                       |  1 +
 3 files changed, 26 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index e54ac3a..418b45e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 saods9 (7.4.1+repack-3) UNRELEASED; urgency=medium
 
   * Use tkblt instead of BLT
+  * Don't close DS9 when closing the tkcon console
 
  -- Ole Streicher <olebole at debian.org>  Thu, 16 Jun 2016 16:34:55 +0200
 
diff --git a/debian/patches/ds9_dont_exit_on_tkcon.patch b/debian/patches/ds9_dont_exit_on_tkcon.patch
new file mode 100644
index 0000000..8515016
--- /dev/null
+++ b/debian/patches/ds9_dont_exit_on_tkcon.patch
@@ -0,0 +1,24 @@
+Author: Ole Streicher <olebole at debian.org>
+Description: Don't close DS9 when closing the unpatched tkcon console
+ The original saods9 code contains a patched tkcon which replaced the exit with
+ hide. In Debian, we are using the unpatched package.
+ .
+ This solution was taken from http://wiki.tcl.tk/17616
+--- a/ds9/library/util.tcl
++++ b/ds9/library/util.tcl
+@@ -770,9 +770,15 @@
+     if {[winfo exists ".tkcon"]} {
+ 	tkcon show
+     } else {
++	set ::tkcon::PRIV(showOnStartup) 0
++	set ::tkcon::PRIV(root) .tkcon
++	set ::tkcon::PRIV(protocol) {tkcon hide}
++	set ::tkcon::OPT(overrideexit) 0
+ 	set ::tkcon::OPT(exec) {}
+ 	set ::tkcon::OPT(font) [font actual TkFixedFont]
+ 	tkcon::Init
++	tkcon title "SAOImage ds9 console"
++	tkcon show
+     }
+ }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 7a5cc3a..d03664e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,6 +3,7 @@ ds9_use_tcltk_packages.patch
 ds9_fix_docdir.patch
 ds9_optional_doc_package.patch
 ds9_add_about_debian.patch
+ds9_dont_exit_on_tkcon.patch
 saotk_add_ksearch.patch
 saotk_add_psscale.patch
 saotk_use_tkblt.patch

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