[Pkg-corba-commits] r233 - in /trunk/omniorb/debian: changelog rules

[tgg at users.alioth.debian.org]

Author: tgg
Date: Mon Mar 21 15:28:46 2011
New Revision: 233

URL: http://svn.debian.org/wsvn/pkg-corba/?sc=1&rev=233
Log:
apply old patches that were in my tree

Modified:
    trunk/omniorb/debian/changelog
    trunk/omniorb/debian/rules

Modified: trunk/omniorb/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb/debian/changelog?rev=233&op=diff
==============================================================================
--- trunk/omniorb/debian/changelog (original)
+++ trunk/omniorb/debian/changelog Mon Mar 21 15:28:46 2011
@@ -1,5 +1,6 @@
 omniorb-dfsg (4.1.5-1) UNRELEASED; urgency=low
 
+  [ Floris Bruynooghe ]
   * New upstream version (closes: #570422, #585260, #558942).
   * Switch to dpkg-source 3.0 (quilt) format.
   * No longer include postscript docs, it is no longer shipped by upstream.
@@ -9,7 +10,11 @@
   * debian/omniorb-doc.doc-base: add PDF documentation.
   * Use bzip2 instead of gzip for .orig tarball.
 
- -- Floris Bruynooghe <floris.bruynooghe at gmail.com>  Wed, 16 Feb 2011 22:47:36 +0000
+  [ Thomas Girard ]
+  * Simplify build process: we no longer need to force CC and CXX.
+  * Bump shlibs to 4.1.5, due to changes in private headers.
+
+ -- Thomas Girard <thomas.g.girard at free.fr>  Sun, 20 Mar 2011 16:09:00 +0100
 
 omniorb-dfsg (4.1.3-1) unstable; urgency=low
 

Modified: trunk/omniorb/debian/rules
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb/debian/rules?rev=233&op=diff
==============================================================================
--- trunk/omniorb/debian/rules (original)
+++ trunk/omniorb/debian/rules Mon Mar 21 15:28:46 2011
@@ -12,15 +12,6 @@
   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
-
 PRG_PACKAGES := omniorb omniorb-nameserver omniidl
 DEV_PACKAGES := libcos4-dev libomniorb4-dev libomnithread3-dev
 
@@ -29,7 +20,7 @@
 	cp -f /usr/share/misc/config.sub /usr/share/misc/config.guess bin/scripts
 	-mkdir build
 	cd build && \
-	CC="$(CC)" CXX="$(CXX)" ../configure $(confflags) \
+	../configure $(confflags) \
 		--prefix=/usr \
 		--mandir=\$${prefix}/share/man \
 		--infodir=\$${prefix}/share/info \
@@ -99,8 +90,8 @@
 	dh_compress -a
 	dh_fixperms -a
 	dh_makeshlibs -plibomnithread3c2 -V 'libomnithread3c2 (>= 4.0.6)'
-	dh_makeshlibs -plibomniorb4-1 -V 'libomniorb4-1 (>= 4.1.2)'
-	dh_makeshlibs -plibcos4-1 -V 'libcos4-1 (>= 4.1.2)'
+	dh_makeshlibs -plibomniorb4-1 -V 'libomniorb4-1 (>= 4.1.5)'
+	dh_makeshlibs -plibcos4-1 -V 'libcos4-1 (>= 4.1.5)'
 	dh_pycentral -pomniidl
 	dh_installdeb -a
 	dh_shlibdeps -a