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

[Russ Allbery]

The following commit has been merged in the master branch:
commit f4f581d366b1320a127804235367fcdd00a87247
Author: Russ Allbery <rra at debian.org>
Date:   Thu Jan 5 10:18:51 2012 -0800

    Remove the g++-4.4 workaround for armel

diff --git a/debian/changelog b/debian/changelog
index 6e16661..e979ade 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+shibboleth-sp2 (2.4.3+dfsg-3) unstable; urgency=low
+
+  * Remove the armel build dependency on g++-4.4 and the code in
+    debian/rules to use it, since the g++ bug has been fixed.
+    (Closes: #654745)
+
+ -- Russ Allbery <rra at debian.org>  Thu, 05 Jan 2012 10:18:47 -0800
+
 shibboleth-sp2 (2.4.3+dfsg-2) unstable; urgency=low
 
   * Build-depend on g++-4.4 on armel and build with that compiler since
diff --git a/debian/control b/debian/control
index 45f165c..9c30f70 100644
--- a/debian/control
+++ b/debian/control
@@ -8,8 +8,7 @@ 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,
- g++-4.4 [armel]
+ opensaml2-schemas, pkg-config, unixodbc-dev, xmltooling-schemas
 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 a10fea2..45aab72 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,12 +1,5 @@
 #!/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