[SCM] Seamless communication between many kinds of Unix branch, master, updated. 2ad8dc53d7bee9144f8a2684c9f3d700fc1f4f3b

Mon Jan 23 14:27:08 UTC 2012

The following commit has been merged in the master branch:
commit 2ad8dc53d7bee9144f8a2684c9f3d700fc1f4f3b
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Mon Jan 23 15:26:37 2012 +0100

    Add new package "tcl-xpa" for the Tcl interface

diff --git a/debian/control b/debian/control
index 1004f90..14e2090 100644
--- a/debian/control
+++ b/debian/control
@@ -58,3 +58,21 @@ Description: Tools for seamless communication between Unix programs
  easily at any time. 
  .
  This package contains the additional tools.
+
+Package: tcl-xpa
+Architecture: any
+Section: libs
+Depends: libxpa1 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends},
+ ${tcl:Depends}
+Description: Seamless communication between Unix programs (Tcl interface)
+ The XPA messaging system provides seamless communication between many kinds
+ of Unix programs, including X programs and Tcl/Tk programs. It also provides
+ an easy way for users to communicate with these XPA-enabled programs by
+ executing XPA client commands in the shell or by utilizing such commands in
+ scripts. Because XPA works both at the programming level and the shell level,
+ it is a powerful tool for unifying any analysis environment: users and
+ programmers have great flexibility in choosing the best level or levels at
+ which to access XPA services, and client access can be extended or modified
+ easily at any time. 
+ .
+ This package contains the Tcl interface.
diff --git a/debian/patches/fix_manpages.patch b/debian/patches/fix_manpages.patch
index 9ba9121..7ee0269 100644
--- a/debian/patches/fix_manpages.patch
+++ b/debian/patches/fix_manpages.patch
@@ -16,7 +16,7 @@ Description: Fix manpages (section, name, and spellfixes) so that lintian
  	    do \
 -		B=`basename $$i`; \
 -		E=`echo $$i | awk -F. '{print $$NF}'`; \
-+		B=`basename $$i|sed s/\\\\.n/.3/`; \
++		B=`basename $$i|sed s/tcl\\\\.n/.3tcl/|sed s/\\\\.n/.3/`; \
 +		E=`echo $$i | awk -F. '{print $$NF}' | sed s/n/3/`; \
  		M="$(MAN_INSTALL_DIR)/man$$E"; \
  		if [ ! -d $$M ] ; then \
@@ -513,7 +513,7 @@ Description: Fix manpages (section, name, and spellfixes) so that lintian
  .\"
  .IX Title "xpatcl n"
 -.TH xpatcl n "April 14, 2011" "version 2.1.13" "SAORD Documentation"
-+.TH xpatcl 3 "April 14, 2011" "version 2.1.13" "SAORD Documentation"
++.TH xpatcl 3tcl "April 14, 2011" "version 2.1.13" "SAORD Documentation"
  .SH "NAME"
 -\&\fBXPATcl: the XPA Interface to the Tcl/Tk Environment\fR
 +XPATcl \- the XPA Interface to the Tcl/Tk Environment
diff --git a/debian/patches/install_tclxpa.patch b/debian/patches/install_tclxpa.patch
new file mode 100644
index 0000000..61aa345
--- /dev/null
+++ b/debian/patches/install_tclxpa.patch
@@ -0,0 +1,43 @@
+Author: Ole Streicher <debian at liska.ath.cx>
+Description: Install the tcl interface to /usr/lib/tcltk/xpa according to
+ Debians policy.
+--- xpa-2.1.13.orig/Makefile.in
++++ xpa-2.1.13/Makefile.in
+@@ -38,6 +38,7 @@ INSTALL_ROOT = $(DESTDIR)
+ 
+ # Directory in which to install the .a or .so binary for the XPA library:
+ LIB_INSTALL_DIR =	$(INSTALL_ROOT)$(exec_prefix)/lib
++TCL_LIB_INSTALL_DIR =	$(LIB_INSTALL_DIR)/tcltk/xpa
+ 
+ # Directory in which to install the program wish:
+ BIN_INSTALL_DIR =	$(INSTALL_ROOT)$(exec_prefix)/bin
+@@ -167,6 +168,8 @@ install::	install-man
+ 
+ install::	install-share
+ 
++install::	tclxpa_install
++
+ lib:		$(LIB) $(DOSHARED)
+ 
+ $(LIB):		$(LIBOBJS)
+@@ -257,7 +260,7 @@ smoke:  ctest stest
+ _install:
+ 
+ shlib_install:
+-	@-(for i in `ls *.so* *.dylib *.sl 2>/dev/null` ; \
++	@-(for i in `ls libxpa.so* *.dylib *.sl 2>/dev/null` ; \
+ 	   do \
+ 	   if [ -h $$i ] ; then \
+ 		echo "Installing link $$i" ; \
+@@ -269,6 +272,11 @@ shlib_install:
+ 	   fi; \
+ 	   done;)
+ 
++tclxpa_install: tclxpa
++	mkdir -p $(TCL_LIB_INSTALL_DIR)
++	$(INSTALL_DATA) libtclxpa.so $(TCL_LIB_INSTALL_DIR)
++	$(INSTALL_DATA) pkgIndex.tcl $(TCL_LIB_INSTALL_DIR)
++
+ install-binaries: $(LIB) $(PROGS)
+ 	@for i in $(LIB_INSTALL_DIR) $(INCLUDE_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \
+ 	    do \
diff --git a/debian/patches/series b/debian/patches/series
index 6fa8c2e..ef868ac 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 fix_paths.patch
 fix_manpages.patch
+install_tclxpa.patch
diff --git a/debian/rules b/debian/rules
index f19ef80..e525ce8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,8 +9,15 @@
 override_dh_auto_configure:
 	dh_auto_configure -- --enable-shared --with-threads --with-tclconfig=/usr/lib --with-tcl=/usr/include/tcl
 
+override_dh_auto_build:
+	dh_auto_build -- all tclxpa
+
 override_dh_installchangelogs:
 	dh_installchangelogs doc/changelog.html
 
 override_dh_compress:
 	dh_compress -Xchangelog.html
+
+override_dh_makeshlibs:
+	dh_makeshlibs -Xlibtclxpa.so
+	tcltk-depends
diff --git a/debian/tcl-xpa.install b/debian/tcl-xpa.install
new file mode 100644
index 0000000..b5344da
--- /dev/null
+++ b/debian/tcl-xpa.install
@@ -0,0 +1,3 @@
+usr/lib/tcltk/xpa/libtclxpa.so
+usr/lib/tcltk/xpa/pkgIndex.tcl
+usr/share/man/man3/xpa.3tcl
diff --git a/debian/libxpa1.lintian-overrides b/debian/tcl-xpa.lintian-overrides
similarity index 100%
copy from debian/libxpa1.lintian-overrides
copy to debian/tcl-xpa.lintian-overrides
diff --git a/debian/xpa-dev.install b/debian/xpa-dev.install
index 78f1940..7187096 100644
--- a/debian/xpa-dev.install
+++ b/debian/xpa-dev.install
@@ -18,7 +18,6 @@ usr/share/man/man3/xpapoll.3
 usr/share/man/man3/xpatemplate.3
 usr/share/man/man3/xpaserver.3
 usr/share/man/man3/xpanew.3
-usr/share/man/man3/xpatcl.3
 usr/share/man/man3/xpaclose.3
 usr/share/man/man3/xpaset.3
 usr/share/man/man3/xpaconvert.3

-- 
Seamless communication between many kinds of Unix

