[Pkg-corba-commits] r308 - in /trunk/omniorb/debian/patches: klotz private_pythondir set_ipv6_v6only_to_0

[tgg at users.alioth.debian.org]

Author: tgg
Date: Fri Oct 10 14:58:33 2014
New Revision: 308

URL: http://svn.debian.org/wsvn/pkg-corba/?sc=1&rev=308
Log:
refresh some patches

Removed:
    trunk/omniorb/debian/patches/klotz
Modified:
    trunk/omniorb/debian/patches/private_pythondir
    trunk/omniorb/debian/patches/set_ipv6_v6only_to_0

Modified: trunk/omniorb/debian/patches/private_pythondir
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb/debian/patches/private_pythondir?rev=308&op=diff
==============================================================================
--- trunk/omniorb/debian/patches/private_pythondir	(original)
+++ trunk/omniorb/debian/patches/private_pythondir	Fri Oct 10 14:58:33 2014
@@ -21,7 +21,7 @@
  #############################################################################
 --- a/src/tool/omniidl/python/scripts/omniidl.in
 +++ b/src/tool/omniidl/python/scripts/omniidl.in
-@@ -44,8 +44,8 @@
+@@ -45,8 +45,8 @@
  pylibdir   = archlibdir = None
  binarchdir = os.path.abspath(os.path.dirname(sys.argv[0]))
  
@@ -32,7 +32,7 @@
  
  if os.path.isdir(sppath):
      sys.path.append(sppath)
-@@ -93,32 +93,6 @@
+@@ -94,20 +94,6 @@
          if os.path.isdir(archlibdir):
              sys.path.insert(0, archlibdir)
  
@@ -44,24 +44,12 @@
 -          "@pyexecdir@" ]
 -
 -
--# Implement a string replace function for all Python versions. We
--# can't use the version in idlstring.py, since we're trying to work
--# out the path to find modules including that one.
--
--import string
--try:
--    replace = string.replace
--
--except NameError:
--    def replace(s, old, new):
--        return s.replace(old, new)
--
--
 -# Autoconf insists on making our life difficult...
 -for path in paths:
--    path = replace(path, "${exec_prefix}", "@exec_prefix@")
--    path = replace(path, "${prefix}", "@prefix@")
+-    path = path.replace("${exec_prefix}", "@exec_prefix@")
+-    path = path.replace("${prefix}", "@prefix@")
 -    sys.path.append(path)
- 
+-
  try:
      import _omniidl
+ except ImportError, msg:

Modified: trunk/omniorb/debian/patches/set_ipv6_v6only_to_0
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb/debian/patches/set_ipv6_v6only_to_0?rev=308&op=diff
==============================================================================
--- trunk/omniorb/debian/patches/set_ipv6_v6only_to_0	(original)
+++ trunk/omniorb/debian/patches/set_ipv6_v6only_to_0	Fri Oct 10 14:58:33 2014
@@ -7,9 +7,9 @@
 Bug-Debian: http://bugs.debian.org/624099
 Author: Upstream
 
---- a/include/omniORB4/internal/SocketCollection.h
-+++ b/include/omniORB4/internal/SocketCollection.h
-@@ -161,7 +161,6 @@
+--- a/include/omniORB4/internal/tcpSocket.h
++++ b/include/omniORB4/internal/tcpSocket.h
+@@ -46,7 +46,6 @@
  
  #define SOCKNAME_SIZE_T OMNI_SOCKNAME_SIZE_T
  #define USE_NONBLOCKING_CONNECT