[Pkg-corba-commits] r235 - in /trunk/omniorb/debian: changelog control omniidl.install patches/private_pythondir patches/series patches/spurious_hashbang rules
flub-guest at users.alioth.debian.org
flub-guest at users.alioth.debian.org
Tue Mar 22 00:04:23 UTC 2011
Author: flub-guest
Date: Tue Mar 22 00:04:12 2011
New Revision: 235
URL: http://svn.debian.org/wsvn/pkg-corba/?sc=1&rev=235
Log:
Switch to dh_python2
By installing the omniidl modules to the private location
/usr/lib/omniidl dh_python2 knows that only the current python needs
to be supported and creates a suitable python .rtupdate script to
support python upgrades. This no longer needs X[SB]-Python-Version
strings in debian/control either.
Added:
trunk/omniorb/debian/patches/private_pythondir
trunk/omniorb/debian/patches/spurious_hashbang
Modified:
trunk/omniorb/debian/changelog
trunk/omniorb/debian/control
trunk/omniorb/debian/omniidl.install
trunk/omniorb/debian/patches/series
trunk/omniorb/debian/rules
Modified: trunk/omniorb/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb/debian/changelog?rev=235&op=diff
==============================================================================
--- trunk/omniorb/debian/changelog (original)
+++ trunk/omniorb/debian/changelog Tue Mar 22 00:04:12 2011
@@ -9,6 +9,14 @@
* Add $remote_fs to Required-{Start|Stop} in nameserver initscript.
* debian/omniorb-doc.doc-base: add PDF documentation.
* Use bzip2 instead of gzip for .orig tarball.
+ * Switch from dh_pycentral to dh_python2:
+ - Drop python-central build-depends, version python-dev.
+ - Place omniidl python modules into /usr/lib/omniidl.
+ - Patch omniidl binary to put /usr/lib/omniidl on sys.path.
+ - Drop XS-Python-Version and XB-Python-Version from debian/rules.
+ - Update debian/omniidl.install for new location.
+ * Strip spurious #!-line in omniidl/main.py module with a patch
+ instead of using sed -d in debian/rules.
[ Thomas Girard ]
* Simplify build process: we no longer need to force CC and CXX.
Modified: trunk/omniorb/debian/control
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb/debian/control?rev=235&op=diff
==============================================================================
--- trunk/omniorb/debian/control (original)
+++ trunk/omniorb/debian/control Tue Mar 22 00:04:12 2011
@@ -3,8 +3,7 @@
Priority: optional
Maintainer: Debian CORBA Team <pkg-corba-devel at lists.alioth.debian.org>
Uploaders: Floris Bruynooghe <floris.bruynooghe at gmail.com>, Thomas Girard <thomas.g.girard at free.fr>
-Build-Depends: debhelper (>= 6.0.0), python-dev, libssl-dev, autotools-dev, python-central (>= 0.5.6)
-XS-Python-Version: current
+Build-Depends: debhelper (>= 6.0.0), python-dev (>= 2.6.6-3~), libssl-dev, autotools-dev
Standards-Version: 3.9.1.0
Vcs-Svn: svn://svn.debian.org/svn/pkg-corba/trunk/omniorb
Vcs-Browser: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb
@@ -194,7 +193,6 @@
Suggests: omniidl-python
Conflicts: omniidl4 (<< 4.1.3-1)
Replaces: omniidl4 (<< 4.1.3-1)
-XB-Python-Version: ${python:Versions}
Description: omniORB IDL to C++ and Python compiler
omniORB4 is a freely available Common Object Request Broker
Architecture (CORBA) 2.6 compliant object request broker (ORB)
Modified: trunk/omniorb/debian/omniidl.install
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb/debian/omniidl.install?rev=235&op=diff
==============================================================================
--- trunk/omniorb/debian/omniidl.install (original)
+++ trunk/omniorb/debian/omniidl.install Tue Mar 22 00:04:12 2011
@@ -1,3 +1,3 @@
usr/bin/omnicpp
usr/bin/omniidl
-usr/lib/python*.*/
+usr/lib/omniidl/
Added: trunk/omniorb/debian/patches/private_pythondir
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb/debian/patches/private_pythondir?rev=235&op=file
==============================================================================
--- trunk/omniorb/debian/patches/private_pythondir (added)
+++ trunk/omniorb/debian/patches/private_pythondir Tue Mar 22 00:04:12 2011
@@ -1,0 +1,97 @@
+--- a/mk/beforeauto.mk.in
++++ b/mk/beforeauto.mk.in
+@@ -40,8 +40,8 @@
+ INSTALLINCDIR := $(DESTDIR)@includedir@
+ INSTALLBINDIR := $(DESTDIR)@bindir@
+ INSTALLLIBDIR := $(DESTDIR)@libdir@
+-INSTALLPYTHONDIR := $(DESTDIR)@pythondir@
+-INSTALLPYEXECDIR := $(DESTDIR)@pyexecdir@
++INSTALLPYTHONDIR := $(DESTDIR)/usr/lib/omniidl
++INSTALLPYEXECDIR := $(DESTDIR)/usr/lib/omniidl
+ INSTALLIDLDIR := $(DESTDIR)@datadir@/idl
+
+ #############################################################################
+--- a/src/tool/omniidl/python/scripts/omniidl.in
++++ b/src/tool/omniidl/python/scripts/omniidl.in
+@@ -41,65 +41,9 @@
+
+ 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)
+-
+-# Last chance, try a path based on the installation prefixes
+-sys.path.append("@prefix@/lib/python" + sys.version[:3] + "/site-packages")
+-
+-paths = [ "@exec_prefix@/lib/python" + sys.version[:3] + "/site-packages",
+- "@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)
+
+
+-# 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:
Modified: trunk/omniorb/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb/debian/patches/series?rev=235&op=diff
==============================================================================
--- trunk/omniorb/debian/patches/series (original)
+++ trunk/omniorb/debian/patches/series Tue Mar 22 00:04:12 2011
@@ -3,3 +3,5 @@
buildsys
cos_stubs
#useless_linking
+private_pythondir
+spurious_hashbang
Added: trunk/omniorb/debian/patches/spurious_hashbang
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb/debian/patches/spurious_hashbang?rev=235&op=file
==============================================================================
--- trunk/omniorb/debian/patches/spurious_hashbang (added)
+++ trunk/omniorb/debian/patches/spurious_hashbang Tue Mar 22 00:04:12 2011
@@ -1,0 +1,7 @@
+--- a/src/tool/omniidl/python/omniidl/main.py
++++ b/src/tool/omniidl/python/omniidl/main.py
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env python
+ # -*- python -*-
+ # Package : omniidl
+ # main.py Created on: 1999/11/05
Modified: trunk/omniorb/debian/rules
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb/debian/rules?rev=235&op=diff
==============================================================================
--- trunk/omniorb/debian/rules (original)
+++ trunk/omniorb/debian/rules Tue Mar 22 00:04:12 2011
@@ -51,7 +51,6 @@
$(MAKE) -C build install DESTDIR=$(CURDIR)/debian/tmp
-find debian/tmp -name "*.pyc" -exec rm {} \;
dh_install --sourcedir=debian/tmp --list-missing
- sed -i '1d' debian/omniidl/usr/lib/python2.*/*-packages/omniidl/main.py
# Build architecture-independent files here.
binary-indep: build install
@@ -92,7 +91,7 @@
dh_makeshlibs -plibomnithread3c2 -V 'libomnithread3c2 (>= 4.0.6)'
dh_makeshlibs -plibomniorb4-1 -V 'libomniorb4-1 (>= 4.1.5)'
dh_makeshlibs -plibcos4-1 -V 'libcos4-1 (>= 4.1.5)'
- dh_pycentral -pomniidl
+ dh_python2 -pomniidl
dh_installdeb -a
dh_shlibdeps -a
dh_gencontrol -a
More information about the Pkg-corba-commits
mailing list