[Pkg-corba-commits] r77 - in /trunk/trunk/python-omniorb2: bin/scripts/ debian/ mk/ python/COS/ python/omniORB/
flub-guest at users.alioth.debian.org
flub-guest at users.alioth.debian.org
Tue Dec 4 21:52:13 UTC 2007
Author: flub-guest
Date: Tue Dec 4 21:52:13 2007
New Revision: 77
URL: http://svn.debian.org/wsvn/pkg-corba/?sc=1&rev=77
Log:
[svn-inject] Applying Debian modifications to trunk
Added:
trunk/trunk/python-omniorb2/debian/
trunk/trunk/python-omniorb2/debian/changelog
trunk/trunk/python-omniorb2/debian/compat
trunk/trunk/python-omniorb2/debian/control
trunk/trunk/python-omniorb2/debian/copyright
trunk/trunk/python-omniorb2/debian/omniidl4-python.files
trunk/trunk/python-omniorb2/debian/python-omniorb2-omg.files
trunk/trunk/python-omniorb2/debian/python-omniorb2.files
trunk/trunk/python-omniorb2/debian/rules (with props)
Removed:
trunk/trunk/python-omniorb2/bin/scripts/config.guess
trunk/trunk/python-omniorb2/bin/scripts/config.sub
Modified:
trunk/trunk/python-omniorb2/mk/beforeauto.mk.in
trunk/trunk/python-omniorb2/python/COS/dir.mk
trunk/trunk/python-omniorb2/python/omniORB/dir.mk
Added: trunk/trunk/python-omniorb2/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/trunk/python-omniorb2/debian/changelog?rev=77&op=file
==============================================================================
--- trunk/trunk/python-omniorb2/debian/changelog (added)
+++ trunk/trunk/python-omniorb2/debian/changelog Tue Dec 4 21:52:13 2007
@@ -1,0 +1,147 @@
+python-omniorb2 (2.6-3.3) unstable; urgency=high
+
+ * Non-maintainer upload.
+ * High urgency for fixing RC bug.
+ * Provide again CORBA module (Closes: #410652)
+ + patch from Floris Bruynooghe.
+
+ -- Mohammed Adnène Trojette <adn+deb at diwi.org> Tue, 13 Mar 2007 13:46:01 +0100
+
+python-omniorb2 (2.6-3.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Fixed FTBFS, changed file omniidl4-python.files to be independent of the
+ python version (Closes: #400490).
+
+ -- Ana Beatriz Guerrero Lopez <ana at debian.org> Sun, 3 Dec 2006 08:25:17 +0100
+
+python-omniorb2 (2.6-3.1) unstable; urgency=low
+
+ * NMU
+ * Convert to the updated python policy.
+
+ -- Matthias Klose <doko at debian.org> Fri, 7 Jul 2006 16:34:10 +0000
+
+python-omniorb2 (2.6-3) unstable; urgency=low
+
+ * debian:
+ - Remove python2.1 and python2.2 packages. (closes: #351147)
+
+ -- Bastian Blank <waldi at debian.org> Sun, 09 Apr 2006 20:15:16 +0200
+
+python-omniorb2 (2.6-2) unstable; urgency=low
+
+ * C++ ABI transition.
+
+ -- Bastian Blank <waldi at debian.org> Sun, 31 Jul 2005 11:18:45 +0200
+
+python-omniorb2 (2.6-1) unstable; urgency=high
+
+ * New upstream version.
+ * Add python2.4-omniorb2.
+
+ -- Bastian Blank <waldi at debian.org> Sat, 16 Apr 2005 11:43:36 +0200
+
+python-omniorb2 (2.5-1) unstable; urgency=low
+
+ * New upstream release. (closes: #277132)
+ * Add new packages: python2.[23]-omniorb2-omg. (closes: #220918)
+
+ -- Bastian Blank <waldi at debian.org> Sat, 27 Nov 2004 15:35:45 +0100
+
+python-omniorb2 (2.4.1-1) unstable; urgency=high
+
+ * Remove undistributable file. (closes: #264357, #264389)
+ * debian/copyright:
+ - Update. (closes: #264390)
+
+ -- Bastian Blank <waldi at debian.org> Sun, 08 Aug 2004 21:52:47 +0200
+
+python-omniorb2 (2.4-2) unstable; urgency=low
+
+ * debian/control:
+ - Build-Depend against libomniorb4-dev (>= 4.0.4).
+
+ -- Bastian Blank <waldi at debian.org> Thu, 05 Aug 2004 12:54:13 +0200
+
+python-omniorb2 (2.4-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Bastian Blank <waldi at debian.org> Wed, 04 Aug 2004 16:36:01 +0200
+
+python-omniorb2 (2.3-1) unstable; urgency=low
+
+ * New upstream release. (closes: #226093)
+ * debian/*.{postinst,prerm}:
+ - Remove.
+ * debian/*.preinst:
+ - Remove cruft.
+ * debian/control:
+ - Build-Depend against debhelper (>= 4.1.67).
+ - Fix Depends and Conflicts. (closes: #213096)
+ * debian/rules:
+ - Use di_python.
+
+ -- Bastian Blank <waldi at debian.org> Sat, 17 Jan 2004 11:52:45 +0100
+
+python-omniorb2 (2.2-2) unstable; urgency=low
+
+ * debian/python2.{2,3}-omniorb2.{postinst,prerm}
+ - add alternative for CORBA.py and PortableServer.py
+ * debian/control
+ - python2.2-omniorb2 conflict against python2.2-pyorbit (<= 2.0.0-1)
+ - python2.3-omniorb2 conflict against python2.3-pyorbit (<= 2.0.0-1)
+ - add python-omniorb2 (closes: #213096)
+
+ -- Bastian Blank <waldi at debian.org> Tue, 18 Nov 2003 20:54:58 +0100
+
+python-omniorb2 (2.2-1) unstable; urgency=low
+
+ * new upstream version
+ * new package for python 2.3
+
+ -- Bastian Blank <waldi at debian.org> Tue, 12 Aug 2003 16:07:08 +0200
+
+python-omniorb2 (2.1-2) unstable; urgency=low
+
+ * debian/control
+ - build-depend on omniorb4 (>= 4.0.1)
+ * debian/rules
+ - fix rm of *.pyc (closes: #189407)
+
+ -- Bastian Blank <waldi at debian.org> Thu, 17 Apr 2003 15:53:45 +0200
+
+python-omniorb2 (2.1-1) unstable; urgency=low
+
+ * new upstream version
+ * debian/control
+ - fix conflicts/replaces of python2.2-omniorb2 (closes: #188942)
+
+ -- Bastian Blank <waldi at debian.org> Wed, 16 Apr 2003 18:00:03 +0200
+
+python-omniorb2 (2.0-4) unstable; urgency=low
+
+ * really fix clean target (closes: #187759)
+ * change section to python
+
+ -- Bastian Blank <waldi at debian.org> Sun, 06 Apr 2003 00:44:24 +0200
+
+python-omniorb2 (2.0-3) unstable; urgency=low
+
+ * build-depend against omniidl4 (closes: #187079)
+
+ -- Bastian Blank <waldi at debian.org> Sat, 05 Apr 2003 11:54:02 +0200
+
+python-omniorb2 (2.0-2) unstable; urgency=low
+
+ * build packages for python 2.1 and 2.2
+
+ -- Bastian Blank <waldi at debian.org> Mon, 10 Feb 2003 17:37:32 +0100
+
+python-omniorb2 (2.0-1) unstable; urgency=low
+
+ * Initial Release.
+
+ -- Bastian Blank <waldi at debian.org> Sat, 16 Nov 2002 23:48:00 +0100
+
Added: trunk/trunk/python-omniorb2/debian/compat
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/trunk/python-omniorb2/debian/compat?rev=77&op=file
==============================================================================
--- trunk/trunk/python-omniorb2/debian/compat (added)
+++ trunk/trunk/python-omniorb2/debian/compat Tue Dec 4 21:52:13 2007
@@ -1,0 +1,1 @@
+4
Added: trunk/trunk/python-omniorb2/debian/control
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/trunk/python-omniorb2/debian/control?rev=77&op=file
==============================================================================
--- trunk/trunk/python-omniorb2/debian/control (added)
+++ trunk/trunk/python-omniorb2/debian/control Tue Dec 4 21:52:13 2007
@@ -1,0 +1,53 @@
+Source: python-omniorb2
+Section: python
+Priority: optional
+Maintainer: Bastian Blank <waldi at debian.org>
+Build-Depends: debhelper (>= 5.0.38), python-all-dev (>= 2.3.5-11), libomniorb4-dev (>= 4.0.6-2), omniorb4-idl (>= 4.0.6), omniidl4 (>= 4.0.6), autotools-dev, python-central (>= 0.5.6)
+XS-Python-Version: all
+Standards-Version: 3.6.1
+
+Package: python-omniorb2
+Architecture: any
+Depends: ${python:Depends}, ${shlibs:Depends}
+Provides: ${python:Provides}
+Conflicts: python2.3-omniorb2, python2.4-omniorb2
+Replaces: python2.3-omniorb2, python2.4-omniorb2
+XB-Python-Version: ${python:Versions}
+Description: omniORBpy2 - dependency package
+ omniORB4 is a freely available Common Object Request Broker
+ Architecture (CORBA) 2.6 compliant object request broker (ORB)
+ implementation. It is based on the IIOP communications
+ protocol and should be interoperable with any other
+ CORBA 2.6 compliant ORB.
+
+Package: python-omniorb2-omg
+Architecture: all
+Depends: python-omniorb2 (>= ${Source-Version})
+Provides: python2.3-corba-omg, python2.4-corba-omg
+Conflicts: python2.3-corba-omg, python2.3-omniorb2-omg, python2.4-omniorb2-omg
+Replaces: python2.3-corba-omg, python2.3-omniorb2-omg, python2.4-omniorb2-omg
+XB-Python-Version: ${python:Versions}
+Description: omniORBpy2 - python 2.3 CORBA OMG standard files
+ omniORB4 is a freely available Common Object Request Broker
+ Architecture (CORBA) 2.6 compliant object request broker (ORB)
+ implementation. It is based on the IIOP communications
+ protocol and should be interoperable with any other
+ CORBA 2.6 compliant ORB.
+ .
+ This package includes the python files that are necessary to
+ fulfil the OMG standard 02-09-07.
+
+Package: omniidl4-python
+Architecture: all
+Depends: omniidl4, ${python:Depends}
+Recommends: libomniorb4-dev
+Conflicts: omniidl-python
+XB-Python-Version: ${python:Versions}
+Description: omniORBpy2 - idl to python compiler
+ omniORB4 is a freely available Common Object Request Broker
+ Architecture (CORBA) 2.6 compliant object request broker (ORB)
+ implementation. It is based on the IIOP communications
+ protocol and should be interoperable with any other
+ CORBA 2.6 compliant ORB.
+ .
+ This includes the idl to python compiler.
Added: trunk/trunk/python-omniorb2/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/trunk/python-omniorb2/debian/copyright?rev=77&op=file
==============================================================================
--- trunk/trunk/python-omniorb2/debian/copyright (added)
+++ trunk/trunk/python-omniorb2/debian/copyright Tue Dec 4 21:52:13 2007
@@ -1,0 +1,23 @@
+This is the debian package for OmniORBpy.
+
+It was downloaded from http://omniorb.sf.net/.
+
+Copyright:
+
+ This package is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this package; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+On Debian GNU/Linux systems, the complete text of the GNU Lesser General
+Public License can be found in `/usr/share/common-licenses/LGPL'.
+
Added: trunk/trunk/python-omniorb2/debian/omniidl4-python.files
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/trunk/python-omniorb2/debian/omniidl4-python.files?rev=77&op=file
==============================================================================
--- trunk/trunk/python-omniorb2/debian/omniidl4-python.files (added)
+++ trunk/trunk/python-omniorb2/debian/omniidl4-python.files Tue Dec 4 21:52:13 2007
@@ -1,0 +1,1 @@
+usr/lib/python*/site-packages/omniidl_be/python.py
Added: trunk/trunk/python-omniorb2/debian/python-omniorb2-omg.files
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/trunk/python-omniorb2/debian/python-omniorb2-omg.files?rev=77&op=file
==============================================================================
--- trunk/trunk/python-omniorb2/debian/python-omniorb2-omg.files (added)
+++ trunk/trunk/python-omniorb2/debian/python-omniorb2-omg.files Tue Dec 4 21:52:13 2007
@@ -1,0 +1,2 @@
+usr/lib/python*/site-packages/*.py
+usr/lib/python*/site-packages/CosNaming*
Added: trunk/trunk/python-omniorb2/debian/python-omniorb2.files
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/trunk/python-omniorb2/debian/python-omniorb2.files?rev=77&op=file
==============================================================================
--- trunk/trunk/python-omniorb2/debian/python-omniorb2.files (added)
+++ trunk/trunk/python-omniorb2/debian/python-omniorb2.files Tue Dec 4 21:52:13 2007
@@ -1,0 +1,2 @@
+usr/lib/python*/site-packages/_omni*
+usr/lib/python*/site-packages/omniORB/
Added: trunk/trunk/python-omniorb2/debian/rules
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/trunk/python-omniorb2/debian/rules?rev=77&op=file
==============================================================================
--- trunk/trunk/python-omniorb2/debian/rules (added)
+++ trunk/trunk/python-omniorb2/debian/rules Tue Dec 4 21:52:13 2007
@@ -1,0 +1,139 @@
+#!/usr/bin/make -f
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+CFLAGS += -g
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+INSTALL_PROGRAM += -s
+endif
+
+PYVERS := $(shell pyversions -vr debian/control)
+
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+CONFIGURE = \
+ ../configure \
+ --host=$(DEB_HOST_GNU_TYPE) \
+ --build=$(DEB_BUILD_GNU_TYPE) \
+ --prefix=/usr \
+ --mandir=\$${prefix}/share/man \
+ --infodir=\$${prefix}/share/info \
+ --with-omniorb=/usr \
+ --with-openssl=/usr
+
+autotools-update-stamp:
+ cp -f /usr/share/misc/config.guess /usr/share/misc/config.sub bin/scripts
+
+ touch $@
+
+build-%/config.status: autotools-update-stamp
+ dh_testdir
+
+ -mkdir build-$*
+ cd build-$* && \
+ $(CONFIGURE) PYTHON=/usr/bin/python$*
+
+build: build-stamp
+build-stamp: $(PYVERS:%=build-stamp-%)
+ touch $@
+
+build-stamp-%: build-%/config.status
+ dh_testdir
+
+ $(MAKE) -C build-$*
+
+ touch $@
+
+clean:
+ dh_testdir
+ dh_testroot
+
+ -rm -rf build*
+ -rm -f *-stamp
+ find . -name "*.pyc" -exec rm {} \;
+ -rm bin/scripts/config.guess bin/scripts/config.sub
+
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+
+ set -e; \
+ for v in $(PYVERS); do \
+ $(MAKE) -C build-$$v install DESTDIR=$(CURDIR)/debian/tmp; \
+ done
+
+ find . -name "*.pyc" -exec rm {} \;
+
+ dh_movefiles
+
+# Build architecture-independent files here.
+binary-indep: build install
+ dh_testdir -i
+ dh_testroot -i
+# dh_installdebconf -i
+ dh_installdocs -i
+# dh_installexamples -i
+# dh_installmenu -i
+# dh_installlogrotate -i
+# dh_installemacsen -i
+# dh_installpam -i
+# dh_installmime -i
+# dh_installinit -i
+# dh_installcron -i
+# dh_installman -i
+# dh_installinfo -i
+# dh_undocumented -i
+ dh_installchangelogs update.log -i
+ dh_pycentral -i
+ dh_link -i
+ dh_compress -i
+ dh_fixperms -i
+ dh_installdeb -i
+# dh_perl -i
+ dh_gencontrol -i
+ dh_md5sums -i
+ dh_builddeb -i
+
+# Build architecture-dependent files here.
+binary-arch: build install
+ dh_testdir -a
+ dh_testroot -a
+# dh_installdebconf -a
+ dh_installdocs -a
+# dh_installexamples -a
+# dh_installmenu -a
+# dh_installlogrotate -a
+# dh_installemacsen -a
+# dh_installpam -a
+# dh_installmime -a
+ dh_installinit -a
+# dh_installcron -a
+# dh_installman -a
+# dh_installinfo -a
+# dh_undocumented -a
+ dh_installchangelogs update.log -a
+ dh_pycentral -a
+ dh_strip -a
+ dh_link -a
+ dh_compress -a
+ dh_fixperms -a
+# dh_makeshlibs -a
+ dh_installdeb -a
+# dh_perl -a
+ dh_shlibdeps -a
+ dh_gencontrol -a
+ dh_md5sums -a
+ dh_builddeb -a
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure
Propchange: trunk/trunk/python-omniorb2/debian/rules
------------------------------------------------------------------------------
svn:executable = *
Modified: trunk/trunk/python-omniorb2/mk/beforeauto.mk.in
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/trunk/python-omniorb2/mk/beforeauto.mk.in?rev=77&op=diff
==============================================================================
--- trunk/trunk/python-omniorb2/mk/beforeauto.mk.in (original)
+++ trunk/trunk/python-omniorb2/mk/beforeauto.mk.in Tue Dec 4 21:52:13 2007
@@ -30,12 +30,6 @@
MAKEDIR = mk
LIBDIR = lib
BINDIR = bin
-
-ifeq ($(OMNIORB_ROOT),)
-OMNIORB_BINDIR = $(TOP)/$(BINDIR)
-else
-OMNIORB_BINDIR = $(OMNIORB_ROOT)/$(BINDIR)
-endif
#############################################################################
@@ -277,8 +271,7 @@
# need to preserve the old (idl-copying) behaviour for existing dir.mk
# files.
-vpath %.idl $(IMPORT_TREES:%=%/idl) \
- $(OMNIORB_ROOT)/share/idl/omniORB $(DATADIR)/idl/omniORB
+vpath %.idl $(IMPORT_TREES:%=%/idl) $(DATADIR)/idl/omniORB
IMPORT_IDLFLAGS += -I. $(patsubst %,-I%,$(VPATH)) \
$(patsubst %,-I%/idl,$(IMPORT_TREES))
@@ -471,7 +464,7 @@
OMNIORB_DYNAMIC_DLL_NAME = $(patsubst %,$(LibSearchPattern),\
omniDynamic$(OMNIORB_MAJOR_VERSION))
-OMNIIDL = $(OMNIORB_BINDIR)/omniidl
+OMNIIDL = /usr/bin/omniidl
OMNIORB_IDL_ONLY = $(OMNIIDL) -bcxx
OMNIORB_IDL_ANY_FLAGS = -Wba
OMNIORB_IDL = $(OMNIORB_IDL_ONLY) $(OMNIORB_IDL_ANY_FLAGS)
@@ -660,17 +653,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
#
Modified: trunk/trunk/python-omniorb2/python/COS/dir.mk
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/trunk/python-omniorb2/python/COS/dir.mk?rev=77&op=diff
==============================================================================
--- trunk/trunk/python-omniorb2/python/COS/dir.mk (original)
+++ trunk/trunk/python-omniorb2/python/COS/dir.mk Tue Dec 4 21:52:13 2007
@@ -77,10 +77,6 @@
EXPORTEDFILES += $(foreach f, $(FILES), $(PYLIBDIR)/$(f))
EXPORTEDFILES += $(foreach f, $(filter CosNaming%, $(FILES)), $(PYLIBROOT)/$(f))
-# __init__.py to make it a package
-FILES += __init__.py
-INSTALLEDFILES += $(INSTALLPYTHONDIR)/__init__.py
-
# A .pth file to expose omniORB/COS to the global namespace
FILES += omniORB.pth
INSTALLEDFILES += $(INSTALLPYTHONDIR)/omniORB.pth
Modified: trunk/trunk/python-omniorb2/python/omniORB/dir.mk
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/trunk/python-omniorb2/python/omniORB/dir.mk?rev=77&op=diff
==============================================================================
--- trunk/trunk/python-omniorb2/python/omniORB/dir.mk (original)
+++ trunk/trunk/python-omniorb2/python/omniORB/dir.mk Tue Dec 4 21:52:13 2007
@@ -5,8 +5,6 @@
ir_idl.py: ir.idl
$(OMNIIDL) -v -p$(BASE_OMNI_TREE)/omniidl_be \
-I$(BASE_OMNI_TREE)/idl \
- -I$(OMNIORB_ROOT)/idl/omniORB \
- -I$(OMNIORB_ROOT)/share/idl/omniORB \
-I$(DATADIR)/idl/omniORB \
-bpython -Wbinline -Wbno_package $^
More information about the Pkg-corba-commits
mailing list