[Debian-astro-commits] [saods9] 04/05: Remove tcl-xmlrpc: ds9 uses internal, modified one

[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 72ff78faec5c87d5efd2d2c21dcd4589d558e227
Author: Ole Streicher <olebole at debian.org>
Date:   Thu Jul 14 10:06:04 2016 +0200

    Remove tcl-xmlrpc: ds9 uses internal, modified one
---
 debian/control                              | 2 --
 debian/copyright                            | 2 +-
 debian/patches/ds9_use_system_libs.patch    | 3 +--
 debian/patches/ds9_use_tcltk_packages.patch | 4 ++--
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/debian/control b/debian/control
index 646c022..23b7fc1 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,6 @@ Build-Depends: autotools-dev,
                perl,
                tcl-dev (>= 8.6),
                tcl-signal,
-               tcl-xmlrpc,
                tcl-xpa,
                tcllib,
                tclxml,
@@ -39,7 +38,6 @@ Architecture: all
 Depends: libtk-img,
          saods9-tclpackages,
          tcl-signal,
-         tcl-xmlrpc,
          tcl-xpa,
          tcllib,
          tclxml,
diff --git a/debian/copyright b/debian/copyright
index 804fa0c..0114e7a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,7 +4,7 @@ Upstream-Author: William Joye <wjoye at cfa.harvard.edu>
 Source: http://ds9.si.edu/site/Download.html
 Files-Excluded: tcl8.* tk8.* funtools tcllib tkimg tclsignal
  tktable tkcon tclxml tksao/wcssubs xpa tkblt tkwin tkmpeg tkhtml1
- compilers ast tclzvfs tkmacosx admin xmlrpc zlib libxml2 libxslt
+ compilers ast tclzvfs tkmacosx admin zlib libxml2 libxslt
 
 Files: *
 Copyright: Copyright (C) 1999-2012 Smithsonian Astrophysical Observatory,
diff --git a/debian/patches/ds9_use_system_libs.patch b/debian/patches/ds9_use_system_libs.patch
index 67a3906..6bc1488 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,30 +183,33 @@
+@@ -183,30 +183,32 @@
  	# so we can still find our files
  	set ds9(root) [file normalize [file join [pwd] zvfsmntpt]]
  
@@ -116,7 +116,6 @@ Description: Link against system libraries.
 +	package require math::fuzzy
 +
 +	package require tkcon
-+	package require xmlrpc
 +	package require tkblt
 +	package require Tktable
 +	package require tclxpa
diff --git a/debian/patches/ds9_use_tcltk_packages.patch b/debian/patches/ds9_use_tcltk_packages.patch
index ad06c13..daf8e78 100644
--- a/debian/patches/ds9_use_tcltk_packages.patch
+++ b/debian/patches/ds9_use_tcltk_packages.patch
@@ -38,9 +38,9 @@ Description: Don't load TclTk extensions as shared libs, but as packages.
  
  	package require msgcat
  	package require http
-@@ -197,6 +197,11 @@
+@@ -196,6 +196,11 @@
+ 
  	package require tkcon
- 	package require xmlrpc
  	package require tkblt
 +	package require tksao
 +	package require tkhtml1

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