[SCM] image display tool for astronomy branch, debian, updated. 35b6aefda6bf718a85771e5435eb79a7f7e3f4b3

Mon Jun 11 14:33:13 UTC 2012

The following commit has been merged in the debian branch:
commit 35b6aefda6bf718a85771e5435eb79a7f7e3f4b3
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Mon Jun 11 16:32:35 2012 +0200

    Rename temporary "shared" dir from zvfsmntpt to "shared". Include xmlrpc

diff --git a/debian/patches/ds9_use_external_libs.patch b/debian/patches/ds9_use_external_libs.patch
index c224fd5..df65ea9 100644
--- a/debian/patches/ds9_use_external_libs.patch
+++ b/debian/patches/ds9_use_external_libs.patch
@@ -419,10 +419,17 @@ Description: Compile against external libraries of wcstools, funtools, ast,
  
 --- a/src/ds9.tcl
 +++ b/src/ds9.tcl
-@@ -199,22 +199,34 @@
-     source $ds9(root)/tcl8/8.4/http-2.7.5.tm
- }
+@@ -192,29 +192,35 @@
+ set ds9(root) "[pwd]/zvfsmntpt"
  
+ # tcl modules
+-if {![namespace exists msgcat]} {
+-    source $ds9(root)/tcl8/8.5/msgcat-1.4.3.tm
+-}
+-if {![namespace exists http]} {
+-    source $ds9(root)/tcl8/8.4/http-2.7.5.tm
+-}
+-
 -source $ds9(root)/tk8.5/tearoff.tcl
 -source $ds9(root)/tk8.5/comdlg.tcl
 -source $ds9(root)/tk8.5/focus.tcl
@@ -437,17 +444,18 @@ Description: Compile against external libraries of wcstools, funtools, ast,
 +package require msgcat
 +package require http
 +package require xml
- 
--source $ds9(root)/tkcon2.5/tkcon.tcl
--source $ds9(root)/xmlrpc0.3/xmlrpc.tcl
++
 +package require base64
 +package require log
 +package require ftp
 +package require textutil::repeat
 +package require textutil::tabify
 +package require math::fuzzy
-+
+ 
+-source $ds9(root)/tkcon2.5/tkcon.tcl
+-source $ds9(root)/xmlrpc0.3/xmlrpc.tcl
 +package require tkcon
++source $ds9(root)/src/xmlrpc.tcl
  source $ds9(root)/blt3.0/graph.tcl
  
 +package require Tktable 
diff --git a/debian/patches/ds9_use_filesystem.patch b/debian/patches/ds9_use_filesystem.patch
index bd7d7fa..31be372 100644
--- a/debian/patches/ds9_use_filesystem.patch
+++ b/debian/patches/ds9_use_filesystem.patch
@@ -3,6 +3,15 @@ Description: Store all files in the usual FHS directories instead of
  building a zipfile and using a special tcl filesystem driver to access it.
 --- a/ds9/Makefile
 +++ b/ds9/Makefile
+@@ -3,7 +3,7 @@
+ 
+ #--------------------------defines
+ 
+-ZDIR	= zipdir/zvfsmntpt
++ZDIR	= share
+ FFILES	= \
+ 	$(ZDIR)/src \
+ 	$(ZDIR)/msgs \
 @@ -95,12 +95,9 @@
  
  all: ds9
@@ -33,6 +42,23 @@ Description: Store all files in the usual FHS directories instead of
  
  debug	: ds9Base ds9.zip
  	$(RM) $@
+@@ -222,7 +216,6 @@
+ 	zip null.zip -d -
+ 
+ zipdir	: 
+-	mkdir zipdir
+ 	mkdir $(ZDIR)
+ 
+ $(ZDIR)/$(TCLVER) : zipdir ../lib/$(TCLVER)
+@@ -383,7 +376,7 @@
+ else
+ distclean: FORCE
+ 	$(RM) core *~ *# ds9Base ds9 *.zip *.o
+-	$(RM) -r zipdir
++	$(RM) -r $(ZDIR)
+ endif
+ 
+ FORCE	:
 --- a/ds9/ds9.C
 +++ b/ds9/ds9.C
 @@ -17,9 +17,6 @@
