[Pkg-corba-commits] r132 - in /trunk/omniorb4/debian: changelog rules

[tgg at users.alioth.debian.org]

Author: tgg
Date: Tue Mar  4 16:50:50 2008
New Revision: 132

URL: http://svn.debian.org/wsvn/pkg-corba/?sc=1&rev=132
Log:
fix #469281

Modified:
    trunk/omniorb4/debian/changelog
    trunk/omniorb4/debian/rules

Modified: trunk/omniorb4/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb4/debian/changelog?rev=132&op=diff
==============================================================================
--- trunk/omniorb4/debian/changelog (original)
+++ trunk/omniorb4/debian/changelog Tue Mar  4 16:50:50 2008
@@ -1,3 +1,11 @@
+omniorb4 (4.1.1-4) unstable; urgency=low
+
+  * Fix arm-specific case to exclude armel. The fix is not needed for armel,
+    and g++-4.1 does not seem to work on this platform. Thanks to Riku Voipio
+    for the report and the fix. Closes: #469281.
+
+ -- Thomas Girard <thomas.g.girard at free.fr>  Tue, 04 Mar 2008 16:44:50 +0000
+
 omniorb4 (4.1.1-3) unstable; urgency=low
 
   * Build with g++-4.1 on arm to fix FTBFS. Closes: #460419.

Modified: trunk/omniorb4/debian/rules
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb4/debian/rules?rev=132&op=diff
==============================================================================
--- trunk/omniorb4/debian/rules (original)
+++ trunk/omniorb4/debian/rules Tue Mar  4 16:50:50 2008
@@ -4,7 +4,6 @@
 #export DH_VERBOSE=1
 
 DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_HOST_ARCH_CPU  ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
 DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
@@ -13,8 +12,8 @@
   confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
 endif
 
-# Use g++-4.1 on arm (see #460419)
-ifeq ($(DEB_HOST_ARCH_CPU),arm)
+# Use g++-4.1 on arm (see #460419), but not on armel (see #469281)
+ifeq ($(DEB_BUILD_GNU_TYPE),arm-linux-gnu)
   CC  = gcc-4.1
   CXX = g++-4.1
 endif