[Debian-astro-commits] [saods9] 01/01: Don't close DS9 when closing the unpatched tkcon console
Ole Streicher
olebole at moszumanska.debian.org
Sat May 28 19:17:42 UTC 2016
This is an automated email from the git hooks/post-receive script.
olebole pushed a commit to branch experimental
in repository saods9.
commit bd52d614d6b0ace7d5ec855e471c10acc56be67e
Author: Ole Streicher <olebole at debian.org>
Date: Sat May 28 21:17:12 2016 +0200
Don't close DS9 when closing the unpatched tkcon console
---
debian/changelog | 6 ++++++
debian/patches/ds9_dont_exit_on_tkcon.patch | 24 ++++++++++++++++++++++++
debian/patches/ds9_use_tcltk_packages.patch | 2 +-
debian/patches/series | 1 +
4 files changed, 32 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index efd700a..67a9e88 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+saods9 (7.5~b1+repack-2) UNRELEASED; urgency=low
+
+ * Don't close DS9 when closing the tkcon console
+
+ -- Ole Streicher <olebole at debian.org> Sat, 28 May 2016 21:16:22 +0200
+
saods9 (7.5~b1+repack-1) experimental; urgency=low
* New upstream beta release; switch to experimental
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/ds9_use_tcltk_packages.patch b/debian/patches/ds9_use_tcltk_packages.patch
index 73e1ce9..2f4c21e 100644
--- a/debian/patches/ds9_use_tcltk_packages.patch
+++ b/debian/patches/ds9_use_tcltk_packages.patch
@@ -4,7 +4,7 @@ Description: Don't load TclTk extensions as shared libs, but as packages.
initialization.
--- a/ds9/unix/Makefile.in
+++ b/ds9/unix/Makefile.in
-@@ -77,6 +77,8 @@
+@@ -78,6 +78,8 @@
.NOTPARALLEL :
.PHONY : debug
diff --git a/debian/patches/series b/debian/patches/series
index 3189652..c082283 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,6 +4,7 @@ ds9_support_blt.patch
ds9_fix_docdir.patch
ds9_optional_doc_package.patch
ds9_add_about_debian.patch
+ds9_dont_exit_on_tkcon.patch
saotk_fix_blt_crash.patch
saotk_add_ksearch.patch
saotk_add_psscale.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/saods9.git
More information about the Debian-astro-commits
mailing list