[Debian-astro-commits] [saods9] 01/01: Use external xmlrpc instead of convenience copy

[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 aa81fcd36bd9b5eea1a32201b8e13cc41bed47ce
Author: Ole Streicher <olebole at debian.org>
Date:   Thu Oct 8 12:48:18 2015 +0200

    Use external xmlrpc instead of convenience copy
---
 debian/changelog                            | 6 ++++++
 debian/control                              | 2 ++
 debian/copyright                            | 4 +---
 debian/patches/ds9_use_system_libs.patch    | 2 +-
 debian/patches/ds9_use_tcltk_packages.patch | 2 +-
 debian/rules                                | 1 -
 debian/saods9.install                       | 2 +-
 7 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b2d1251..9e075b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+saods9 (7.4~b7+repack-4) unstable; urgency=low
+
+  * Use external xmlrpc instead of convenience copy
+
+ -- Ole Streicher <olebole at debian.org>  Thu, 08 Oct 2015 12:55:37 +0200
+
 saods9 (7.4~b7+repack-3) unstable; urgency=low
 
   * Update configure script to activale last fix
diff --git a/debian/control b/debian/control
index d5f72c2..39625fe 100644
--- a/debian/control
+++ b/debian/control
@@ -19,6 +19,7 @@ Build-Depends: autotools-dev,
                libxt-dev,
                perl,
                tcl-signal,
+               tcl-xmlrpc,
                tcl-xpa,
                tcl8.6-dev,
                tcllib,
@@ -40,6 +41,7 @@ Depends: blt (>= 2.5.3),
          libtk-img,
          saods9-tclpackages,
          tcl-signal,
+         tcl-xmlrpc,
          tcl-xpa,
          tcllib,
          tclxml,
diff --git a/debian/copyright b/debian/copyright
index 5aa30ff..39e6047 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: tksao*/funtools* tcl8.* tcllib-* tk8.* tkimg* tclsignal*
  tktable* tkcon-* tclxml-* tksao*/wcssubs* xpa-* tkblt* tkwin*
- compilers tksao*/ast-* tclzvfs* tkmacosx* admin
+ compilers tksao*/ast-* tclzvfs* tkmacosx* xmlrpc* admin
 
 Files: *
 Copyright: Copyright (C) 1999-2012 Smithsonian Astrophysical Observatory,
@@ -15,7 +15,6 @@ Copyright: Copyright (C) 1999-2012 Smithsonian Astrophysical Observatory,
  Copyright (C) 1984-2003 Free Software Foundation, Inc.
 Comment: Some original authors:
  tcliis*/: Doug Tody, NOAO
- xmlrpc-0.3/: Eric Yeh
 License: GPL
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -146,7 +145,6 @@ License: LGPL
    drh at acm.org
    http://www.hwaci.com/drh/
 
-
 Files: debian/*
 Copyright: not applicable
 License: public-domain
diff --git a/debian/patches/ds9_use_system_libs.patch b/debian/patches/ds9_use_system_libs.patch
index 50f4e8b..443b040 100644
--- a/debian/patches/ds9_use_system_libs.patch
+++ b/debian/patches/ds9_use_system_libs.patch
@@ -79,7 +79,7 @@ Description: Link against system libraries.
 +	package require math::fuzzy
 +
 +	package require tkcon
-+	source $ds9(root)/library/xmlrpc.tcl
++	package require xmlrpc
 +	package require BLT
 +	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 867feb3..eb485f2 100644
--- a/debian/patches/ds9_use_tcltk_packages.patch
+++ b/debian/patches/ds9_use_tcltk_packages.patch
@@ -40,7 +40,7 @@ Description: Don't load TclTk extensions as shared libs, but as packages.
  	package require http
 @@ -214,6 +214,11 @@
  	package require tkcon
- 	source $ds9(root)/library/xmlrpc.tcl
+ 	package require xmlrpc
  	package require BLT
 +	package require tksao
 +	package require tkhtml
diff --git a/debian/rules b/debian/rules
index 017f812..addfdcf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,7 +24,6 @@ override_dh_auto_configure:
 
 override_dh_auto_build:
 	dh_auto_build -- $(BUILDPARTS)
-	cp xmlrpc-0.3/xmlrpc.tcl ds9/unix/zipdir/zvfsmntpt/library
 	chmod ugo-x ds9/unix/zipdir/zvfsmntpt/library/*.tcl
 	chmod ugo+x ds9/ds9
 	perl -w debian/generate-man > ds9/ds9.1
diff --git a/debian/saods9.install b/debian/saods9.install
index 5116739..59d6365 100644
--- a/debian/saods9.install
+++ b/debian/saods9.install
@@ -3,6 +3,6 @@ debian/saods9.desktop usr/share/applications
 ds9/ds9 /usr/bin
 ds9/unix/zipdir/zvfsmntpt/cmaps /usr/share/saods9/
 ds9/unix/zipdir/zvfsmntpt/doc/sun.gif /usr/share/saods9
-ds9/unix/zipdir/zvfsmntpt/msgs /usr/share/saods9/
 ds9/unix/zipdir/zvfsmntpt/library /usr/share/saods9/
+ds9/unix/zipdir/zvfsmntpt/msgs /usr/share/saods9/
 ds9/unix/zipdir/zvfsmntpt/template /usr/share/saods9/

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