[Pkg-corba-commits] r106 - in /trunk/python-omniorb2/debian: changelog control rules

[tgg at users.alioth.debian.org]

Author: tgg
Date: Sat Dec 22 12:37:16 2007
New Revision: 106

URL: http://svn.debian.org/wsvn/pkg-corba/?sc=1&rev=106
Log:
Fix typos. Honour noopt. Change ./configure invocation.

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=106&op=diff
==============================================================================
--- trunk/python-omniorb2/debian/changelog (original)
+++ trunk/python-omniorb2/debian/changelog Sat Dec 22 12:37:16 2007
@@ -1,14 +1,15 @@
-python-omniorb2 (3.1-1) UNRELEASED; urgency=low
+python-omniorb2 (3.1-1) unstable; urgency=low
 
   * New upstream release (Closes: #453164, #430424, #398463).
-  * Update copyright file (Closes: #264390).
+  * Update copyright file (Closes: #264390). Thanks to Roland Stigge for the
+    report and the patch.
   * Remove Provides fields, no one depends on them anyway (Closes: #399940).
-  * Acknowledge NMUs and conform to new Python policy (Closes: 377482).
+  * Acknowledge NMUs and conform to new Python policy (Closes: #377482).
   * Bump debhelper compat to 5.
   * Bump Standards-Version to 2.7.3, no changes needed.
   * Add Vcs-* control fields in debian/control.
-  * Updated descriptions in debian/control.
-  * Changed depreciated ${Source-Version} to ${binary:Version} in
+  * Update descriptions in debian/control.
+  * Change deprecated ${Source-Version} to ${binary:Version} in
     debian/control.
   * Add examples in the package.
 

Modified: trunk/python-omniorb2/debian/control
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/python-omniorb2/debian/control?rev=106&op=diff
==============================================================================
--- trunk/python-omniorb2/debian/control (original)
+++ trunk/python-omniorb2/debian/control Sat Dec 22 12:37:16 2007
@@ -3,7 +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 (>= 5.0.38), python-all-dev (>= 2.3.5-11), libomniorb4-dev (>= 4.1.1), omniorb4-idl (>= 4.1.1), omniidl4 (>= 4.1.1), autotools-dev, python-central (>= 0.5.6)
+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)
 XS-Python-Version: all
 Standards-Version: 3.7.3
 Vcs-Svn: svn://svn.debian.org/svn/pkg-corba/trunk/python-omniorb2

Modified: trunk/python-omniorb2/debian/rules
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/python-omniorb2/debian/rules?rev=106&op=diff
==============================================================================
--- trunk/python-omniorb2/debian/rules (original)
+++ trunk/python-omniorb2/debian/rules Sat Dec 22 12:37:16 2007
@@ -2,24 +2,31 @@
 
 # Uncomment this to turn on verbose mode. 
 #export DH_VERBOSE=1
-
-# XXX Check if a separate -dbg package should be build instead.
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-CFLAGS += -g
-endif
-# XXX Check if noopt should be supported here too.
-
-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)
 
+ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
+  confflags += --build $(DEB_HOST_GNU_TYPE)
+else
+  confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
+endif
+
+# CFLAGS is not honoured by the omniORB build system.
+CC  ?= gcc
+CXX ?= g++
+
+ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+  CC  += -O2
+  CXX += -O2
+endif
+
+PYVERS := $(shell pyversions -vr debian/control)
+
 CONFIGURE = \
-	../configure \
-		--host=$(DEB_HOST_GNU_TYPE) \
-		--build=$(DEB_BUILD_GNU_TYPE) \
+	CC="$(CC)" CXX="$(CXX)" ../configure $(confflags) \
 		--prefix=/usr \
 		--mandir=\$${prefix}/share/man \
 		--infodir=\$${prefix}/share/info \
@@ -63,7 +70,7 @@
 	  $(MAKE) -C build-$$v install DESTDIR=$(CURDIR)/debian/tmp; \
 	done
 	find . -name "*.pyc" -exec rm {} \;
-	dh_install --sourcedir=debian/tmp/
+	dh_install --sourcedir=debian/tmp --list-missing
 
 # Build architecture-independent files here.
 binary-indep: build install