[SCM] Debian packaging for the 2.0 Apache Shibboleth SP branch, master, updated. debian/2.4.3+dfsg-1-5-ga4e5882

[Russ Allbery]

The following commit has been merged in the master branch:
commit 48b645eeba11006ebfe107cd091761222a72b68d
Author: Russ Allbery <rra at debian.org>
Date:   Sun Sep 25 14:29:24 2011 -0700

    Build with g++ 4.4 on armel
    
    * Build-depend on g++-4.4 on armel and build with that compiler since
      g++ 4.5 and 4.6 die with an internal compiler error even with no
      optimization.  Patch from Peter Green.  (Closes: #623263)

diff --git a/debian/changelog b/debian/changelog
index fef29d3..4082213 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 shibboleth-sp2 (2.4.3+dfsg-2) UNRELEASED; urgency=low
 
+  * Build-depend on g++-4.4 on armel and build with that compiler since
+    g++ 4.5 and 4.6 die with an internal compiler error even with no
+    optimization.  Patch from Peter Green.  (Closes: #623263)
   * Update the upstream download location in debian/copyright.
 
  -- Russ Allbery <rra at debian.org>  Tue, 26 Jul 2011 18:22:28 -0700
diff --git a/debian/control b/debian/control
index 9c30f70..45f165c 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,8 @@ Build-Depends: debhelper (>= 8), apache2-threaded-dev, autoconf, automake,
  autotools-dev, doxygen, graphviz, liblog4cpp5-dev, libmemcached-dev,
  libsaml2-dev (>= 2.4), libssl-dev, libtool, libxerces-c-dev,
  libxml-security-c-dev (>= 1.6), libxmltooling-dev (>= 1.4),
- opensaml2-schemas, pkg-config, unixodbc-dev, xmltooling-schemas
+ opensaml2-schemas, pkg-config, unixodbc-dev, xmltooling-schemas,
+ g++-4.4 [armel]
 Standards-Version: 3.9.2
 Homepage: http://shibboleth.internet2.edu/
 Vcs-Git: git://git.debian.org/git/pkg-shibboleth/shibboleth-sp2.git
diff --git a/debian/rules b/debian/rules
index 45aab72..a10fea2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,12 @@
 #!/usr/bin/make -f
 
+# g++ 4.5 and 4.6 fail to build this package on armel with an internal
+# error: internal compiler error: in expand_expr_real_1, at expr.c:8532
+DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+ifeq ($(DEB_BUILD_ARCH),armel)
+    export CXX=g++-4.4
+endif
+
 DOCS = debian/libshibsp-doc/usr/share/doc/libshibsp-doc
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))

-- 
Debian packaging for the 2.0 Apache Shibboleth SP