@@ -127,7 +153,7 @@ Description: Store all files in the usual FHS directories instead of
  
 --- a/src/ds9.tcl
 +++ b/src/ds9.tcl
-@@ -189,16 +189,9 @@
+@@ -189,7 +189,7 @@
  
  # set to absolute path so that if -cd command is used,
  # so we can still find our files
@@ -135,13 +161,4 @@ Description: Store all files in the usual FHS directories instead of
 +set ds9(root) "/usr/share/saods9"
  
  # tcl modules
--if {![namespace exists msgcat]} {
--    source $ds9(root)/tcl8/8.5/msgcat-1.4.3.tm
--}
--if {![namespace exists http]} {
--    source $ds9(root)/tcl8/8.4/http-2.7.5.tm
--}
--
  package require msgcat
- package require http
- package require xml
diff --git a/debian/repack-dfsg.sh b/debian/repack-dfsg.sh
index f57cc74..2b3a5b9 100755
--- a/debian/repack-dfsg.sh
+++ b/debian/repack-dfsg.sh
@@ -13,7 +13,7 @@ tar xf $orig_tar -C $wd
 srcdir=$wd/*
 
 for subdir in funtools\* sla tcl8.\* tcllib-\* tk8.\* tkimg\* signal_ext\* \
-              tktable\* tkcon-\* tclxml-\* wcssubs-\* xplrpc-\* xpa-\* \
+              tktable\* tkcon-\* tclxml-\* wcssubs-\* xpa-\* \
               zip-\* zlib-\* compilers ast-\* zvfs ; do
     rm -rf $srcdir/$subdir
 done
diff --git a/debian/rules b/debian/rules
index 263aab2..6366a93 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,10 +2,10 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-BUILDPARTS:=dirs checkdns tkmpeg html iis rice hcompress plio unix blt saotk ds9
+BUILDPARTS:=dirs checkdns tkmpeg html iis rice hcompress plio xmlrpc unix blt saotk ds9
 
 get-orig-source:
-	sh ./debian/repack;
+	sh ./debian/repack-dfsg.sh;
 
 %:
 	dh $@
@@ -13,7 +13,7 @@ get-orig-source:
 override_dh_auto_build:
 	ln -sf make.linux make.include
 	dh_auto_build -- $(BUILDPARTS)
-	chmod ugo-x ds9/zipdir/zvfsmntpt/src/*.tcl
+	chmod ugo-x ds9/share/src/*.tcl
 	perl -w debian/generate-man > ds9/ds9.1
 
 override_dh_installchangelogs:
diff --git a/debian/saods9-data.install b/debian/saods9-data.install
index 9d23579..4d2e84b 100644
--- a/debian/saods9-data.install
+++ b/debian/saods9-data.install
@@ -1,5 +1,6 @@
-ds9/zipdir/zvfsmntpt/cmaps /usr/share/saods9/
-ds9/zipdir/zvfsmntpt/msgs /usr/share/saods9/
-ds9/zipdir/zvfsmntpt/src /usr/share/saods9/
-ds9/zipdir/zvfsmntpt/template /usr/share/saods9/
-ds9/zipdir/zvfsmntpt/doc/sun.gif /usr/share/saods9
+ds9/share/cmaps /usr/share/saods9/
+ds9/share/msgs /usr/share/saods9/
+ds9/share/src /usr/share/saods9/
+ds9/share/template /usr/share/saods9/
+ds9/share/doc/sun.gif /usr/share/saods9
+xmlrpc-0.3/xmlrpc.tcl /usr/share/saods9/src
diff --git a/debian/saods9-doc.docs b/debian/saods9-doc.docs
index 26dd9d5..faf70b7 100644
--- a/debian/saods9-doc.docs
+++ b/debian/saods9-doc.docs
@@ -1 +1 @@
-ds9/zipdir/zvfsmntpt/doc/*
+ds9/share/doc/*

-- 
image display tool for astronomy

