diff -u python-omniorb2-2.6/debian/changelog python-omniorb2-2.6/debian/changelog --- python-omniorb2-2.6/debian/changelog +++ python-omniorb2-2.6/debian/changelog @@ -1,3 +1,10 @@ +python-omniorb2 (2.6-3.1) unstable; urgency=low + + * NMU + * Convert to the updated python policy. + + -- Matthias Klose Fri, 7 Jul 2006 16:34:10 +0000 + python-omniorb2 (2.6-3) unstable; urgency=low * debian: diff -u python-omniorb2-2.6/debian/control python-omniorb2-2.6/debian/control --- python-omniorb2-2.6/debian/control +++ python-omniorb2-2.6/debian/control @@ -2,39 +2,31 @@ Section: python Priority: optional Maintainer: Bastian Blank -Build-Depends: debhelper (>> 4.1.67), python2.3-dev, python2.4-dev, libomniorb4-dev (>= 4.0.6-2), omniorb4-idl (>= 4.0.6), omniidl4 (>= 4.0.6), autotools-dev +Build-Depends: debhelper (>= 5.0.37.2), 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) +XS-Python-Version: all Standards-Version: 3.6.1 Package: python-omniorb2 -Architecture: all -Depends: ${python:Depends} -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: python2.3-omniorb2 Architecture: any -Depends: python2.3, ${shlibs:Depends} -Conflicts: python-omniorb -Suggests: omniidl4-python -Description: omniORBpy2 - python 2.3 +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. - . - This includes the python libs and stubs. -Package: python2.3-omniorb2-omg +Package: python-omniorb2-omg Architecture: all -Depends: python2.3-omniorb2, ${python:Depends} -Provides: python2.3-corba-omg -Conflicts: python2.3-corba-omg -Replaces: python2.3-corba-omg +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) @@ -45,41 +37,12 @@ This package includes the python files that are necessary to fulfil the OMG standard 02-09-07. -Package: python2.4-omniorb2 -Architecture: any -Depends: python2.4, ${shlibs:Depends} -Conflicts: python-omniorb -Suggests: omniidl4-python -Description: omniORBpy2 - python 2.4 - 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 python libs and stubs. - -Package: python2.4-omniorb2-omg -Architecture: all -Depends: python2.4-omniorb2, ${python:Depends} -Provides: python2.4-corba-omg -Conflicts: python2.4-corba-omg -Replaces: python2.4-corba-omg -Description: omniORBpy2 - python 2.4 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) diff -u python-omniorb2-2.6/debian/rules python-omniorb2-2.6/debian/rules --- python-omniorb2-2.6/debian/rules +++ python-omniorb2-2.6/debian/rules @@ -10,6 +10,8 @@ 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) @@ -30,35 +32,21 @@ touch $@ -build-2.3/config.status: autotools-update-stamp - dh_testdir - - -mkdir build-2.3 - cd build-2.3 && \ - $(CONFIGURE) PYTHON=/usr/bin/python2.3 - -build-2.4/config.status: autotools-update-stamp - dh_testdir - - -mkdir build-2.4 - cd build-2.4 && \ - $(CONFIGURE) PYTHON=/usr/bin/python2.4 - -build: build-2.3-stamp build-2.4-stamp - -build-2.3: build-2.3-stamp -build-2.3-stamp: build-2.3/config.status +build-%/config.status: autotools-update-stamp dh_testdir - $(MAKE) -C build-2.3 + -mkdir build-$* + cd build-$* && \ + $(CONFIGURE) PYTHON=/usr/bin/python$* +build: build-stamp +build-stamp: $(PYVERS:%=build-stamp-%) touch $@ -build-2.4: build-2.4-stamp -build-2.4-stamp: build-2.4/config.status +build-stamp-%: build-%/config.status dh_testdir - $(MAKE) -C build-2.4 + $(MAKE) -C build-$* touch $@ @@ -79,8 +67,10 @@ dh_clean -k dh_installdirs - $(MAKE) -C build-2.3 install DESTDIR=$(CURDIR)/debian/tmp - $(MAKE) -C build-2.4 install DESTDIR=$(CURDIR)/debian/tmp + set -e; \ + for v in $(PYVERS); do \ + $(MAKE) -C build-$$v install DESTDIR=$(CURDIR)/debian/tmp; \ + done find . -name "*.pyc" -exec rm {} \; @@ -109,6 +99,7 @@ dh_fixperms -i dh_installdeb -i # dh_perl -i + dh_pycentral -i dh_python -i dh_gencontrol -i dh_md5sums -i @@ -139,6 +130,7 @@ # dh_makeshlibs -a dh_installdeb -a # dh_perl -a + dh_pycentral -a dh_python -a dh_shlibdeps -a dh_gencontrol -a reverted: --- python-omniorb2-2.6/debian/python2.3-omniorb2-omg.files +++ python-omniorb2-2.6.orig/debian/python2.3-omniorb2-omg.files @@ -1,2 +0,0 @@ -usr/lib/python2.3/site-packages/*.py -usr/lib/python2.3/site-packages/CosNaming* reverted: --- python-omniorb2-2.6/debian/python2.3-omniorb2.files +++ python-omniorb2-2.6.orig/debian/python2.3-omniorb2.files @@ -1,2 +0,0 @@ -usr/lib/python2.3/site-packages/_omni* -usr/lib/python2.3/site-packages/omniORB/ reverted: --- python-omniorb2-2.6/debian/python2.4-omniorb2-omg.files +++ python-omniorb2-2.6.orig/debian/python2.4-omniorb2-omg.files @@ -1,2 +0,0 @@ -usr/lib/python2.4/site-packages/*.py -usr/lib/python2.4/site-packages/CosNaming* reverted: --- python-omniorb2-2.6/debian/python2.4-omniorb2.files +++ python-omniorb2-2.6.orig/debian/python2.4-omniorb2.files @@ -1,2 +0,0 @@ -usr/lib/python2.4/site-packages/_omni* -usr/lib/python2.4/site-packages/omniORB/ only in patch2: unchanged: --- python-omniorb2-2.6.orig/debian/python-omniorb2.files +++ python-omniorb2-2.6/debian/python-omniorb2.files @@ -0,0 +1,2 @@ +usr/lib/python*/site-packages/_omni* +usr/lib/python*/site-packages/omniORB/ only in patch2: unchanged: --- python-omniorb2-2.6.orig/debian/python-omniorb2-omg.files +++ python-omniorb2-2.6/debian/python-omniorb2-omg.files @@ -0,0 +1,2 @@ +usr/lib/python*/site-packages/*.py +usr/lib/python*/site-packages/CosNaming*