[Debian-astro-commits] [saods9] 02/04: Adjust patches for new version

[Ole Streicher]

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

olebole pushed a commit to branch experimental
in repository saods9.

commit 3380f9d36563aea42365730f4222bd534830aeab
Author: Ole Streicher <olebole at debian.org>
Date:   Fri Oct 7 10:33:13 2016 +0200

    Adjust patches for new version
---
 debian/patches/ds9_fix_docdir.patch         | 2 +-
 debian/patches/ds9_use_system_libs.patch    | 2 +-
 debian/patches/ds9_use_tcltk_packages.patch | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/debian/patches/ds9_fix_docdir.patch b/debian/patches/ds9_fix_docdir.patch
index 667b403..69d4d10 100644
--- a/debian/patches/ds9_fix_docdir.patch
+++ b/debian/patches/ds9_fix_docdir.patch
@@ -35,7 +35,7 @@ Description: Instead putting the documentation into the common shared
      set help(about) "SAOImage DS9\nVersion $ds9(version)\n\nAuthors\n$help(authors)\nSAOImage DS9 development has been made possible by funding from NASA's Applied Information Systems Research Program, Chandra X-ray Science Center (CXC), and the High Energy Astrophysics Science Archive Center (HEASARC). Additional funding was provided by the JWST Mission office at Space Telescope Science Institute to improve capabilities for 3D data visualization.\n\nColormaps\nh5utils: Steven Johnson ( [...]
 --- a/ds9/library/ds9.tcl
 +++ b/ds9/library/ds9.tcl
-@@ -182,6 +182,7 @@
+@@ -180,6 +180,7 @@
  	# set to absolute path so that if -cd command is used,
  	# so we can still find our files
  	set ds9(root) [file normalize [file join [file dirname [info script]] ..]]
diff --git a/debian/patches/ds9_use_system_libs.patch b/debian/patches/ds9_use_system_libs.patch
index 3441de0..b353292 100644
--- a/debian/patches/ds9_use_system_libs.patch
+++ b/debian/patches/ds9_use_system_libs.patch
@@ -76,7 +76,7 @@ Description: Link against system libraries.
  dirsdistclean:
 --- a/ds9/library/ds9.tcl
 +++ b/ds9/library/ds9.tcl
-@@ -183,31 +183,33 @@
+@@ -181,31 +181,33 @@
  	# so we can still find our files
  	set ds9(root) [file normalize [file join [pwd] zvfsmntpt]]
  
diff --git a/debian/patches/ds9_use_tcltk_packages.patch b/debian/patches/ds9_use_tcltk_packages.patch
index d4a7d45..5658626 100644
--- a/debian/patches/ds9_use_tcltk_packages.patch
+++ b/debian/patches/ds9_use_tcltk_packages.patch
@@ -20,7 +20,7 @@ Description: Don't load TclTk extensions as shared libs, but as packages.
 +exec wish -f ${DS9_HOME-/usr/share/saods9}/library/ds9.tcl $*
 --- a/ds9/library/ds9.tcl
 +++ b/ds9/library/ds9.tcl
-@@ -150,7 +150,7 @@
+@@ -148,7 +148,7 @@
  }
  
  # who are we?
@@ -29,7 +29,7 @@ Description: Don't load TclTk extensions as shared libs, but as packages.
  
  # Themes are now hardcoded
  switch $ds9(wm) {
-@@ -181,7 +181,7 @@
+@@ -179,7 +179,7 @@
      x11 {
  	# set to absolute path so that if -cd command is used,
  	# so we can still find our files
@@ -38,7 +38,7 @@ Description: Don't load TclTk extensions as shared libs, but as packages.
  
  	package require msgcat
  	package require http
-@@ -197,6 +197,11 @@
+@@ -195,6 +195,11 @@
  
  	package require tkcon
  	package require tkblt

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