[Debian-astro-commits] [xpa] 03/04: Rediff patches

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 1a0db38c4a4b32e0f77fcc98d43bc53647f3ef03
Author: Ole Streicher <olebole at debian.org>
Date:   Sat Oct 15 14:51:26 2016 +0200

    Rediff patches
---
 debian/patches/Add-a-description-to-AC_DEFINEs.patch         | 12 ++++++------
 debian/patches/Add-hardening-flags.patch                     |  2 +-
 .../Fix-the-paths-for-a-chroot-build-and-for-FHS.patch       |  2 +-
 ...l-the-tcl-interface-to-usr-lib-tcltk-xpa-according-.patch |  4 ++--
 debian/patches/Sort-.o-files.patch                           |  2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/debian/patches/Add-a-description-to-AC_DEFINEs.patch b/debian/patches/Add-a-description-to-AC_DEFINEs.patch
index 72229f4..88594ac 100644
--- a/debian/patches/Add-a-description-to-AC_DEFINEs.patch
+++ b/debian/patches/Add-a-description-to-AC_DEFINEs.patch
@@ -8,10 +8,10 @@ This is needed for modern autoheader call.
  1 file changed, 8 insertions(+), 8 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index d97360e..fcd1af9 100644
+index fb5aeb2..db97489 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -65,8 +65,8 @@ if test "$fun_ok" = "yes"; then
+@@ -66,8 +66,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
@@ -22,7 +22,7 @@ index d97360e..fcd1af9 100644
      TLIB="-lpthread"
    else
      AC_MSG_ERROR([no threads found ... can't use enable-threaded-xpans], 1)
-@@ -106,7 +106,7 @@ fi
+@@ -107,7 +107,7 @@ fi
  
  AC_PATH_XTRA
  if test x"${have_x}" = "xyes"; then
@@ -31,7 +31,7 @@ index d97360e..fcd1af9 100644
  fi
  
  SC_PATH_TCLCONFIG
-@@ -122,12 +122,12 @@ if test x"${no_tcl}" = x ; then
+@@ -123,12 +123,12 @@ if test x"${no_tcl}" = x ; then
          TCL_LIBS="$TCL_LIB_SPEC"
          AC_MSG_RESULT([Tcl support will utilize library: $TCL_LIBS])
        fi
@@ -46,7 +46,7 @@ index d97360e..fcd1af9 100644
          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 @@ if test x"$havelib" = x1 ; then
+@@ -155,7 +155,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`"
@@ -55,7 +55,7 @@ index d97360e..fcd1af9 100644
  else
    GTK_CFLAGS=""
    GTK_LIBS=""
-@@ -169,13 +169,13 @@ LDFLAGS="$LDFLAGS $XLDFLAGS"
+@@ -170,13 +170,13 @@ LDFLAGS="$LDFLAGS $XLDFLAGS"
  AC_MSG_CHECKING([$host_os configuration])
  case $host_os in
      *cygwin*|*Cygwin* )
diff --git a/debian/patches/Add-hardening-flags.patch b/debian/patches/Add-hardening-flags.patch
index 841432d..00109da 100644
--- a/debian/patches/Add-hardening-flags.patch
+++ b/debian/patches/Add-hardening-flags.patch
@@ -7,7 +7,7 @@ Subject: Add hardening flags
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/Makefile.in b/Makefile.in
-index 627acb4..1f5c83d 100644
+index ebc2abf..edcb82c 100644
 --- a/Makefile.in
 +++ b/Makefile.in
 @@ -122,7 +122,7 @@ RM =		rm -f
diff --git a/debian/patches/Fix-the-paths-for-a-chroot-build-and-for-FHS.patch b/debian/patches/Fix-the-paths-for-a-chroot-build-and-for-FHS.patch
index 22a665e..8076a29 100644
--- a/debian/patches/Fix-the-paths-for-a-chroot-build-and-for-FHS.patch
+++ b/debian/patches/Fix-the-paths-for-a-chroot-build-and-for-FHS.patch
@@ -7,7 +7,7 @@ Subject: Fix the paths for a chroot build and for FHS
  1 file changed, 17 insertions(+), 7 deletions(-)
 
 diff --git a/Makefile.in b/Makefile.in
-index 059c478..7c8f784 100644
+index 79c5fd9..59fe47b 100644
 --- a/Makefile.in
 +++ b/Makefile.in
 @@ -34,10 +34,10 @@ exec_prefix =		@exec_prefix@
diff --git a/debian/patches/Install-the-tcl-interface-to-usr-lib-tcltk-xpa-according-.patch b/debian/patches/Install-the-tcl-interface-to-usr-lib-tcltk-xpa-according-.patch
index c771ae8..6fb1039 100644
--- a/debian/patches/Install-the-tcl-interface-to-usr-lib-tcltk-xpa-according-.patch
+++ b/debian/patches/Install-the-tcl-interface-to-usr-lib-tcltk-xpa-according-.patch
@@ -9,7 +9,7 @@ Also use Tcl stubs.
  1 file changed, 23 insertions(+), 12 deletions(-)
 
 diff --git a/Makefile.in b/Makefile.in
-index 7c8f784..627acb4 100644
+index 59fe47b..ebc2abf 100644
 --- a/Makefile.in
 +++ b/Makefile.in
 @@ -38,6 +38,7 @@ INSTALL_ROOT = $(DESTDIR)
@@ -85,7 +85,7 @@ index 7c8f784..627acb4 100644
  install-binaries: $(LIB) $(PROGS)
  	@for i in $(LIB_INSTALL_DIR) $(INCLUDE_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \
  	    do \
-@@ -397,10 +408,10 @@ port.o:		port.c $(INCL)
+@@ -398,10 +409,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.patch b/debian/patches/Sort-.o-files.patch
index 5d0b931..709fa77 100644
--- a/debian/patches/Sort-.o-files.patch
+++ b/debian/patches/Sort-.o-files.patch
@@ -8,7 +8,7 @@ Build libs with fixed order *.o files, to ger reproducible build.
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/Makefile.in b/Makefile.in
-index 1f5c83d..a205662 100644
+index edcb82c..edb1a91 100644
 --- a/Makefile.in
 +++ b/Makefile.in
 @@ -185,7 +185,7 @@ shlib:		$(LIB)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/xpa.git

