[Debian-astro-commits] [saods9] 02/02: Use external libs tkhtml1 and tkmpeg

Mon May 30 15:47:18 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 ad96420157c8a1ba1ab0f8055aded83e54f77400
Author: Ole Streicher <olebole at debian.org>
Date:   Mon May 30 17:45:46 2016 +0200

    Use external libs tkhtml1 and tkmpeg
---
 debian/changelog                         |  5 ++--
 debian/control                           |  6 ++++-
 debian/copyright                         |  2 +-
 debian/patches/ds9_use_system_libs.patch | 11 ++++----
 debian/patches/series                    |  1 -
 debian/patches/tkhtml.patch              | 43 --------------------------------
 debian/rules                             |  4 +--
 debian/saods9-tclpackages.install        |  2 --
 8 files changed, 15 insertions(+), 59 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 67a9e88..7874e5f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-saods9 (7.5~b1+repack-2) UNRELEASED; urgency=low
+saods9 (7.5~b1+repack1-1) UNRELEASED; urgency=low
 
   * Don't close DS9 when closing the tkcon console
+  * Use external libs tkhtml1 and tkmpeg
 
- -- Ole Streicher <olebole at debian.org>  Sat, 28 May 2016 21:16:22 +0200
+ -- Ole Streicher <olebole at debian.org>  Mon, 30 May 2016 17:29:19 +0200
 
 saods9 (7.5~b1+repack-1) experimental; urgency=low
 
diff --git a/debian/control b/debian/control
index cb1020b..1a0b6cd 100644
--- a/debian/control
+++ b/debian/control
@@ -24,6 +24,8 @@ Build-Depends: autotools-dev,
                tcl8.6-dev,
                tcllib,
                tclxml,
+               tk-html1,
+               tk-mpeg,
                tk-table (>= 2.9),
                tk8.6-dev,
                tkcon,
@@ -45,6 +47,8 @@ Depends: blt (>= 2.5.3),
          tcl-xpa,
          tcllib,
          tclxml,
+         tk-html1,
+         tk-mpeg,
          tk-table (>= 2.9),
          tk8.6,
          tkcon,
@@ -103,7 +107,7 @@ Recommends: saods9
 Multi-Arch: same
 Description: Tcl/Tk packages provided with DS9
  DS9 includes some extra Tcl/Tk packages that it needs for working. These
- packages are tclcheckdns, tcliis, tkhtml1, tkmpeg.
+ packages are tclcheckdns and tcliis.
  .
  This package is not meant to be used independently of saods9, since
  the stability of the API and the presence of the individual packages is not
diff --git a/debian/copyright b/debian/copyright
index b069923..732db15 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,7 +3,7 @@ Upstream-Name: SAOImage DS9
 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
+ tktable tkcon tclxml tksao/wcssubs xpa tkblt tkwin tkmpeg tkhtml1
  compilers ast tclzvfs tkmacosx admin xmlrpc zlib libxml2 libxslt
 
 Files: *
diff --git a/debian/patches/ds9_use_system_libs.patch b/debian/patches/ds9_use_system_libs.patch
index c8c1880..7915a7f 100644
--- a/debian/patches/ds9_use_system_libs.patch
+++ b/debian/patches/ds9_use_system_libs.patch
@@ -32,7 +32,7 @@ Description: Link against system libraries.
  CACHE	=--config-cache --cache-file=../config.cache
  
  include ./make.include
-@@ -15,11 +15,10 @@
+@@ -15,11 +15,9 @@
  
  .PHONY	: saods9 tcl tk
  
@@ -44,7 +44,6 @@ Description: Link against system libraries.
 +saods9	: dirs \
 +	tclcheckdns tcliis \
 +	tclxml \
-+	tkmpeg tkhtml1 \
  	tksao ds9
  
  tcl	: $(TCLVER)/unix/Makefile
@@ -59,7 +58,7 @@ Description: Link against system libraries.
  	@echo ""
  	@echo "*** Install tksao ***"
  	$(MAKE) -C tksao -j $(JOBS) install
-@@ -480,13 +480,10 @@
+@@ -480,13 +480,9 @@
  .PHONY	: tksaodistclean astdistclean funtoolsdistclean
  .PHONY	: tktabledistclean xpadistclean
  
@@ -67,11 +66,11 @@ Description: Link against system libraries.
 -	tclcheckdnsdistclean tcliisdistclean tclsignaldistclean \
 -	tclzvfsdistclean tclxmldistclean xpadistclean \
 -	tkbltdistclean tktabledistclean tkimgdistclean \
