[SCM] Seamless communication between many kinds of Unix branch, debian, updated. fcbed33db731d61c9933b86a67ba22f8c81fd62b
Ole Streicher
debian at liska.ath.cx
Thu Jul 25 09:08:28 UTC 2013
The following commit has been merged in the debian branch:
commit b465cace252bd947ed0dfc9cafafb11561c5c98d
Author: Ole Streicher <debian at liska.ath.cx>
Date: Thu Jul 25 10:22:32 2013 +0200
Adopt new upstream version
diff --git a/debian/changelog b/debian/changelog
index 5fa03b1..5519a9e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xpa (2.15-1) UNRELEASED; urgency=low
+
+ * New upstream version
+ * Change priority to optional
+
+ -- Ole Streicher <debian at liska.ath.cx> Thu, 25 Jul 2013 10:21:05 +0200
+
xpa (2.1.14-2) unstable; urgency=low
* Install correct pkgIndex.tcl in tcl-xpa
diff --git a/debian/patches/fix_manpages.patch b/debian/patches/fix_manpages.patch
index 6676deb..1845261 100644
--- a/debian/patches/fix_manpages.patch
+++ b/debian/patches/fix_manpages.patch
@@ -3,25 +3,29 @@ Description: Fix manpages (section, name, and spellfixes) so that lintian
does not complain
--- a/man/man1/xpachanges.1
+++ b/man/man1/xpachanges.1
-@@ -128,10 +128,10 @@
+@@ -123,14 +123,14 @@
.rm #[ #] #H #V #F C
.\" ========================================================================
.\"
-.IX Title "xpachanges 1"
--.TH xpachanges 1 "June 7, 2012" "version 2.1.14" "SAORD Documentation"
+-.TH xpachanges 1 "July 23, 2013" "version 2.1.15" "SAORD Documentation"
+.IX Title "xpachanges 7"
-+.TH xpachanges 7 "June 7, 2012" "version 2.1.14" "SAORD Documentation"
++.TH xpachanges 7 "July 23, 2013" "version 2.1.15" "SAORD Documentation"
+ .\" For nroff, turn off justification. Always turn off hyphenation; it makes
+ .\" way too many mistakes in technical documents.
+ .if n .ad l
+ .nh
.SH "NAME"
--\&\fBXPA Changes: Changes For Users from XPA 1.0 and 2.0\fR
-+XPAChanges \- Changes For Users from XPA 1.0 and 2.0
+-\&\fB\s-1XPA\s0 Changes: Changes For Users from \s-1XPA\s0 1.0 and 2.0\fR
++XPA Changes \- Changes For Users from XPA 1.0 and 2.0
.SH "SYNOPSIS"
.IX Header "SYNOPSIS"
This document describes changes that will affect users who migrate
--- a/man/man3/xpaaccess.3
+++ b/man/man3/xpaaccess.3
-@@ -131,8 +131,7 @@
- .IX Title "xpaaccess 3"
- .TH xpaaccess 3 "June 7, 2012" "version 2.1.14" "SAORD Documentation"
+@@ -130,8 +130,7 @@
+ .if n .ad l
+ .nh
.SH "NAME"
-XPAAccess: return XPA access points matching
-template (XPA 2.1 and above)
@@ -31,40 +35,40 @@ Description: Fix manpages (section, name, and spellfixes) so that lintian
.Vb 1
--- a/man/man3/xpamacros.3
+++ b/man/man3/xpamacros.3
-@@ -131,7 +131,7 @@
- .IX Title "xpamacros 3"
- .TH xpamacros 3 "June 7, 2012" "version 2.1.14" "SAORD Documentation"
+@@ -130,7 +130,7 @@
+ .if n .ad l
+ .nh
.SH "NAME"
--\&\fBXPA Server Callback Macros\fR
-+XPAMacros \- XPA Server Callback Macros
+-\&\fB\s-1XPA\s0 Server Callback Macros\fR
++XPAMacros \- Server Callback Macros
.SH "SYNOPSIS"
.IX Header "SYNOPSIS"
.Vb 1
--- a/man/man3/xparace.3
+++ b/man/man3/xparace.3
-@@ -131,7 +131,7 @@
- .IX Title "xparace 3"
- .TH xparace 3 "June 7, 2012" "version 2.1.14" "SAORD Documentation"
+@@ -130,7 +130,7 @@
+ .if n .ad l
+ .nh
.SH "NAME"
--\&\fBXPA Race Conditions\fR
-+XPARace \- XPA Race Conditions
+-\&\fB\s-1XPA\s0 Race Conditions\fR
++XPARace \- Race Conditions
.SH "SYNOPSIS"
.IX Header "SYNOPSIS"
Potential \s-1XPA\s0 race conditions and how to avoid them.
--- a/man/mann/xpa.n
+++ b/man/mann/xpa.n
-@@ -128,8 +128,8 @@
+@@ -123,8 +123,8 @@
.rm #[ #] #H #V #F C
.\" ========================================================================
.\"
-.IX Title "xpa n"
--.TH xpa n "June 7, 2012" "version 2.1.14" "SAORD Documentation"
+-.TH xpa n "July 23, 2013" "version 2.1.15" "SAORD Documentation"
+.IX Title "xpa 7"
-+.TH xpa 7 "June 7, 2012" "version 2.1.14" "SAORD Documentation"
- .SH "NAME"
- \&\fBXPA: Public Access to Data and Algorithms\fR
- .SH "SYNOPSIS"
-@@ -170,22 +170,22 @@
++.TH xpa 7 "July 23, 2013" "version 2.1.15" "SAORD Documentation"
+ .\" For nroff, turn off justification. Always turn off hyphenation; it makes
+ .\" way too many mistakes in technical documents.
+ .if n .ad l
+@@ -169,22 +169,22 @@
Choose from the following topics:
.IP "\(bu" 4
Introduction to \s-1XPA\s0
@@ -93,7 +97,7 @@ Description: Fix manpages (section, name, and spellfixes) so that lintian
.IP "\(bu" 4
\&\s-1XPA\s0 User Programs
.RS 4
-@@ -284,10 +284,10 @@
+@@ -283,10 +283,10 @@
[\fIxpaaccess\fR\|(3)]
.IP "\(bu" 4
The XPA/Xt Interface: Xt interface to \s-1XPA\s0
@@ -106,7 +110,7 @@ Description: Fix manpages (section, name, and spellfixes) so that lintian
.RE
.RS 4
.RE
-@@ -296,10 +296,10 @@
+@@ -295,10 +295,10 @@
.RS 4
.IP "\(bu" 4
Environment Variables
@@ -121,183 +125,183 @@ Description: Fix manpages (section, name, and spellfixes) so that lintian
.RE
--- a/man/mann/xpaacl.n
+++ b/man/mann/xpaacl.n
-@@ -128,8 +128,8 @@
+@@ -123,8 +123,8 @@
.rm #[ #] #H #V #F C
.\" ========================================================================
.\"
-.IX Title "xpaacl n"
--.TH xpaacl n "June 7, 2012" "version 2.1.14" "SAORD Documentation"
+-.TH xpaacl n "July 23, 2013" "version 2.1.15" "SAORD Documentation"
+.IX Title "xpaacl 7"
-+.TH xpaacl 7 "June 7, 2012" "version 2.1.14" "SAORD Documentation"
- .SH "NAME"
- \&\fBXPAAcl: Access Control for XPA Messaging\fR
- .SH "SYNOPSIS"
++.TH xpaacl 7 "July 23, 2013" "version 2.1.15" "SAORD Documentation"
+ .\" For nroff, turn off justification. Always turn off hyphenation; it makes
+ .\" way too many mistakes in technical documents.
+ .if n .ad l
--- a/man/mann/xpacode.n
+++ b/man/mann/xpacode.n
-@@ -128,8 +128,8 @@
+@@ -123,8 +123,8 @@
.rm #[ #] #H #V #F C
.\" ========================================================================
.\"
-.IX Title "xpacode n"
--.TH xpacode n "June 7, 2012" "version 2.1.14" "SAORD Documentation"
+-.TH xpacode n "July 23, 2013" "version 2.1.15" "SAORD Documentation"
+.IX Title "xpacode 7"
-+.TH xpacode 7 "June 7, 2012" "version 2.1.14" "SAORD Documentation"
- .SH "NAME"
- \&\fBXPACode: Where to Find Example/Test Code\fR
- .SH "SYNOPSIS"
++.TH xpacode 7 "July 23, 2013" "version 2.1.15" "SAORD Documentation"
+ .\" For nroff, turn off justification. Always turn off hyphenation; it makes
+ .\" way too many mistakes in technical documents.
+ .if n .ad l
--- a/man/mann/xpacommon.n
+++ b/man/mann/xpacommon.n
-@@ -128,8 +128,8 @@
+@@ -123,8 +123,8 @@
.rm #[ #] #H #V #F C
.\" ========================================================================
.\"
-.IX Title "xpacommon n"
--.TH xpacommon n "June 7, 2012" "version 2.1.14" "SAORD Documentation"
+-.TH xpacommon n "July 23, 2013" "version 2.1.15" "SAORD Documentation"
+.IX Title "xpacommon 7"
-+.TH xpacommon 7 "June 7, 2012" "version 2.1.14" "SAORD Documentation"
- .SH "NAME"
- \&\fBXPACommon: Getting Common Information About Access Points\fR
- .SH "SYNOPSIS"
++.TH xpacommon 7 "July 23, 2013" "version 2.1.15" "SAORD Documentation"
+ .\" For nroff, turn off justification. Always turn off hyphenation; it makes
+ .\" way too many mistakes in technical documents.
+ .if n .ad l
--- a/man/mann/xpaconvert.n
+++ b/man/mann/xpaconvert.n
-@@ -128,8 +128,8 @@
+@@ -123,8 +123,8 @@
.rm #[ #] #H #V #F C
.\" ========================================================================
.\"
-.IX Title "xpaconvert n"
--.TH xpaconvert n "June 7, 2012" "version 2.1.14" "SAORD Documentation"
+-.TH xpaconvert n "July 23, 2013" "version 2.1.15" "SAORD Documentation"
+.IX Title "xpaconvert 7"
-+.TH xpaconvert 7 "June 7, 2012" "version 2.1.14" "SAORD Documentation"
- .SH "NAME"
- \&\fBXPAConvert: Converting the XPA API to 2.0\fR
- .SH "SYNOPSIS"
++.TH xpaconvert 7 "July 23, 2013" "version 2.1.15" "SAORD Documentation"
+ .\" For nroff, turn off justification. Always turn off hyphenation; it makes
+ .\" way too many mistakes in technical documents.
+ .if n .ad l
--- a/man/mann/xpaenv.n
+++ b/man/mann/xpaenv.n
-@@ -128,8 +128,8 @@
+@@ -123,8 +123,8 @@
.rm #[ #] #H #V #F C
.\" ========================================================================
.\"
-.IX Title "xpaenv n"
--.TH xpaenv n "June 7, 2012" "version 2.1.14" "SAORD Documentation"
+-.TH xpaenv n "July 23, 2013" "version 2.1.15" "SAORD Documentation"
+.IX Title "xpaenv 7"
-+.TH xpaenv 7 "June 7, 2012" "version 2.1.14" "SAORD Documentation"
- .SH "NAME"
- \&\fBXPAEnv: Environment Variables for XPA Messaging\fR
- .SH "SYNOPSIS"
++.TH xpaenv 7 "July 23, 2013" "version 2.1.15" "SAORD Documentation"
+ .\" For nroff, turn off justification. Always turn off hyphenation; it makes
+ .\" way too many mistakes in technical documents.
+ .if n .ad l
--- a/man/mann/xpainet.n
+++ b/man/mann/xpainet.n
-@@ -128,8 +128,8 @@
+@@ -123,8 +123,8 @@
.rm #[ #] #H #V #F C
.\" ========================================================================
.\"
-.IX Title "xpainet n"
--.TH xpainet n "June 7, 2012" "version 2.1.14" "SAORD Documentation"
+-.TH xpainet n "July 23, 2013" "version 2.1.15" "SAORD Documentation"
+.IX Title "xpainet 7"
-+.TH xpainet 7 "June 7, 2012" "version 2.1.14" "SAORD Documentation"
- .SH "NAME"
- \&\fBXPAInet: XPA Communication Between Hosts\fR
- .SH "SYNOPSIS"
++.TH xpainet 7 "July 23, 2013" "version 2.1.15" "SAORD Documentation"
+ .\" For nroff, turn off justification. Always turn off hyphenation; it makes
+ .\" way too many mistakes in technical documents.
+ .if n .ad l
--- a/man/mann/xpaintro.n
+++ b/man/mann/xpaintro.n
-@@ -128,8 +128,8 @@
+@@ -123,8 +123,8 @@
.rm #[ #] #H #V #F C
.\" ========================================================================
.\"
-.IX Title "xpaintro n"
--.TH xpaintro n "June 7, 2012" "version 2.1.14" "SAORD Documentation"
+-.TH xpaintro n "July 23, 2013" "version 2.1.15" "SAORD Documentation"
+.IX Title "xpaintro 7"
-+.TH xpaintro 7 "June 7, 2012" "version 2.1.14" "SAORD Documentation"
- .SH "NAME"
- \&\fBXPAIntro: Introduction to the XPA Messaging System\fR
- .SH "SYNOPSIS"
++.TH xpaintro 7 "July 23, 2013" "version 2.1.15" "SAORD Documentation"
+ .\" For nroff, turn off justification. Always turn off hyphenation; it makes
+ .\" way too many mistakes in technical documents.
+ .if n .ad l
--- a/man/mann/xpamethod.n
+++ b/man/mann/xpamethod.n
-@@ -128,8 +128,8 @@
+@@ -123,8 +123,8 @@
.rm #[ #] #H #V #F C
.\" ========================================================================
.\"
-.IX Title "xpamethod n"
--.TH xpamethod n "June 7, 2012" "version 2.1.14" "SAORD Documentation"
+-.TH xpamethod n "July 23, 2013" "version 2.1.15" "SAORD Documentation"
+.IX Title "xpamethod 7"
-+.TH xpamethod 7 "June 7, 2012" "version 2.1.14" "SAORD Documentation"
- .SH "NAME"
- \&\fBXPAMethod: XPA Communication Methods\fR
- .SH "SYNOPSIS"
++.TH xpamethod 7 "July 23, 2013" "version 2.1.15" "SAORD Documentation"
+ .\" For nroff, turn off justification. Always turn off hyphenation; it makes
+ .\" way too many mistakes in technical documents.
+ .if n .ad l
--- a/man/mann/xpaname.n
+++ b/man/mann/xpaname.n
-@@ -128,8 +128,8 @@
+@@ -123,8 +123,8 @@
.rm #[ #] #H #V #F C
.\" ========================================================================
.\"
-.IX Title "xpaname n"
--.TH xpaname n "June 7, 2012" "version 2.1.14" "SAORD Documentation"
+-.TH xpaname n "July 23, 2013" "version 2.1.15" "SAORD Documentation"
+.IX Title "xpaname 7"
-+.TH xpaname 7 "June 7, 2012" "version 2.1.14" "SAORD Documentation"
- .SH "NAME"
- \&\fBXPAName: What does XPA stand for?\fR
- .SH "SYNOPSIS"
++.TH xpaname 7 "July 23, 2013" "version 2.1.15" "SAORD Documentation"
+ .\" For nroff, turn off justification. Always turn off hyphenation; it makes
+ .\" way too many mistakes in technical documents.
+ .if n .ad l
--- a/man/mann/xpaoom.n
+++ b/man/mann/xpaoom.n
-@@ -128,8 +128,8 @@
+@@ -123,8 +123,8 @@
.rm #[ #] #H #V #F C
.\" ========================================================================
.\"
-.IX Title "xpaoom n"
--.TH xpaoom n "June 7, 2012" "version 2.1.14" "SAORD Documentation"
+-.TH xpaoom n "July 23, 2013" "version 2.1.15" "SAORD Documentation"
+.IX Title "xpaoom 7"
-+.TH xpaoom 7 "June 7, 2012" "version 2.1.14" "SAORD Documentation"
- .SH "NAME"
- \&\fBXpaoom: What happens when XPA runs out of memory?\fR
- .SH "SYNOPSIS"
++.TH xpaoom 7 "July 23, 2013" "version 2.1.15" "SAORD Documentation"
+ .\" For nroff, turn off justification. Always turn off hyphenation; it makes
+ .\" way too many mistakes in technical documents.
+ .if n .ad l
--- a/man/mann/xpatcl.n
+++ b/man/mann/xpatcl.n
-@@ -128,8 +128,8 @@
+@@ -123,8 +123,8 @@
.rm #[ #] #H #V #F C
.\" ========================================================================
.\"
-.IX Title "xpatcl n"
--.TH xpatcl n "June 7, 2012" "version 2.1.14" "SAORD Documentation"
-+.IX Title "xpa 3tcl"
-+.TH xpa 3tcl "June 7, 2012" "version 2.1.14" "SAORD Documentation"
- .SH "NAME"
- \&\fBXPATcl: the XPA Interface to the Tcl/Tk Environment\fR
- .SH "SYNOPSIS"
+-.TH xpatcl n "July 23, 2013" "version 2.1.15" "SAORD Documentation"
++.IX Title "xpatcl 7"
++.TH xpatcl 7 "July 23, 2013" "version 2.1.15" "SAORD Documentation"
+ .\" For nroff, turn off justification. Always turn off hyphenation; it makes
+ .\" way too many mistakes in technical documents.
+ .if n .ad l
--- a/man/mann/xpatemplate.n
+++ b/man/mann/xpatemplate.n
-@@ -128,8 +128,8 @@
+@@ -123,8 +123,8 @@
.rm #[ #] #H #V #F C
.\" ========================================================================
.\"
-.IX Title "xpatemplate n"
--.TH xpatemplate n "June 7, 2012" "version 2.1.14" "SAORD Documentation"
+-.TH xpatemplate n "July 23, 2013" "version 2.1.15" "SAORD Documentation"
+.IX Title "xpatemplate 7"
-+.TH xpatemplate 7 "June 7, 2012" "version 2.1.14" "SAORD Documentation"
- .SH "NAME"
- \&\fBXPATemplate: Access Point Names and Templates\fR
- .SH "SYNOPSIS"
++.TH xpatemplate 7 "July 23, 2013" "version 2.1.15" "SAORD Documentation"
+ .\" For nroff, turn off justification. Always turn off hyphenation; it makes
+ .\" way too many mistakes in technical documents.
+ .if n .ad l
--- a/man/mann/xpausers.n
+++ b/man/mann/xpausers.n
-@@ -128,8 +128,8 @@
+@@ -123,8 +123,8 @@
.rm #[ #] #H #V #F C
.\" ========================================================================
.\"
-.IX Title "xpausers n"
--.TH xpausers n "June 7, 2012" "version 2.1.14" "SAORD Documentation"
+-.TH xpausers n "July 23, 2013" "version 2.1.15" "SAORD Documentation"
+.IX Title "xpausers 7"
-+.TH xpausers 7 "June 7, 2012" "version 2.1.14" "SAORD Documentation"
- .SH "NAME"
- \&\fBXPAUsers: Distinguishing Users\fR
- .SH "SYNOPSIS"
++.TH xpausers 7 "July 23, 2013" "version 2.1.15" "SAORD Documentation"
+ .\" For nroff, turn off justification. Always turn off hyphenation; it makes
+ .\" way too many mistakes in technical documents.
+ .if n .ad l
--- a/man/mann/xpaxt.n
+++ b/man/mann/xpaxt.n
-@@ -128,8 +128,8 @@
+@@ -123,8 +123,8 @@
.rm #[ #] #H #V #F C
.\" ========================================================================
.\"
-.IX Title "xpaxt n"
--.TH xpaxt n "June 7, 2012" "version 2.1.14" "SAORD Documentation"
+-.TH xpaxt n "July 23, 2013" "version 2.1.15" "SAORD Documentation"
+.IX Title "xpaxt 7"
-+.TH xpaxt 7 "June 7, 2012" "version 2.1.14" "SAORD Documentation"
- .SH "NAME"
- \&\fBXPAXt: the XPA Interface to Xt (X Windows)\fR
- .SH "SYNOPSIS"
++.TH xpaxt 7 "July 23, 2013" "version 2.1.15" "SAORD Documentation"
+ .\" For nroff, turn off justification. Always turn off hyphenation; it makes
+ .\" way too many mistakes in technical documents.
+ .if n .ad l
diff --git a/debian/patches/fix_paths.patch b/debian/patches/fix_paths.patch
index 9024c02..33e4acc 100644
--- a/debian/patches/fix_paths.patch
+++ b/debian/patches/fix_paths.patch
@@ -20,7 +20,7 @@ Description: Fix the paths for a chroot build and for FHS
# Top-level directory for share entries:
MAN_SHARE_DIR = $(INSTALL_ROOT)$(prefix)/share/xpa
-@@ -274,7 +274,7 @@
+@@ -273,7 +273,7 @@
do \
if [ ! -d $$i ] ; then \
echo "Making directory $$i"; \
@@ -29,7 +29,7 @@ Description: Fix the paths for a chroot build and for FHS
chmod 755 $$i; \
else true; \
fi; \
-@@ -296,14 +296,22 @@
+@@ -295,14 +295,22 @@
install-man:
@if [ ! -d $(MAN_INSTALL_DIR) ] ; then \
echo "Making directory $(MAN_INSTALL_DIR)"; \
@@ -55,7 +55,7 @@ Description: Fix the paths for a chroot build and for FHS
M="$(MAN_INSTALL_DIR)/man$$E"; \
if [ ! -d $$M ] ; then \
echo "Making directory $$M"; \
-@@ -313,6 +321,9 @@
+@@ -312,6 +320,9 @@
fi; \
echo "Installing $$B" ; \
$(INSTALL_DATA) $$i $$M/$$B; \
diff --git a/debian/patches/install_tclxpa.patch b/debian/patches/install_tclxpa.patch
index 7747716..ebbaa38 100644
--- a/debian/patches/install_tclxpa.patch
+++ b/debian/patches/install_tclxpa.patch
@@ -29,9 +29,9 @@ Description: Install the tcl interface to /usr/lib/tcltk/xpa according to
lib: $(LIB) $(DOSHARED)
$(LIB): $(LIBOBJS)
-@@ -191,14 +194,17 @@
- -e _LibMain at 12 -Wl,--image-base,0x1C000000 -o libxpa.dll \
- -luser32 -lwsock32
+@@ -190,14 +193,17 @@
+ -Wl,--output-def,libxpa.def,--out-implib,libxpa_dll.a,-no-undefined,--enable-runtime-pseudo-reloc -o libxpa.dll \
+ -lwsock32
-tclxpa: $(LIB)
- @(rm -rf libtclxpa.tmp; mkdir libtclxpa.tmp; \
@@ -55,7 +55,7 @@ Description: Install the tcl interface to /usr/lib/tcltk/xpa according to
diff:
-(for f in `ls *.c`; \
-@@ -257,7 +263,7 @@
+@@ -256,7 +262,7 @@
_install:
shlib_install:
@@ -64,7 +64,7 @@ Description: Install the tcl interface to /usr/lib/tcltk/xpa according to
do \
if [ -h $$i ] ; then \
echo "Installing link $$i" ; \
-@@ -269,6 +275,11 @@
+@@ -268,6 +274,11 @@
fi; \
done;)
--
Seamless communication between many kinds of Unix
More information about the debian-science-commits
mailing list