Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
Dear release team,
please unblock saods9 7.5+repack1-2
This fixes bug #859777, "saods9: Internal error after enabling
horizontal or vertical graph", priority important.
Relevant changelog:
saods9 (7.5+repack1-2) unstable; urgency=medium
* Fix ds9 window class in desktop file
* Fix problem with graphs and image zoomed out
* Initialize tkblt stubs (Closes: #859777)
-- Ole Streicher <oleb...@debian.org> Fri, 14 Apr 2017 13:42:38 +0200
The second item is also part of the resolution of #859777.
The debdiff is attached. Relevant command:
unblock saods9/7.5+repack1-2
Thank you very much
Ole
diff -Nru saods9-7.5+repack1/debian/changelog
saods9-7.5+repack1/debian/changelog
--- saods9-7.5+repack1/debian/changelog 2016-12-17 10:31:44.000000000 +0100
+++ saods9-7.5+repack1/debian/changelog 2017-04-14 13:42:38.000000000 +0200
@@ -1,3 +1,11 @@
+saods9 (7.5+repack1-2) unstable; urgency=medium
+
+ * Fix ds9 window class in desktop file
+ * Fix problem with graphs and image zoomed out
+ * Initialize tkblt stubs (Closes: #859777)
+
+ -- Ole Streicher <oleb...@debian.org> Fri, 14 Apr 2017 13:42:38 +0200
+
saods9 (7.5+repack1-1) unstable; urgency=medium
* Remove tests, MacOS and windows specific subdirs from tarball
diff -Nru
saods9-7.5+repack1/debian/patches/Fix-problem-with-graphs-and-image-zoomed-out.patch
saods9-7.5+repack1/debian/patches/Fix-problem-with-graphs-and-image-zoomed-out.patch
---
saods9-7.5+repack1/debian/patches/Fix-problem-with-graphs-and-image-zoomed-out.patch
1970-01-01 01:00:00.000000000 +0100
+++
saods9-7.5+repack1/debian/patches/Fix-problem-with-graphs-and-image-zoomed-out.patch
2017-04-14 13:41:44.000000000 +0200
@@ -0,0 +1,36 @@
+From: William Joye <wj...@cfa.harvard.edu>
+Date: Fri, 13 Jan 2017 14:05:10 -0500
+Subject: Fix problem with graphs and image zoomed out
+
+---
+ ds9/library/graph.tcl | 14 ++++++++++----
+ 1 file changed, 10 insertions(+), 4 deletions(-)
+
+diff --git a/ds9/library/graph.tcl b/ds9/library/graph.tcl
+index 4e42610..ca507e9 100644
+--- a/ds9/library/graph.tcl
++++ b/ds9/library/graph.tcl
+@@ -261,13 +261,19 @@ proc UpdateGraph {which x y sys} {
+
+ if {[$which has fits]} {
+ if {$view(graph,horz)} {
+- $which get horizontal cut graphHorzX graphHorzY $x $y $sys
+- $ds9(graph,horz) element configure line1 -hide no
++ if {![catch {$which get horizontal cut graphHorzX graphHorzY $x $y
$sys}]} {
++ $ds9(graph,horz) element configure line1 -hide no
++ } else {
++ $ds9(graph,horz) element configure line1 -hide yes
++ }
+ }
+
+ if {$view(graph,vert)} {
+- $which get vertical cut graphVertX graphVertY $x $y $sys
+- $ds9(graph,vert) element configure line1 -hide no
++ if {![catch {$which get vertical cut graphVertX graphVertY $x $y
$sys}]} {
++ $ds9(graph,vert) element configure line1 -hide no
++ } else {
++ $ds9(graph,vert) element configure line1 -hide yes
++ }
+ }
+ }
+ }
diff -Nru saods9-7.5+repack1/debian/patches/Initialize-tkblt-stubs.patch
saods9-7.5+repack1/debian/patches/Initialize-tkblt-stubs.patch
--- saods9-7.5+repack1/debian/patches/Initialize-tkblt-stubs.patch
1970-01-01 01:00:00.000000000 +0100
+++ saods9-7.5+repack1/debian/patches/Initialize-tkblt-stubs.patch
2017-04-14 13:41:44.000000000 +0200
@@ -0,0 +1,32 @@
+From: Ole Streicher <oleb...@debian.org>
+Date: Fri, 14 Apr 2017 13:30:17 +0200
+Subject: Initialize tkblt stubs
+
+This resolves a crash when using vertical/horizontal graphs.
+Closes: #859777
+---
+ tksao/saotk.C | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/tksao/saotk.C b/tksao/saotk.C
+index d6b7adb..28fcd17 100644
+--- a/tksao/saotk.C
++++ b/tksao/saotk.C
+@@ -4,6 +4,8 @@
+
+ #include <tk.h>
+
++extern const char* Tkblt_InitStubs(Tcl_Interp*, const char*, int);
++
+ extern int FrameTrueColor8_Init(Tcl_Interp*);
+ extern int FrameTrueColor16_Init(Tcl_Interp*);
+ extern int FrameTrueColor24_Init(Tcl_Interp*);
+@@ -40,6 +42,8 @@ int Tksao_Init(Tcl_Interp* interp) {
+ return TCL_ERROR;
+ if (Tk_InitStubs(interp, TK_PATCH_LEVEL, 0) == NULL)
+ return TCL_ERROR;
++ if (Tkblt_InitStubs(interp, "3.2", 0) == NULL)
++ return TCL_ERROR;
+
+ if (FrameTrueColor8_Init(interp) == TCL_ERROR)
+ return TCL_ERROR;
diff -Nru saods9-7.5+repack1/debian/patches/series
saods9-7.5+repack1/debian/patches/series
--- saods9-7.5+repack1/debian/patches/series 2016-12-17 10:31:00.000000000
+0100
+++ saods9-7.5+repack1/debian/patches/series 2017-04-14 13:41:44.000000000
+0200
@@ -8,3 +8,5 @@
saotk_add_psscale.patch
saotk_avoid_compile_warnings.patch
saotk_use_system_libs.patch
+Fix-problem-with-graphs-and-image-zoomed-out.patch
+Initialize-tkblt-stubs.patch
diff -Nru saods9-7.5+repack1/debian/saods9.desktop
saods9-7.5+repack1/debian/saods9.desktop
--- saods9-7.5+repack1/debian/saods9.desktop 2016-12-17 10:31:00.000000000
+0100
+++ saods9-7.5+repack1/debian/saods9.desktop 2017-03-26 11:36:51.000000000
+0200
@@ -8,5 +8,6 @@
Type=Application
Exec=ds9 %F
Icon=ds9
+StartupWMClass=Ds9.tcl
Categories=Education;Science;Astronomy;
-Keywords=FITS;Astronomy;Viewer;
\ Kein Zeilenumbruch am Dateiende.
+Keywords=FITS;Astronomy;Viewer;
