[Pkg-corba-commits] r223 - in /trunk/python-omniorb/debian: ./ changelog control patches/ patches/buildsys patches/pydebug patches/series source/ source/format
flub-guest at users.alioth.debian.org
flub-guest at users.alioth.debian.org
Mon Aug 9 23:06:17 UTC 2010
Author: flub-guest
Date: Mon Aug 9 23:06:13 2010
New Revision: 223
URL: http://svn.debian.org/wsvn/pkg-corba/?sc=1&rev=223
Log:
Apply debian patches for version 3.4
This also first converts the package to dpkg-source format 3.0 (quilt)
to make the patches more obvious and easier to handle.
Added:
trunk/python-omniorb/debian/patches/
trunk/python-omniorb/debian/patches/buildsys
trunk/python-omniorb/debian/patches/pydebug
trunk/python-omniorb/debian/patches/series
trunk/python-omniorb/debian/source/
trunk/python-omniorb/debian/source/format
Modified:
trunk/python-omniorb/debian/ (props changed)
trunk/python-omniorb/debian/changelog
trunk/python-omniorb/debian/control
Propchange: trunk/python-omniorb/debian/
------------------------------------------------------------------------------
--- svn-bp:origUrl (original)
+++ svn-bp:origUrl Mon Aug 9 23:06:13 2010
@@ -1,1 +1,1 @@
-http://pkg-corba.alioth.debian.org/tarballs/python-omniorb_3.3.orig.tar.gz
+http://pkg-corba.alioth.debian.org/tarballs/python-omniorb_3.4.orig.tar.gz
Modified: trunk/python-omniorb/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/python-omniorb/debian/changelog?rev=223&op=diff
==============================================================================
--- trunk/python-omniorb/debian/changelog (original)
+++ trunk/python-omniorb/debian/changelog Mon Aug 9 23:06:13 2010
@@ -3,6 +3,9 @@
* New upstream release
* debian/python-omniorb-doc.docs, debian/python-omniorb-doc.doc-base:
remove .ps documentation, dropped by upstream.
+ * Change to dpkg-source format 3.0 (quilt).
+ * Add XB-Python-Version to python-omniorb-dbg.
+ * Bump Standars-Version to 3.9.1: no changes needed.
-- Floris Bruynooghe <floris.bruynooghe at gmail.com> Sun, 08 Aug 2010 20:17:32 +0100
Modified: trunk/python-omniorb/debian/control
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/python-omniorb/debian/control?rev=223&op=diff
==============================================================================
--- trunk/python-omniorb/debian/control (original)
+++ trunk/python-omniorb/debian/control Mon Aug 9 23:06:13 2010
@@ -6,7 +6,7 @@
Build-Depends: debhelper (>= 6.0.0), python-all-dev (>= 2.3.5-11), python-all-dbg, libomniorb4-dev (>= 4.1.3), omniorb-idl (>= 4.1.3), omniidl (>= 4.1.3), autotools-dev, python-central (>= 0.6.0)
Build-Conflicts: omniidl4-python, omniidl-python
XS-Python-Version: all
-Standards-Version: 3.8.3
+Standards-Version: 3.9.1.0
Vcs-Svn: svn://svn.debian.org/svn/pkg-corba/trunk/python-omniorb
Vcs-Browser: http://svn.debian.org/wsvn/pkg-corba/trunk/python-omniorb
Homepage: http://omniorb.sourceforge.net
@@ -34,6 +34,7 @@
Architecture: any
Depends: python-omniorb (= ${binary:Version}), ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
Section: debug
+XB-Python-Version: ${python:Versions}
Description: Python bindings for omniORB
omniORB4 is a freely available Common Object Request Broker
Architecture (CORBA) 2.6 compliant object request broker (ORB)
Added: trunk/python-omniorb/debian/patches/buildsys
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/python-omniorb/debian/patches/buildsys?rev=223&op=file
==============================================================================
--- trunk/python-omniorb/debian/patches/buildsys (added)
+++ trunk/python-omniorb/debian/patches/buildsys Mon Aug 9 23:06:13 2010
@@ -1,0 +1,57 @@
+Description: Avoid forked code in the build system
+ This replaces omkdirhier and omkdepend which are source-level copies
+ of other projects. They are only used during the build system and
+ can be easily replicated using standard OS and compiler programs in
+ Debian.
+ .
+ Upstream discussion:
+ http://www.omniorb-support.com/pipermail/omniorb-list/2002-October/022062.html
+Forwarded: not-needed
+Author: Bastian Blank <waldi at debian.org>
+Last-Update: 2010-08-09
+
+--- a/mk/beforeauto.mk.in
++++ b/mk/beforeauto.mk.in
+@@ -662,17 +662,16 @@
+ CC = @CC@
+ CXX = @CXX@
+ RANLIB = @RANLIB@
+-MKDIRHIER = @MKDIRHIER@
++MKDIRHIER = mkdir -p
+ INSTLIBFLAGS = -m 0644
+ INSTEXEFLAGS = -m 0755
+ CP = cp
+ MV = mv -f
+ CPP = @CPP@
+-OMKDEPEND = @OMKDEPEND@
+ RMDIRHIER = $(RM) -rf
+
+-CXXMAKEDEPEND = $(OMKDEPEND) -D__cplusplus
+-CMAKEDEPEND = $(OMKDEPEND)
++CXXMAKEDEPEND = @CXX@ -M -MD -MG
++CMAKEDEPEND = @CC@ -M -MD -MG
+
+
+ #
+@@ -710,10 +709,10 @@
+ #
+ # Default compiler rules
+ #
+-CDEBUGFLAGS = -O
++CDEBUGFLAGS = -g
+ CLINK = $(CC)
+ CLINKOPTIONS = $(CDEBUGFLAGS) $(COPTIONS)
+-CXXDEBUGFLAGS = -O2
++CXXDEBUGFLAGS = -g
+ CXXLINK = $(CXX)
+ CXXLINKOPTIONS = $(CXXDEBUGFLAGS) $(CXXOPTIONS)
+
+@@ -724,8 +723,6 @@
+ #
+
+ ifdef Compiler_GCC
+-CMAKEDEPEND += -D__GNUC__
+-CXXMAKEDEPEND += -D__GNUG__ -D__GNUC__
+ CXXOPTIONS = -Wall -Wno-unused -fexceptions
+ EgcsMajorVersion = 1
+ EgcsMinorVersion = 1
Added: trunk/python-omniorb/debian/patches/pydebug
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/python-omniorb/debian/patches/pydebug?rev=223&op=file
==============================================================================
--- trunk/python-omniorb/debian/patches/pydebug (added)
+++ trunk/python-omniorb/debian/patches/pydebug Mon Aug 9 23:06:13 2010
@@ -1,0 +1,176 @@
+Description: Enable building for debug builds of python
+ This allows one to build the modules for pydebug builds in the same
+ tree as the normal build by following normal distutils filename
+ convetions for pydebug extension modules (adding _d to the name).
+Forwarded: http://www.omniorb-support.com/pipermail/omniorb-list/2010-January/030475.html
+Author: Floris Bruynooghe <flub at devork.be>
+Last-Update: 2010-08-09
+
+--- a/examples/embed/dir.mk
++++ b/examples/embed/dir.mk
+@@ -15,9 +15,15 @@
+ ifdef UnixPlatform
+ CXXDEBUGFLAGS = -g
+ PYPREFIX := $(shell $(PYTHON) -c 'import sys; print sys.exec_prefix')
++PYDEBUG := $(shell $(PYTHON) -c 'import sys; print sys.pydebug')
+ PYVERSION := $(shell $(PYTHON) -c 'import sys; print sys.version[:3]')
++ifeq ($(PYDEBUG),True)
++PYDEBUG := _d
++else
++PYDEBUG :=
++endif
+ PYINCDIR := $(PYPREFIX)/include
+-PYINCFILE := "<python$(PYVERSION)/Python.h>"
++PYINCFILE := "<python$(PYVERSION)$(PYDEBUG)/Python.h>"
+ DIR_CPPFLAGS += -I$(PYINCDIR) -DPYTHON_INCLUDE=$(PYINCFILE)
+ endif
+
+@@ -26,9 +32,9 @@
+
+ namespec := _embedmodule _ 1 0
+
+-SharedLibraryFullNameTemplate = $$1$$2.$(SHAREDLIB_SUFFIX).$$3.$$4
+-SharedLibrarySoNameTemplate = $$1$$2.$(SHAREDLIB_SUFFIX).$$3
+-SharedLibraryLibNameTemplate = $$1$$2.$(SHAREDLIB_SUFFIX)
++SharedLibraryFullNameTemplate = $$1$$2$(PYDEBUG).$(SHAREDLIB_SUFFIX).$$3.$$4
++SharedLibrarySoNameTemplate = $$1$$2$(PYDEBUG).$(SHAREDLIB_SUFFIX).$$3
++SharedLibraryLibNameTemplate = $$1$$2$(PYDEBUG).$(SHAREDLIB_SUFFIX)
+
+ ifdef PythonLibraryPlatformLinkFlagsTemplate
+ SharedLibraryPlatformLinkFlagsTemplate = $(PythonLibraryPlatformLinkFlagsTemplate)
+--- a/modules/codesets/dir.mk
++++ b/modules/codesets/dir.mk
+@@ -21,10 +21,16 @@
+ #CXXDEBUGFLAGS = -g
+
+ PYPREFIX := $(shell $(PYTHON) -c 'import sys; print sys.exec_prefix')
++PYDEBUG := $(shell $(PYTHON) -c 'import sys; print sys.pydebug')
+ PYVERSION := $(shell $(PYTHON) -c 'import sys; print sys.version[:3]')
++ifeq ($(PYDEBUG),True)
++PYDEBUG := _d
++else
++PYDEBUG :=
++endif
+ PYINCDIR := $(PYPREFIX)/include
+-PYINCFILE := "<python$(PYVERSION)/Python.h>"
+-PYINCTHRD := "<python$(PYVERSION)/pythread.h>"
++PYINCFILE := "<python$(PYVERSION)$(PYDEBUG)/Python.h>"
++PYINCTHRD := "<python$(PYVERSION)$(PYDEBUG)/pythread.h>"
+ DIR_CPPFLAGS += -I$(PYINCDIR) -DPYTHON_INCLUDE=$(PYINCFILE) -DPYTHON_THREAD_INC=$(PYINCTHRD)
+ DIR_CPPFLAGS += $(CORBA_CPPFLAGS)
+
+@@ -43,9 +49,9 @@
+ SHAREDLIB_SUFFIX = $(PythonSHAREDLIB_SUFFIX)
+ endif
+
+-SharedLibraryFullNameTemplate = $$1$$2.$(SHAREDLIB_SUFFIX).$$3.$$4
+-SharedLibrarySoNameTemplate = $$1$$2.$(SHAREDLIB_SUFFIX).$$3
+-SharedLibraryLibNameTemplate = $$1$$2.$(SHAREDLIB_SUFFIX)
++SharedLibraryFullNameTemplate = $$1$$2$(PYDEBUG).$(SHAREDLIB_SUFFIX).$$3.$$4
++SharedLibrarySoNameTemplate = $$1$$2$(PYDEBUG).$(SHAREDLIB_SUFFIX).$$3
++SharedLibraryLibNameTemplate = $$1$$2$(PYDEBUG).$(SHAREDLIB_SUFFIX)
+
+ ifdef PythonLibraryPlatformLinkFlagsTemplate
+ SharedLibraryPlatformLinkFlagsTemplate = $(PythonLibraryPlatformLinkFlagsTemplate)
+--- a/modules/connections/dir.mk
++++ b/modules/connections/dir.mk
+@@ -19,10 +19,16 @@
+ #CXXDEBUGFLAGS = -g
+
+ PYPREFIX := $(shell $(PYTHON) -c 'import sys; print sys.exec_prefix')
++PYDEBUG := $(shell $(PYTHON) -c 'import sys; print sys.pydebug')
+ PYVERSION := $(shell $(PYTHON) -c 'import sys; print sys.version[:3]')
++ifeq ($(PYDEBUG),True)
++PYDEBUG := _d
++else
++PYDEBUG :=
++endif
+ PYINCDIR := $(PYPREFIX)/include
+-PYINCFILE := "<python$(PYVERSION)/Python.h>"
+-PYINCTHRD := "<python$(PYVERSION)/pythread.h>"
++PYINCFILE := "<python$(PYVERSION)$(PYDEBUG)/Python.h>"
++PYINCTHRD := "<python$(PYVERSION)$(PYDEBUG)/pythread.h>"
+ DIR_CPPFLAGS += -I$(PYINCDIR) -DPYTHON_INCLUDE=$(PYINCFILE) -DPYTHON_THREAD_INC=$(PYINCTHRD)
+ DIR_CPPFLAGS += $(CORBA_CPPFLAGS)
+
+@@ -50,9 +56,9 @@
+ SHAREDLIB_SUFFIX = $(PythonSHAREDLIB_SUFFIX)
+ endif
+
+-SharedLibraryFullNameTemplate = $$1$$2.$(SHAREDLIB_SUFFIX).$$3.$$4
+-SharedLibrarySoNameTemplate = $$1$$2.$(SHAREDLIB_SUFFIX).$$3
+-SharedLibraryLibNameTemplate = $$1$$2.$(SHAREDLIB_SUFFIX)
++SharedLibraryFullNameTemplate = $$1$$2$(PYDEBUG).$(SHAREDLIB_SUFFIX).$$3.$$4
++SharedLibrarySoNameTemplate = $$1$$2$(PYDEBUG).$(SHAREDLIB_SUFFIX).$$3
++SharedLibraryLibNameTemplate = $$1$$2$(PYDEBUG).$(SHAREDLIB_SUFFIX)
+
+ ifdef PythonLibraryPlatformLinkFlagsTemplate
+ SharedLibraryPlatformLinkFlagsTemplate = $(PythonLibraryPlatformLinkFlagsTemplate)
+--- a/modules/dir.mk
++++ b/modules/dir.mk
+@@ -72,10 +72,16 @@
+ #CXXDEBUGFLAGS = -g
+
+ PYPREFIX := $(shell $(PYTHON) -c 'import sys; print sys.exec_prefix')
++PYDEBUG := $(shell $(PYTHON) -c 'import sys; print sys.pydebug')
+ PYVERSION := $(shell $(PYTHON) -c 'import sys; print sys.version[:3]')
++ifeq ($(PYDEBUG),True)
++PYDEBUG := _d
++else
++PYDEBUG :=
++endif
+ PYINCDIR := $(PYPREFIX)/include
+-PYINCFILE := "<python$(PYVERSION)/Python.h>"
+-PYINCTHRD := "<python$(PYVERSION)/pythread.h>"
++PYINCFILE := "<python$(PYVERSION)$(PYDEBUG)/Python.h>"
++PYINCTHRD := "<python$(PYVERSION)$(PYDEBUG)/pythread.h>"
+ DIR_CPPFLAGS += -I$(PYINCDIR) -DPYTHON_INCLUDE=$(PYINCFILE) -DPYTHON_THREAD_INC=$(PYINCTHRD)
+ DIR_CPPFLAGS += $(CORBA_CPPFLAGS)
+
+@@ -94,9 +100,9 @@
+ SHAREDLIB_SUFFIX = $(PythonSHAREDLIB_SUFFIX)
+ endif
+
+-SharedLibraryFullNameTemplate = $$1$$2.$(SHAREDLIB_SUFFIX).$$3.$$4
+-SharedLibrarySoNameTemplate = $$1$$2.$(SHAREDLIB_SUFFIX).$$3
+-SharedLibraryLibNameTemplate = $$1$$2.$(SHAREDLIB_SUFFIX)
++SharedLibraryFullNameTemplate = $$1$$2$(PYDEBUG).$(SHAREDLIB_SUFFIX).$$3.$$4
++SharedLibrarySoNameTemplate = $$1$$2$(PYDEBUG).$(SHAREDLIB_SUFFIX).$$3
++SharedLibraryLibNameTemplate = $$1$$2$(PYDEBUG).$(SHAREDLIB_SUFFIX)
+
+ ifdef PythonLibraryPlatformLinkFlagsTemplate
+ SharedLibraryPlatformLinkFlagsTemplate = $(PythonLibraryPlatformLinkFlagsTemplate)
+--- a/modules/sslTP/dir.mk
++++ b/modules/sslTP/dir.mk
+@@ -20,10 +20,16 @@
+ #CXXDEBUGFLAGS = -g
+
+ PYPREFIX := $(shell $(PYTHON) -c 'import sys; print sys.exec_prefix')
++PYDEBUG := $(shell $(PYTHON) -c 'import sys; print sys.pydebug')
+ PYVERSION := $(shell $(PYTHON) -c 'import sys; print sys.version[:3]')
++ifeq ($(PYDEBUG),True)
++PYDEBUG := _d
++else
++PYDEBUG :=
++endif
+ PYINCDIR := $(PYPREFIX)/include
+-PYINCFILE := "<python$(PYVERSION)/Python.h>"
+-PYINCTHRD := "<python$(PYVERSION)/pythread.h>"
++PYINCFILE := "<python$(PYVERSION)$(PYDEBUG)/Python.h>"
++PYINCTHRD := "<python$(PYVERSION)$(PYDEBUG)/pythread.h>"
+ DIR_CPPFLAGS += -I$(PYINCDIR) -DPYTHON_INCLUDE=$(PYINCFILE) -DPYTHON_THREAD_INC=$(PYINCTHRD)
+ DIR_CPPFLAGS += $(CORBA_CPPFLAGS)
+
+@@ -45,9 +51,9 @@
+ SHAREDLIB_SUFFIX = $(PythonSHAREDLIB_SUFFIX)
+ endif
+
+-SharedLibraryFullNameTemplate = $$1$$2.$(SHAREDLIB_SUFFIX).$$3.$$4
+-SharedLibrarySoNameTemplate = $$1$$2.$(SHAREDLIB_SUFFIX).$$3
+-SharedLibraryLibNameTemplate = $$1$$2.$(SHAREDLIB_SUFFIX)
++SharedLibraryFullNameTemplate = $$1$$2$(PYDEBUG).$(SHAREDLIB_SUFFIX).$$3.$$4
++SharedLibrarySoNameTemplate = $$1$$2$(PYDEBUG).$(SHAREDLIB_SUFFIX).$$3
++SharedLibraryLibNameTemplate = $$1$$2$(PYDEBUG).$(SHAREDLIB_SUFFIX)
+
+ ifdef PythonLibraryPlatformLinkFlagsTemplate
+ SharedLibraryPlatformLinkFlagsTemplate = $(PythonLibraryPlatformLinkFlagsTemplate)
Added: trunk/python-omniorb/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/python-omniorb/debian/patches/series?rev=223&op=file
==============================================================================
--- trunk/python-omniorb/debian/patches/series (added)
+++ trunk/python-omniorb/debian/patches/series Mon Aug 9 23:06:13 2010
@@ -1,0 +1,2 @@
+buildsys
+pydebug
Added: trunk/python-omniorb/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/python-omniorb/debian/source/format?rev=223&op=file
==============================================================================
--- trunk/python-omniorb/debian/source/format (added)
+++ trunk/python-omniorb/debian/source/format Mon Aug 9 23:06:13 2010
@@ -1,0 +1,1 @@
+3.0 (quilt)
More information about the Pkg-corba-commits
mailing list