[Pkg-corba-commits] r258 - /trunk/omniorb/debian/patches/private_pythondir

[flub-guest at users.alioth.debian.org]

Author: flub-guest
Date: Tue Apr  5 00:36:15 2011
New Revision: 258

URL: http://svn.debian.org/wsvn/pkg-corba/?sc=1&rev=258
Log:
Don't remove all the sys.path mangling code which deals with the
build tree locations.  That rather obviously breaks the build.

Since the install location is appended and the in-tree location is
prepended there is no need to build-conflict with omniidl itself.

Modified:
    trunk/omniorb/debian/patches/private_pythondir

Modified: trunk/omniorb/debian/patches/private_pythondir
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb/debian/patches/private_pythondir?rev=258&op=diff
==============================================================================
--- trunk/omniorb/debian/patches/private_pythondir (original)
+++ trunk/omniorb/debian/patches/private_pythondir Tue Apr  5 00:36:15 2011
@@ -13,62 +13,21 @@
  #############################################################################
 --- a/src/tool/omniidl/python/scripts/omniidl.in
 +++ b/src/tool/omniidl/python/scripts/omniidl.in
-@@ -41,65 +41,9 @@
+@@ -44,8 +44,8 @@
+ pylibdir   = archlibdir = None
+ binarchdir = os.path.abspath(os.path.dirname(sys.argv[0]))
  
- import os, os.path
- 
--pylibdir   = archlibdir = None
--binarchdir = os.path.abspath(os.path.dirname(sys.argv[0]))
--
 -# Try a path based on the installation prefix
 -sppath = "@prefix@/lib/python" + sys.version[:3] + "/site-packages"
--
--if os.path.isdir(sppath):
--    sys.path.append(sppath)
--
--# Paths in a traditional omni tree
--if binarchdir != "":
--    sys.path.insert(0, binarchdir)
--    bindir, archname = os.path.split(binarchdir)
--    treedir, bin     = os.path.split(bindir)
--    if bin == "bin":
--        pylibdir    = os.path.join(treedir, "lib", "python")
--        vpylibdir   = pylibdir + sys.version[:3] + "/site-packages"
--        vpylib64dir = (os.path.join(treedir, "lib64", "python") +
--                       sys.version[:3] + "/site-packages")
--        archlibdir  = os.path.join(treedir, "lib", archname)
--
--        if os.path.isdir(pylibdir):
--            sys.path.insert(0, pylibdir)
--
--        if os.path.isdir(vpylib64dir):
--            sys.path.insert(0, vpylib64dir)
--
--        if os.path.isdir(vpylibdir):
--            sys.path.insert(0, vpylibdir)
--
--        if os.path.isdir(archlibdir):
--            sys.path.insert(0, archlibdir)
--
--    elif archname == "bin":
--        pylibdir    = os.path.join(bindir, "lib", "python")
--        vpylibdir   = pylibdir + sys.version[:3] + "/site-packages"
--        vpylib64dir = (os.path.join(bindir, "lib64", "python") +
--                       sys.version[:3] + "/site-packages")
--        archlibdir  = os.path.join(bindir, "lib")
--
--        if os.path.isdir(pylibdir):
--            sys.path.insert(0, pylibdir)
--
--        if os.path.isdir(vpylib64dir):
--            sys.path.insert(0, vpylib64dir)
--
--        if os.path.isdir(vpylibdir):
--            sys.path.insert(0, vpylibdir)
--
--        if os.path.isdir(archlibdir):
--            sys.path.insert(0, archlibdir)
--
++# Try a path based on the installation prefix, customised for Debian
++sppath = "@prefix@/lib/omniidl"
+ 
+ if os.path.isdir(sppath):
+     sys.path.append(sppath)
+@@ -93,32 +93,6 @@
+         if os.path.isdir(archlibdir):
+             sys.path.insert(0, archlibdir)
+ 
 -# Last chance, try a path based on the installation prefixes
 -sys.path.append("@prefix@/lib/python" + sys.version[:3] + "/site-packages")
 -
@@ -76,22 +35,25 @@
 -          "@pythondir@",
 -          "@pyexecdir@" ]
 -
-+# Set path for Debian's installation
-+pylibdir = '/usr/lib/omniidl'
-+sys.path.append(pylibdir)
- 
- # Implement a string replace function for all Python versions. We
- # can't use the version in idlstring.py, since we're trying to work
-@@ -114,12 +58,6 @@
-         return s.replace(old, new)
- 
- 
+-
+-# 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@")
 -    sys.path.append(path)
--
+ 
  try:
      import _omniidl
- except ImportError, msg: