[Pkg-corba-commits] r108 - in /trunk/python-omniorb2/debian: changelog control python-omniorb-omg.install python-omniorb.examples python-omniorb.install python-omniorb2-omg.install python-omniorb2.examples python-omniorb2.install rules

[tgg at users.alioth.debian.org]

Author: tgg
Date: Sat Dec 22 17:58:35 2007
New Revision: 108

URL: http://svn.debian.org/wsvn/pkg-corba/?sc=1&rev=108
Log:
handle transition. I have tested that it works.

Added:
    trunk/python-omniorb2/debian/python-omniorb-omg.install
      - copied unchanged from r99, trunk/python-omniorb2/debian/python-omniorb2-omg.install
    trunk/python-omniorb2/debian/python-omniorb.examples
      - copied unchanged from r99, trunk/python-omniorb2/debian/python-omniorb2.examples
    trunk/python-omniorb2/debian/python-omniorb.install
      - copied unchanged from r99, trunk/python-omniorb2/debian/python-omniorb2.install
Removed:
    trunk/python-omniorb2/debian/python-omniorb2-omg.install
    trunk/python-omniorb2/debian/python-omniorb2.examples
    trunk/python-omniorb2/debian/python-omniorb2.install
Modified:
    trunk/python-omniorb2/debian/changelog
    trunk/python-omniorb2/debian/control
    trunk/python-omniorb2/debian/rules

Modified: trunk/python-omniorb2/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/python-omniorb2/debian/changelog?rev=108&op=diff
==============================================================================
--- trunk/python-omniorb2/debian/changelog (original)
+++ trunk/python-omniorb2/debian/changelog Sat Dec 22 17:58:35 2007
@@ -1,5 +1,6 @@
-python-omniorb2 (3.1-1) unstable; urgency=low
-
+python-omniorb (3.1-1) unstable; urgency=low
+
+  [ Floris Bruynooghe ]
   * New upstream release (Closes: #453164, #430424, #398463).
   * Update copyright file (Closes: #264390). Thanks to Roland Stigge for the
     report and the patch.
@@ -13,7 +14,17 @@
     debian/control.
   * Add examples in the package.
 
- -- Floris Bruynooghe <floris.bruynooghe at gmail.com>  Mon, 30 Apr 2007 14:33:19 +0100
+  [ Thomas Girard ]
+  * Build-Depends: on libomniorb4-dev >= 4.1.1-2.
+  * Build using -g, and honor noopt DEB_BUILD_OPTIONS.
+  * Remove obsolete Conflicts: for python2.3 packages.
+  * Drop __GNUC__ and __GNUG__ from upstream Makefile. (Closes: #455444)
+  * Build-Conflicts: with omniidl4-python.
+  * Rename python-omniorb2 to python-omniorb, and python-omniorb2-omg to
+    python-omniorb-omg. Change the source package name as well, and handle
+    the transition.
+
+ -- Thomas Girard <thomas.g.girard at free.fr>  Sat, 22 Dec 2007 16:49:38 +0100
 
 python-omniorb2 (2.6-3.3) unstable; urgency=high
 

Modified: trunk/python-omniorb2/debian/control
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/python-omniorb2/debian/control?rev=108&op=diff
==============================================================================
--- trunk/python-omniorb2/debian/control (original)
+++ trunk/python-omniorb2/debian/control Sat Dec 22 17:58:35 2007
@@ -1,21 +1,22 @@
-Source: python-omniorb2
+Source: python-omniorb
 Section: python
 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 (>= 5.0.38), python-all-dev (>= 2.3.5-11), libomniorb4-dev (>= 4.1.1-2), omniorb4-idl (>= 4.1.1), omniidl4 (>= 4.1.1), autotools-dev, python-central (>= 0.5.6)
+Build-Conflicts: omniidl4-python
 XS-Python-Version: all
 Standards-Version: 3.7.3
-Vcs-Svn: svn://svn.debian.org/svn/pkg-corba/trunk/python-omniorb2
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-corba/trunk/python-omniorb2
+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
 
-Package: python-omniorb2
+Package: python-omniorb
 Architecture: any
 Depends: ${python:Depends}, ${shlibs:Depends}
-Recommends: python-omniorb2-omg
-Conflicts: python2.4-omniorb2
-Replaces: python2.4-omniorb2
+Recommends: python-omniorb-omg
+Conflicts: python2.4-omniorb2, python-omniorb2
+Replaces: python2.4-omniorb2, python-omniorb2
 Provides: ${python:Provides}
 XB-Python-Version: ${python:Versions}
 Description: Python bindings for omniORB
@@ -28,11 +29,11 @@
  This is the Debian package of omniORBpy, the python bindings to the
  omniORB libraries.
 
-Package: python-omniorb2-omg
+Package: python-omniorb-omg
 Architecture: all
-Depends: python-omniorb2 (>= ${binary:Version})
-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
+Depends: python-omniorb (>= ${binary:Version})
+Conflicts: python2.4-omniorb2-omg, python-omniorb2-omg
+Replaces: python2.4-omniorb2-omg, python-omniorb2-omg
 XB-Python-Version: ${python:Versions}
 Description: CORBA OMG standard files for python-omniorb2
  omniORB4 is a freely available Common Object Request Broker

Modified: trunk/python-omniorb2/debian/rules
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/python-omniorb2/debian/rules?rev=108&op=diff
==============================================================================
--- trunk/python-omniorb2/debian/rules (original)
+++ trunk/python-omniorb2/debian/rules Sat Dec 22 17:58:35 2007
@@ -70,7 +70,7 @@
 	  $(MAKE) -C build-$$v install DESTDIR=$(CURDIR)/debian/tmp; \
 	done
 	find . -name "*.pyc" -exec rm {} \;
-	dh_install --sourcedir=debian/tmp --list-missing
+	dh_install --sourcedir=debian/tmp --fail-missing
 
 # Build architecture-independent files here.
 binary-indep: build install