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

Thu Jun 2 07:33:34 UTC 2016

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

olebole pushed a commit to branch debian
in repository saods9.

commit 58a66c7ed409aa43b6f766ddf7a9e1d15735c855
Author: Ole Streicher <olebole at debian.org>
Date:   Thu Jun 2 08:51:16 2016 +0200

    Use external libs tkhtml1 and tkmpeg
---
 debian/changelog                            |  6 ++++++
 debian/control                              |  6 +++++-
 debian/patches/ds9_use_system_libs.patch    |  6 +++---
 debian/patches/ds9_use_tcltk_packages.patch |  2 +-
 debian/patches/series                       |  1 -
 debian/patches/tkhtml.patch                 | 24 ------------------------
 debian/rules                                |  4 +---
 debian/saods9-tclpackages.install           |  2 --
 8 files changed, 16 insertions(+), 35 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 248ed83..4e3f778 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+saods9 (7.4.1+repack-2) UNRELEASED; urgency=low
+
+  * Use external libs tkhtml1 and tkmpeg
+
+ -- Ole Streicher <olebole at debian.org>  Thu, 02 Jun 2016 08:43:15 +0200
+
 saods9 (7.4.1+repack-1) unstable; urgency=low
 
   * Update standards-version to 3.9.7 (no changes)
diff --git a/debian/control b/debian/control
index 28ddd38..17eb076 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/patches/ds9_use_system_libs.patch b/debian/patches/ds9_use_system_libs.patch
index 207ca87..326d5af 100644
--- a/debian/patches/ds9_use_system_libs.patch
+++ b/debian/patches/ds9_use_system_libs.patch
@@ -20,7 +20,7 @@ Description: Link against system libraries.
  	$(ZDIR)/doc \
 --- a/make.include
 +++ b/make.include
-@@ -384,12 +384,10 @@
+@@ -384,12 +384,9 @@
  .PHONY	: libtiffdistclean tkmpegdistclean tksaodistclean
  .PHONY	: tktabledistclean xpadistclean
  
@@ -28,11 +28,11 @@ Description: Link against system libraries.
 -	tclcheckdnsdistclean tcliisdistclean tclsignaldistclean \
 -	tclzvfsdistclean tclxmldistclean xpadistclean \
 -	tkbltdistclean tktabledistclean tkimgdistclean \
+-	tkmpegdistclean tkhtmldistclean \
+-	tk$(OS)distclean \
 +distclean :  \
 +	tclcheckdnsdistclean tcliisdistclean \
 +	tclxmldistclean \
- 	tkmpegdistclean tkhtmldistclean \
--	tk$(OS)distclean \
  	tksaodistclean ds9distclean \
  	dirsdistclean localdistclean
  
diff --git a/debian/patches/ds9_use_tcltk_packages.patch b/debian/patches/ds9_use_tcltk_packages.patch
index 5a05dbc..78e40e2 100644
--- a/debian/patches/ds9_use_tcltk_packages.patch
+++ b/debian/patches/ds9_use_tcltk_packages.patch
@@ -43,7 +43,7 @@ Description: Don't load TclTk extensions as shared libs, but as packages.
  	package require xmlrpc
  	package require BLT
 +	package require tksao
-+	package require tkhtml
++	package require tkhtml1
 +	package require tcliis
 +	package require tclcheckdns
 +	package require tkmpeg
diff --git a/debian/patches/series b/debian/patches/series
index 3189652..f8dc8ca 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,5 +11,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 0dc8600..0000000
--- a/debian/patches/tkhtml.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Correct path for tk-private header file
---- a/tkhtml1.0/src/htmldraw.c
-+++ b/tkhtml1.0/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.0/src/htmlwidget.c
-+++ b/tkhtml1.0/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
- 
- /*
diff --git a/debian/rules b/debian/rules
index addfdcf..b943b80 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 tkhtml 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.0; autoreconf -i -f)
-	(cd tkmpeg1.0; autoreconf -i -f)
 	(cd tcliis1.0; autoreconf -i -f)
 	(cd tclcheckdns1.1; autoreconf -i -f)
 	(cd tksao1.0; 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