-+distclean :  \
-+	tclcheckdnsdistclean tcliisdistclean \
- 	tkmpegdistclean tkhtml1distclean \
+-	tkmpegdistclean tkhtml1distclean \
 -	tk$(OS)distclean \
 -	tksaodistclean astdistclean funtoolsdistclean ds9distclean \
++distclean :  \
++	tclcheckdnsdistclean tcliisdistclean \
 +	tksaodistclean astdistclean ds9distclean \
  	dirsdistclean localdistclean
  
diff --git a/debian/patches/series b/debian/patches/series
index c082283..0deeb4a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,5 +12,4 @@ saotk_avoid_compile_warnings.patch
 saotk_use_system_libs.patch
 saotk_spellfix.patch
 tcliis.patch
-tkhtml.patch
 fix_gcc-6.patch
diff --git a/debian/patches/tkhtml.patch b/debian/patches/tkhtml.patch
deleted file mode 100644
index 45a891c..0000000
--- a/debian/patches/tkhtml.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Correct path for tk-private header file
---- a/tkhtml1/src/htmldraw.c
-+++ b/tkhtml1/src/htmldraw.c
-@@ -27,7 +27,7 @@
- #include <stdlib.h>
- #include "htmldraw.h"
- #ifdef USE_TK_STUBS
--# include <tkIntXlibDecls.h>
-+# include <tk-private/generic/tkIntXlibDecls.h>
- #endif
- 
- #define USE_TK_DRAWCHARS 1
---- a/tkhtml1/src/htmlwidget.c
-+++ b/tkhtml1/src/htmlwidget.c
-@@ -28,7 +28,7 @@
- #include <string.h>
- #include "htmlwidget.h"
- #ifdef USE_TK_STUBS
--# include <tkIntXlibDecls.h>
-+# include <tk-private/generic/tkIntXlibDecls.h>
- #endif
- 
- /*
-@@ -2021,7 +2021,7 @@
- ** Tcl interpreter.  This is the only routine in this file with
- ** external linkage.
- */
--DLL_EXPORT int Tkhtml_Init(Tcl_Interp *interp) {
-+DLL_EXPORT int Tkhtml1_Init(Tcl_Interp *interp) {
- 
-   if (Tcl_InitStubs(interp, TCL_PATCH_LEVEL, 0) == NULL)
-     return TCL_ERROR;
---- a/tkhtml1/src/htmlwidget.h
-+++ b/tkhtml1/src/htmlwidget.h
-@@ -1,6 +1,6 @@
- /* This file was automatically generated.  Do not edit! */
- #define DLL_EXPORT
--DLL_EXPORT int Tkhtml_Init(Tcl_Interp *interp);
-+DLL_EXPORT int Tkhtml1_Init(Tcl_Interp *interp);
- #define INTERFACE 0
- #define HtmlAlloc(A)      ((void*)Tcl_Alloc(A))
- typedef struct HtmlWidget HtmlWidget;
diff --git a/debian/rules b/debian/rules
index 2ed4c2c..4a6d707 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-BUILDPARTS:=dirs tclcheckdns tkmpeg tkhtml1 tcliis tksao ds9
+BUILDPARTS:=dirs tclcheckdns tcliis tksao ds9
 
 get-orig-source:
 	sh ./debian/repack.sh
@@ -13,8 +13,6 @@ get-orig-source:
 override_dh_autoreconf:
 	(cd unix; autoreconf -i -f)
 	(cd ds9/unix; autoreconf -i -f)
-	(cd tkhtml1; autoreconf -i -f)
-	(cd tkmpeg; autoreconf -i -f)
 	(cd tcliis; autoreconf -i -f)
 	(cd tclcheckdns; autoreconf -i -f)
 	(cd tksao; autoreconf -i -f)
diff --git a/debian/saods9-tclpackages.install b/debian/saods9-tclpackages.install
index a2fddbd..d3dfc3c 100755
--- a/debian/saods9-tclpackages.install
+++ b/debian/saods9-tclpackages.install
@@ -1,5 +1,3 @@
 #! /usr/bin/dh-exec
 lib/tclcheckdns* /usr/lib/tcltk/${DEB_HOST_MULTIARCH}/
 lib/tcliis* /usr/lib/tcltk/${DEB_HOST_MULTIARCH}/
-lib/tkmpeg* /usr/lib/tcltk/${DEB_HOST_MULTIARCH}/
-lib/tkhtml* /usr/lib/tcltk/${DEB_HOST_MULTIARCH}/

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

