[Debian-astro-commits] [xpa] 01/04: Rediff patches
Ole Streicher
olebole at moszumanska.debian.org
Sat Oct 15 12:55:55 UTC 2016
This is an automated email from the git hooks/post-receive script.
olebole pushed a commit to branch debian
in repository xpa.
commit d1d38f355e972f8403b30bae5a9cde82f148e38e
Author: Ole Streicher <olebole at debian.org>
Date: Sat Oct 15 14:50:49 2016 +0200
Rediff patches
Added Sort-.o-files.patch: <REASON>
Added Install-the-tcl-interface-to-usr-lib-tcltk-xpa-according-.patch: <REASON>
Added Add-a-description-to-AC_DEFINEs.patch: <REASON>
Added Fix-manpages-section-name-and-spellfixes-so-that-lintian-.patch: <REASON>
Added Fix-the-paths-for-a-chroot-build-and-for-FHS.patch: <REASON>
Added Add-hardening-flags.patch: <REASON>
Dropped fix_manpages.patch: <REASON>
Dropped hardening.patch: <REASON>
Dropped sort_o_files: <REASON>
Dropped fix_paths.patch: <REASON>
Dropped fix_AC_DEFINE.patch: <REASON>
Dropped install_tclxpa.patch: <REASON>
---
...patch => Add-a-description-to-AC_DEFINEs.patch} | 24 ++++---
.../{hardening.patch => Add-hardening-flags.patch} | 18 +++--
...ion-name-and-spellfixes-so-that-lintian-.patch} | 76 ++++++++++++++++++++--
...the-paths-for-a-chroot-build-and-for-FHS.patch} | 22 +++++--
...nterface-to-usr-lib-tcltk-xpa-according-.patch} | 29 ++++++---
.../patches/{sort_o_files => Sort-.o-files.patch} | 17 +++--
debian/patches/series | 12 ++--
7 files changed, 150 insertions(+), 48 deletions(-)
diff --git a/debian/patches/fix_AC_DEFINE.patch b/debian/patches/Add-a-description-to-AC_DEFINEs.patch
similarity index 77%
rename from debian/patches/fix_AC_DEFINE.patch
rename to debian/patches/Add-a-description-to-AC_DEFINEs.patch
index a9e403d..72229f4 100644
--- a/debian/patches/fix_AC_DEFINE.patch
+++ b/debian/patches/Add-a-description-to-AC_DEFINEs.patch
@@ -1,9 +1,17 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Add a description to AC_DEFINEs
- This is needed for modern autoheader call.
+From: Ole Streicher <olebole at debian.org>
+Date: Sat, 15 Oct 2016 14:49:02 +0200
+Subject: Add a description to AC_DEFINEs
+
+This is needed for modern autoheader call.
+---
+ configure.ac | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index d97360e..fcd1af9 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -65,8 +65,8 @@
+@@ -65,8 +65,8 @@ if test "$fun_ok" = "yes"; then
AC_MSG_RESULT($fun_ok)
AC_CHECK_LIB(pthread, pthread_create, have_pthread=yes)
if test x"${have_pthread}" = x"yes"; then
@@ -14,7 +22,7 @@ Description: Add a description to AC_DEFINEs
TLIB="-lpthread"
else
AC_MSG_ERROR([no threads found ... can't use enable-threaded-xpans], 1)
-@@ -106,7 +106,7 @@
+@@ -106,7 +106,7 @@ fi
AC_PATH_XTRA
if test x"${have_x}" = "xyes"; then
@@ -23,7 +31,7 @@ Description: Add a description to AC_DEFINEs
fi
SC_PATH_TCLCONFIG
-@@ -122,12 +122,12 @@
+@@ -122,12 +122,12 @@ if test x"${no_tcl}" = x ; then
TCL_LIBS="$TCL_LIB_SPEC"
AC_MSG_RESULT([Tcl support will utilize library: $TCL_LIBS])
fi
@@ -38,7 +46,7 @@ Description: Add a description to AC_DEFINEs
AC_MSG_RESULT([warning: tcl.h not found with --with-tcl ... tcl build might fail])
else
AC_MSG_RESULT([$TCL_PREFIX/include/tcl.h not found ... use --with-tcl to build tcl explicitly])
-@@ -154,7 +154,7 @@
+@@ -154,7 +154,7 @@ if test x"$havelib" = x1 ; then
AC_MSG_RESULT(yes ($withval))
GTK_CFLAGS="`pkg-config gtk+-2.0 --cflags` -DHAVE_GTK=1"
GTK_LIBS="`pkg-config gtk+-2.0 --libs`"
@@ -47,7 +55,7 @@ Description: Add a description to AC_DEFINEs
else
GTK_CFLAGS=""
GTK_LIBS=""
-@@ -169,13 +169,13 @@
+@@ -169,13 +169,13 @@ LDFLAGS="$LDFLAGS $XLDFLAGS"
AC_MSG_CHECKING([$host_os configuration])
case $host_os in
*cygwin*|*Cygwin* )
diff --git a/debian/patches/hardening.patch b/debian/patches/Add-hardening-flags.patch
similarity index 68%
rename from debian/patches/hardening.patch
rename to debian/patches/Add-hardening-flags.patch
index 6bdece3..841432d 100644
--- a/debian/patches/hardening.patch
+++ b/debian/patches/Add-hardening-flags.patch
@@ -1,8 +1,16 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Add hardening flags
+From: Ole Streicher <debian at liska.ath.cx>
+Date: Sat, 15 Oct 2016 14:49:02 +0200
+Subject: Add hardening flags
+
+---
+ Makefile.in | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 627acb4..1f5c83d 100644
--- a/Makefile.in
+++ b/Makefile.in
-@@ -122,7 +122,7 @@
+@@ -122,7 +122,7 @@ RM = rm -f
CC = @CC@
@@ -11,7 +19,7 @@ Description: Add hardening flags
DEPEND_SWITCHES = -I. ${CFLAGS} ${PKG_CFLAGS} ${AC_FLAGS}
-@@ -185,7 +185,7 @@
+@@ -185,7 +185,7 @@ shlib: $(LIB)
rm -f lib$(PACKAGE).tmp/xt*.o; \
rm -f lib$(PACKAGE).tmp/tcl*.o; \
CC='$(CC)' CXX=$(CXX) \
@@ -20,7 +28,7 @@ Description: Add hardening flags
rm -rf lib$(PACKAGE).tmp)
mingw-dll: $(LIBOBJS)
-@@ -204,7 +204,7 @@
+@@ -204,7 +204,7 @@ shtclxpa: tclxpa
@(rm -rf $(PACKAGE)tmp; mkdir $(PACKAGE)tmp; \
(cd $(PACKAGE)tmp && ar x ../libtclxpa.a); \
CC='$(CC)' CXX='$(CXX)' \
diff --git a/debian/patches/fix_manpages.patch b/debian/patches/Fix-manpages-section-name-and-spellfixes-so-that-lintian-.patch
similarity index 79%
rename from debian/patches/fix_manpages.patch
rename to debian/patches/Fix-manpages-section-name-and-spellfixes-so-that-lintian-.patch
index f1021a6..430435c 100644
--- a/debian/patches/fix_manpages.patch
+++ b/debian/patches/Fix-manpages-section-name-and-spellfixes-so-that-lintian-.patch
@@ -1,6 +1,32 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Fix manpages (section, name, and spellfixes) so that lintian
- does not complain
+From: Ole Streicher <debian at liska.ath.cx>
+Date: Sat, 15 Oct 2016 14:49:02 +0200
+Subject: Fix manpages (section, name,
+ and spellfixes) so that lintian does not complain
+
+---
+ man/man1/xpachanges.1 | 6 +++---
+ man/man3/xpaaccess.3 | 3 +--
+ man/man3/xpamacros.3 | 2 +-
+ man/man3/xparace.3 | 2 +-
+ man/mann/xpa.n | 24 ++++++++++++------------
+ man/mann/xpaacl.n | 4 ++--
+ man/mann/xpacode.n | 4 ++--
+ man/mann/xpacommon.n | 4 ++--
+ man/mann/xpaconvert.n | 4 ++--
+ man/mann/xpaenv.n | 13 ++-----------
+ man/mann/xpainet.n | 4 ++--
+ man/mann/xpaintro.n | 4 ++--
+ man/mann/xpamethod.n | 4 ++--
+ man/mann/xpaname.n | 4 ++--
+ man/mann/xpaoom.n | 4 ++--
+ man/mann/xpatcl.n | 4 ++--
+ man/mann/xpatemplate.n | 4 ++--
+ man/mann/xpausers.n | 4 ++--
+ man/mann/xpaxt.n | 4 ++--
+ 19 files changed, 46 insertions(+), 56 deletions(-)
+
+diff --git a/man/man1/xpachanges.1 b/man/man1/xpachanges.1
+index f910bbe..1232e0a 100644
--- a/man/man1/xpachanges.1
+++ b/man/man1/xpachanges.1
@@ -123,14 +123,14 @@
@@ -21,6 +47,8 @@ Description: Fix manpages (section, name, and spellfixes) so that lintian
.SH "SYNOPSIS"
.IX Header "SYNOPSIS"
This document describes changes that will affect users who migrate
+diff --git a/man/man3/xpaaccess.3 b/man/man3/xpaaccess.3
+index a7e25e8..5c22716 100644
--- a/man/man3/xpaaccess.3
+++ b/man/man3/xpaaccess.3
@@ -130,8 +130,7 @@
@@ -33,6 +61,8 @@ Description: Fix manpages (section, name, and spellfixes) so that lintian
.SH "SYNOPSIS"
.IX Header "SYNOPSIS"
.Vb 1
+diff --git a/man/man3/xpamacros.3 b/man/man3/xpamacros.3
+index c9a6ab5..6089ba8 100644
--- a/man/man3/xpamacros.3
+++ b/man/man3/xpamacros.3
@@ -130,7 +130,7 @@
@@ -44,6 +74,8 @@ Description: Fix manpages (section, name, and spellfixes) so that lintian
.SH "SYNOPSIS"
.IX Header "SYNOPSIS"
.Vb 1
+diff --git a/man/man3/xparace.3 b/man/man3/xparace.3
+index 6100196..716af78 100644
--- a/man/man3/xparace.3
+++ b/man/man3/xparace.3
@@ -130,7 +130,7 @@
@@ -55,6 +87,8 @@ Description: Fix manpages (section, name, and spellfixes) so that lintian
.SH "SYNOPSIS"
.IX Header "SYNOPSIS"
Potential \s-1XPA\s0 race conditions and how to avoid them.
+diff --git a/man/mann/xpa.n b/man/mann/xpa.n
+index 189a601..aa340ce 100644
--- a/man/mann/xpa.n
+++ b/man/mann/xpa.n
@@ -123,8 +123,8 @@
@@ -68,7 +102,7 @@ Description: Fix manpages (section, name, and spellfixes) so that lintian
.\" 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 @@
+@@ -169,22 +169,22 @@ the command line via a suite of high-level programs.
Choose from the following topics:
.IP "\(bu" 4
Introduction to \s-1XPA\s0
@@ -97,7 +131,7 @@ Description: Fix manpages (section, name, and spellfixes) so that lintian
.IP "\(bu" 4
\&\s-1XPA\s0 User Programs
.RS 4
-@@ -283,10 +283,10 @@
+@@ -283,10 +283,10 @@ XPAAccess: get access info
[\fIxpaaccess\fR\|(3)]
.IP "\(bu" 4
The XPA/Xt Interface: Xt interface to \s-1XPA\s0
@@ -110,7 +144,7 @@ Description: Fix manpages (section, name, and spellfixes) so that lintian
.RE
.RS 4
.RE
-@@ -295,10 +295,10 @@
+@@ -295,10 +295,10 @@ Tailoring the \s-1XPA\s0 Environment
.RS 4
.IP "\(bu" 4
Environment Variables
@@ -123,6 +157,8 @@ Description: Fix manpages (section, name, and spellfixes) so that lintian
.RE
.RS 4
.RE
+diff --git a/man/mann/xpaacl.n b/man/mann/xpaacl.n
+index d339c5d..0765938 100644
--- a/man/mann/xpaacl.n
+++ b/man/mann/xpaacl.n
@@ -123,8 +123,8 @@
@@ -136,6 +172,8 @@ Description: Fix manpages (section, name, and spellfixes) so that lintian
.\" 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/man/mann/xpacode.n b/man/mann/xpacode.n
+index b13c7ae..5e24d84 100644
--- a/man/mann/xpacode.n
+++ b/man/mann/xpacode.n
@@ -123,8 +123,8 @@
@@ -149,6 +187,8 @@ Description: Fix manpages (section, name, and spellfixes) so that lintian
.\" 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/man/mann/xpacommon.n b/man/mann/xpacommon.n
+index 1a456ed..5d23cb5 100644
--- a/man/mann/xpacommon.n
+++ b/man/mann/xpacommon.n
@@ -123,8 +123,8 @@
@@ -162,6 +202,8 @@ Description: Fix manpages (section, name, and spellfixes) so that lintian
.\" 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/man/mann/xpaconvert.n b/man/mann/xpaconvert.n
+index 035ef0b..498fd74 100644
--- a/man/mann/xpaconvert.n
+++ b/man/mann/xpaconvert.n
@@ -123,8 +123,8 @@
@@ -175,6 +217,8 @@ Description: Fix manpages (section, name, and spellfixes) so that lintian
.\" 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/man/mann/xpaenv.n b/man/mann/xpaenv.n
+index ead081c..65456ad 100644
--- a/man/mann/xpaenv.n
+++ b/man/mann/xpaenv.n
@@ -123,8 +123,8 @@
@@ -188,7 +232,7 @@ Description: Fix manpages (section, name, and spellfixes) so that lintian
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
-@@ -471,12 +471,3 @@
+@@ -471,12 +471,3 @@ protocol changes.
.SH "SEE ALSO"
.IX Header "SEE ALSO"
See xpa(n) for a list of \s-1XPA\s0 help pages
@@ -201,6 +245,8 @@ Description: Fix manpages (section, name, and spellfixes) so that lintian
-.IP "Around line 509:" 4
-.IX Item "Around line 509:"
-You forgot a '=back' before '=head1'
+diff --git a/man/mann/xpainet.n b/man/mann/xpainet.n
+index 4847654..92370f3 100644
--- a/man/mann/xpainet.n
+++ b/man/mann/xpainet.n
@@ -123,8 +123,8 @@
@@ -214,6 +260,8 @@ Description: Fix manpages (section, name, and spellfixes) so that lintian
.\" 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/man/mann/xpaintro.n b/man/mann/xpaintro.n
+index 2978e6b..100bc57 100644
--- a/man/mann/xpaintro.n
+++ b/man/mann/xpaintro.n
@@ -123,8 +123,8 @@
@@ -227,6 +275,8 @@ Description: Fix manpages (section, name, and spellfixes) so that lintian
.\" 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/man/mann/xpamethod.n b/man/mann/xpamethod.n
+index faecd86..47f5380 100644
--- a/man/mann/xpamethod.n
+++ b/man/mann/xpamethod.n
@@ -123,8 +123,8 @@
@@ -240,6 +290,8 @@ Description: Fix manpages (section, name, and spellfixes) so that lintian
.\" 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/man/mann/xpaname.n b/man/mann/xpaname.n
+index cdb6839..ab8b07c 100644
--- a/man/mann/xpaname.n
+++ b/man/mann/xpaname.n
@@ -123,8 +123,8 @@
@@ -253,6 +305,8 @@ Description: Fix manpages (section, name, and spellfixes) so that lintian
.\" 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/man/mann/xpaoom.n b/man/mann/xpaoom.n
+index 9dfdc3f..aba3039 100644
--- a/man/mann/xpaoom.n
+++ b/man/mann/xpaoom.n
@@ -123,8 +123,8 @@
@@ -266,6 +320,8 @@ Description: Fix manpages (section, name, and spellfixes) so that lintian
.\" 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/man/mann/xpatcl.n b/man/mann/xpatcl.n
+index 9156d5e..b9de257 100644
--- a/man/mann/xpatcl.n
+++ b/man/mann/xpatcl.n
@@ -123,8 +123,8 @@
@@ -279,6 +335,8 @@ Description: Fix manpages (section, name, and spellfixes) so that lintian
.\" 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/man/mann/xpatemplate.n b/man/mann/xpatemplate.n
+index f8fc55a..c6887cd 100644
--- a/man/mann/xpatemplate.n
+++ b/man/mann/xpatemplate.n
@@ -123,8 +123,8 @@
@@ -292,6 +350,8 @@ Description: Fix manpages (section, name, and spellfixes) so that lintian
.\" 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/man/mann/xpausers.n b/man/mann/xpausers.n
+index 2823e3d..567d343 100644
--- a/man/mann/xpausers.n
+++ b/man/mann/xpausers.n
@@ -123,8 +123,8 @@
@@ -305,6 +365,8 @@ Description: Fix manpages (section, name, and spellfixes) so that lintian
.\" 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/man/mann/xpaxt.n b/man/mann/xpaxt.n
+index 8885dd4..c661c84 100644
--- a/man/mann/xpaxt.n
+++ b/man/mann/xpaxt.n
@@ -123,8 +123,8 @@
diff --git a/debian/patches/fix_paths.patch b/debian/patches/Fix-the-paths-for-a-chroot-build-and-for-FHS.patch
similarity index 77%
rename from debian/patches/fix_paths.patch
rename to debian/patches/Fix-the-paths-for-a-chroot-build-and-for-FHS.patch
index 828bf85..22a665e 100644
--- a/debian/patches/fix_paths.patch
+++ b/debian/patches/Fix-the-paths-for-a-chroot-build-and-for-FHS.patch
@@ -1,8 +1,16 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Fix the paths for a chroot build and for FHS
+From: Ole Streicher <debian at liska.ath.cx>
+Date: Sat, 15 Oct 2016 14:49:02 +0200
+Subject: Fix the paths for a chroot build and for FHS
+
+---
+ Makefile.in | 24 +++++++++++++++++-------
+ 1 file changed, 17 insertions(+), 7 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 059c478..7c8f784 100644
--- a/Makefile.in
+++ b/Makefile.in
-@@ -34,10 +34,10 @@
+@@ -34,10 +34,10 @@ exec_prefix = @exec_prefix@
# to be different than those used for actually reference files at
# run-time. INSTALL_ROOT is prepended to $prefix and $exec_prefix
# when installing files.
@@ -15,7 +23,7 @@ Description: Fix the paths for a chroot build and for FHS
# Directory in which to install the program wish:
BIN_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/bin
-@@ -46,7 +46,7 @@
+@@ -46,7 +46,7 @@ BIN_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/bin
INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include
# Top-level directory for manual entries:
@@ -24,7 +32,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
-@@ -275,7 +275,7 @@
+@@ -275,7 +275,7 @@ install-binaries: $(LIB) $(PROGS)
do \
if [ ! -d $$i ] ; then \
echo "Making directory $$i"; \
@@ -33,7 +41,7 @@ Description: Fix the paths for a chroot build and for FHS
chmod 755 $$i; \
else true; \
fi; \
-@@ -297,14 +297,22 @@
+@@ -297,14 +297,22 @@ install-binaries: $(LIB) $(PROGS)
install-man:
@if [ ! -d $(MAN_INSTALL_DIR) ] ; then \
echo "Making directory $(MAN_INSTALL_DIR)"; \
@@ -59,7 +67,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"; \
-@@ -314,6 +322,8 @@
+@@ -314,6 +322,8 @@ install-man:
fi; \
echo "Installing $$B" ; \
$(INSTALL_DATA) $$i $$M/$$B; \
diff --git a/debian/patches/install_tclxpa.patch b/debian/patches/Install-the-tcl-interface-to-usr-lib-tcltk-xpa-according-.patch
similarity index 79%
rename from debian/patches/install_tclxpa.patch
rename to debian/patches/Install-the-tcl-interface-to-usr-lib-tcltk-xpa-according-.patch
index e89b259..c771ae8 100644
--- a/debian/patches/install_tclxpa.patch
+++ b/debian/patches/Install-the-tcl-interface-to-usr-lib-tcltk-xpa-according-.patch
@@ -1,9 +1,18 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Install the tcl interface to /usr/lib/tcltk/xpa according to
- Debians policy. Also use Tcl stubs.
+From: Ole Streicher <debian at liska.ath.cx>
+Date: Sat, 15 Oct 2016 14:49:02 +0200
+Subject: Install the tcl interface to /usr/lib/tcltk/xpa according to Debians
+ policy.
+
+Also use Tcl stubs.
+---
+ Makefile.in | 35 +++++++++++++++++++++++------------
+ 1 file changed, 23 insertions(+), 12 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 7c8f784..627acb4 100644
--- a/Makefile.in
+++ b/Makefile.in
-@@ -38,6 +38,7 @@
+@@ -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/${DEB_HOST_MULTIARCH}
@@ -11,7 +20,7 @@ Description: Install the tcl interface to /usr/lib/tcltk/xpa according to
# Directory in which to install the program wish:
BIN_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/bin
-@@ -142,7 +143,7 @@
+@@ -142,7 +143,7 @@ GTK_OBJS = gtkloop.o
INCL = xpa.h xpap.h
# these are all the modules going into the "normal" xpa library
@@ -20,7 +29,7 @@ Description: Install the tcl interface to /usr/lib/tcltk/xpa according to
LIB = libxpa.a
# used in link line
-@@ -169,6 +170,8 @@
+@@ -169,6 +170,8 @@ install:: install-share
install:: install-data
@@ -29,7 +38,7 @@ Description: Install the tcl interface to /usr/lib/tcltk/xpa according to
lib: $(LIB) $(DOSHARED)
$(LIB): $(LIBOBJS)
-@@ -192,14 +195,17 @@
+@@ -192,14 +195,17 @@ mingw-dll: $(LIBOBJS)
-Wl,--output-def,libxpa.def,--out-implib,libxpa_dll.a,-no-undefined,--enable-runtime-pseudo-reloc -o libxpa.dll \
-lwsock32
@@ -55,7 +64,7 @@ Description: Install the tcl interface to /usr/lib/tcltk/xpa according to
diff:
-(for f in `ls *.c`; \
-@@ -258,7 +264,7 @@
+@@ -258,7 +264,7 @@ smoke: ctest stest
_install:
shlib_install:
@@ -64,7 +73,7 @@ Description: Install the tcl interface to /usr/lib/tcltk/xpa according to
do \
if [ -h $$i ] ; then \
echo "Installing link $$i" ; \
-@@ -270,6 +276,11 @@
+@@ -270,6 +276,11 @@ shlib_install:
fi; \
done;)
@@ -76,7 +85,7 @@ Description: Install the tcl interface to /usr/lib/tcltk/xpa according to
install-binaries: $(LIB) $(PROGS)
@for i in $(LIB_INSTALL_DIR) $(INCLUDE_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \
do \
-@@ -397,10 +408,10 @@
+@@ -397,10 +408,10 @@ port.o: port.c $(INCL)
$(CC) -c $(CC_SWITCHES) port.c
tcl.o: tcl.c $(INCL)
diff --git a/debian/patches/sort_o_files b/debian/patches/Sort-.o-files.patch
similarity index 63%
rename from debian/patches/sort_o_files
rename to debian/patches/Sort-.o-files.patch
index 27ff37b..5d0b931 100644
--- a/debian/patches/sort_o_files
+++ b/debian/patches/Sort-.o-files.patch
@@ -1,10 +1,17 @@
-Description: Sort *.o files
- Build libs with fixed order *.o files, to ger reproducible build.
-Author: Alexis Bienvenüe <pado at passoire.fr>
+From: =?utf-8?q?Alexis_Bienven=C3=BCe?= <pado at passoire.fr>
+Date: Sat, 15 Oct 2016 14:49:02 +0200
+Subject: Sort *.o files
+Build libs with fixed order *.o files, to ger reproducible build.
+---
+ Makefile.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 1f5c83d..a205662 100644
--- a/Makefile.in
+++ b/Makefile.in
-@@ -185,7 +185,7 @@
+@@ -185,7 +185,7 @@ shlib: $(LIB)
rm -f lib$(PACKAGE).tmp/xt*.o; \
rm -f lib$(PACKAGE).tmp/tcl*.o; \
CC='$(CC)' CXX=$(CXX) \
@@ -13,7 +20,7 @@ Author: Alexis Bienvenüe <pado at passoire.fr>
rm -rf lib$(PACKAGE).tmp)
mingw-dll: $(LIBOBJS)
-@@ -204,7 +204,7 @@
+@@ -204,7 +204,7 @@ shtclxpa: tclxpa
@(rm -rf $(PACKAGE)tmp; mkdir $(PACKAGE)tmp; \
(cd $(PACKAGE)tmp && ar x ../libtclxpa.a); \
CC='$(CC)' CXX='$(CXX)' \
diff --git a/debian/patches/series b/debian/patches/series
index 2bb01ea..c473c22 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,6 @@
-fix_paths.patch
-fix_manpages.patch
-fix_AC_DEFINE.patch
-install_tclxpa.patch
-hardening.patch
-sort_o_files
+Fix-the-paths-for-a-chroot-build-and-for-FHS.patch
+Fix-manpages-section-name-and-spellfixes-so-that-lintian-.patch
+Add-a-description-to-AC_DEFINEs.patch
+Install-the-tcl-interface-to-usr-lib-tcltk-xpa-according-.patch
+Add-hardening-flags.patch
+Sort-.o-files.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/xpa.git
More information about the Debian-astro-commits
mailing list