[SCM] Qt 4 Debian packaging branch, master, updated. debian/4.6.0-1-37-gac34295

[Pino Toscano]

The following commit has been merged in the master branch:
commit 1b361c993480642345ef0b7595c38d56783d2776
Author: Pino Toscano <pino at kde.org>
Date:   Sun Jan 31 01:30:05 2010 +0100

    add 81_hurd_architecture.diff to recognize the proper architecture on GNU/Hurd
---
 debian/changelog                         |    4 +++-
 debian/patches/81_hurd_architecture.diff |   26 ++++++++++++++++++++++++++
 debian/patches/series                    |    1 +
 3 files changed, 30 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 672be65..3dd1109 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -43,8 +43,10 @@ qt4-x11 (4:4.6.1-1) UNRELEASED; urgency=low
   [ Pino Toscano ]
   * Update debian/control: Don't build-depends on libasound2-dev for
     GNU/kFreeBSD and GNU/Hurd architectures.
+  * Add 81_hurd_architecture.diff: recognize the proper architecture on
+    GNU/Hurd. This will make Qt BIC there, but we can live with that.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 13 Dec 2009 18:43:29 +0200
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 31 Jan 2010 01:28:35 +0100
 
 qt4-x11 (4:4.6.0-1) experimental; urgency=low
 
diff --git a/debian/patches/81_hurd_architecture.diff b/debian/patches/81_hurd_architecture.diff
new file mode 100644
index 0000000..151e620
--- /dev/null
+++ b/debian/patches/81_hurd_architecture.diff
@@ -0,0 +1,26 @@
+Description: recognize the correct architecture on GNU/Hurd.
+ Doing the same mangling of `uname -m` done in the config.guess of the widely
+ used autotools, we can recognize the correct architecture, and thus using
+ non-generic atomic primitives.
+Author: Pino Toscano <pino at kde.org>
+Forwarded: no
+--- a/configure
++++ b/configure
+@@ -2723,6 +2723,17 @@
+ 
+ if [ -z "${CFG_HOST_ARCH}" ]; then
+     case "$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_MACHINE" in
++    GNU:*:*)
++        CFG_HOST_ARCH=`echo ${UNAME_MACHINE} | sed -e 's,[-/].*$,,'`
++        case "$CFG_HOST_ARCH" in
++            i?86)
++                CFG_HOST_ARCH=i386
++                ;;
++        esac
++        if [ "$OPT_VERBOSE" = "yes" ]; then
++            echo "    GNU/Hurd ($CFG_HOST_ARCH)"
++        fi
++        ;;
+     IRIX*:*:*)
+         CFG_HOST_ARCH=`uname -p`
+         if [ "$OPT_VERBOSE" = "yes" ]; then
diff --git a/debian/patches/series b/debian/patches/series
index 45ad831..477c32d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -31,6 +31,7 @@
 70_hppa_ldcw_fix.diff
 71_hppa_unaligned_access_fix_458133.diff
 80_hurd_max_path.diff
+81_hurd_architecture.diff
 89_powerpc_opts.diff
 91_s390_-gstabs.diff
 92_armel_gcc43_valist_compat.diff

-- 
Qt 4 Debian packaging