update patches for new release

diff --git a/debian/patches/hurd_fixes b/debian/patches/hurd_fixes
index c41b84bb1538867597119d5a5be9ca65e949286f..4486d4d749aa97fa996146bc4862a25eb6f5cfb5 100644 (file)
--- a/debian/patches/hurd_fixes
+++ b/debian/patches/hurd_fixes
@@ -9,7 +9,7 @@ Author: Aaron M. Ucko <ucko@debian.org>
 Last-Update: 2011-06-10
 --- a/c++/src/build-system/configure
 +++ b/c++/src/build-system/configure
-@@ -5688,7 +5688,7 @@
+@@ -5817,7 +5817,7 @@
      solaris* )
        CONF_f_runpath="-R"
        ;;
@@ -20,7 +20,7 @@ Last-Update: 2011-06-10
      linux*:ICC )
 --- a/c++/src/build-system/configure.ac
 +++ b/c++/src/build-system/configure.ac
-@@ -1496,7 +1496,7 @@
+@@ -1535,7 +1535,7 @@
      solaris* )
        CONF_f_runpath="-R"
        ;;
@@ -31,14 +31,14 @@ Last-Update: 2011-06-10
      linux*:ICC )
 --- a/c++/src/connect/ncbi_socket_cxx.cpp
 +++ b/c++/src/connect/ncbi_socket_cxx.cpp
-@@ -34,7 +34,7 @@
- #include <ncbi_pch.hpp>
+@@ -35,7 +35,7 @@
+ #include "ncbi_assert.h"                // no _ASSERT()s, keep clean from xncbi
  #include <connect/ncbi_socket_unix.hpp>
  #include <limits.h>                     // for PATH_MAX
--#if defined(NCBI_OS_MSWIN) && !defined(PATH_MAX)
+-#if defined(NCBI_OS_MSWIN)  &&  !defined(PATH_MAX)
 +#ifndef PATH_MAX
  #  define PATH_MAX 512                  // will actually use less than 32 chars
- #endif
+ #endif // NCBI_OS_MSWIN && !PATH_MAX
  
 --- a/c++/src/connect/ext/ncbi_localnet.c
 +++ b/c++/src/connect/ext/ncbi_localnet.c

diff --git a/debian/patches/no_multiarch_rpath b/debian/patches/no_multiarch_rpath
index 2d5399c5264e93c6e5743a7defc585b0570c87c7..6bf56aab042d2ec8c2de05d7069496396148e9e8 100644 (file)
--- a/debian/patches/no_multiarch_rpath
+++ b/debian/patches/no_multiarch_rpath
@@ -10,7 +10,7 @@ Author: Aaron M. Ucko <ucko@debian.org>
 Last-Update: 2011-08-28
 --- a/c++/src/build-system/configure
 +++ b/c++/src/build-system/configure
-@@ -5751,7 +5751,7 @@
+@@ -5880,7 +5880,7 @@
                 break
                 ;;
              /* )
@@ -21,7 +21,7 @@ Last-Update: 2011-08-28
          esac
 --- a/c++/src/build-system/configure.ac
 +++ b/c++/src/build-system/configure.ac
-@@ -1558,7 +1558,7 @@
+@@ -1597,7 +1597,7 @@
                 break
                 ;;
              /* )