[SCM] tango branch, master, updated. debian/7.2.6+dfsg-8-2-g6196644

[Picca Frédéric-Emma?==?UTF-8?Q?nuel]

The following commit has been merged in the master branch:
commit 099a1f5ebb1d86cd1c5160a6ac6438dd7c8fd7d6
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Sun Jul 31 19:09:41 2011 +0200

    remove the mmxoptimisation on all architectures.

diff --git a/debian/changelog b/debian/changelog
index 90aa5b4..e66b850 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tango (7.2.6+dfsg-9) unstable; urgency=low
+
+ * debian/patches
+   - 0008-feature-add-jpegmmx-option-to-configure-script.patch (updated)
+     remove the mmx optimisation for all arch as it FTBFS on amd64.
+
+ -- Picca Frédéric-Emmanuel <picca at debian.org>  Sun, 31 Jul 2011 19:06:33 +0200
+
 tango (7.2.6+dfsg-8) unstable; urgency=low
 
   * do not build with mmx optimisation for the i386 arch
diff --git a/debian/patches/0008-feature-add-jpegmmx-option-to-configure-script.patch b/debian/patches/0008-feature-add-jpegmmx-option-to-configure-script.patch
index 5236e7b..509ef12 100644
--- a/debian/patches/0008-feature-add-jpegmmx-option-to-configure-script.patch
+++ b/debian/patches/0008-feature-add-jpegmmx-option-to-configure-script.patch
@@ -1,38 +1,25 @@
 From: =?UTF-8?q?Picca=20Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca at debian.org>
-Date: Sun, 31 Jul 2011 10:01:27 +0200
+Date: Sun, 31 Jul 2011 19:04:28 +0200
 Subject: feature add jpegmmx option to configure script
 
 ---
- configure.in                  |   52 ++++++++++++++--------------------------
+ configure.in                  |   47 ++++++++++------------------------------
  lib/cpp/log4tango/Makefile.am |    4 ++-
- 2 files changed, 21 insertions(+), 35 deletions(-)
+ 2 files changed, 15 insertions(+), 36 deletions(-)
 
 diff --git a/configure.in b/configure.in
-index e3dd53a..e412d36 100644
+index e3dd53a..cca35e0 100644
 --- a/configure.in
 +++ b/configure.in
-@@ -323,46 +323,30 @@ dnl
+@@ -323,46 +323,23 @@ dnl
  dnl Build the jpeg library compilation option
  dnl
  
 -JPEG_LIB_CXXFLAGS=-D_TANGO_LIB
-+AC_ARG_ENABLE([jpegmmx],
-+	[AS_HELP_STRING([--disable-jpegmmx],
-+		[disable jpeg mmx optimization])],
-+	[],
-+	[enable_jpegmmx=yes])
-+
-+JPEG_LIB_CXXFLAGS="-D_TANGO_LIB"
-+JPEG_MMX_LIB_CXXFLAGS="-D_TANGO_LIB"
-+
-+if test "x$enable_jpegmmx" != xno; then
- case $host_cpu in
+-case $host_cpu in
 -	*86 )
 -	JPEG_LIB_CXXFLAGS="$JPEG_LIB_CXXFLAGS -DJPG_USE_ASM"
-+	i*86 | x86_64 )
-+		JPEG_LIB_CXXFLAGS+=" -DJPG_USE_ASM"
-+		JPEG_MMX_LIB_CXXFLAGS+=" -mmmx -DJPG_USE_ASM"
- 	;;
+-	;;
 -dnl	case $host_cpu in
 -dnl		*64 )
 -dnl		if test $enable_shared = no; then
@@ -45,9 +32,17 @@ index e3dd53a..e412d36 100644
 -	* )
 -	JPEG_LIB_CXXFLAGS="-D_TANGO_LIB -D_64BITS"
 -    ;;
- esac
+-esac
++AC_ARG_ENABLE([jpegmmx],
++	[AS_HELP_STRING([--disable-jpegmmx],
++		[disable jpeg mmx optimization])],
++	[],
++	[enable_jpegmmx=yes])
  
--JPEG_MMX_LIB_CXXFLAGS="-D_TANGO_LIB"
++JPEG_LIB_CXXFLAGS="-D_TANGO_LIB"
+ JPEG_MMX_LIB_CXXFLAGS="-D_TANGO_LIB"
++
++if test "x$enable_jpegmmx" != xno; then
  case $host_cpu in
 -	*86 )
 -	JPEG_MMX_LIB_CXXFLAGS="$JPEG_MMX_LIB_CXXFLAGS -mmmx -DJPG_USE_ASM"
@@ -63,14 +58,13 @@ index e3dd53a..e412d36 100644
 -dnl	esac
 -	powerpc )
 -	JPEG_MMX_LIB_CXXFLAGS="-D_TANGO_LIB"
--	;;
++	i*86 )
++		JPEG_LIB_CXXFLAGS+=" -DJPG_USE_ASM"
++		JPEG_MMX_LIB_CXXFLAGS+=" -mmmx -DJPG_USE_ASM"
+ 	;;
 -	* )
 -	JPEG_MMX_LIB_CXXFLAGS="-D_TANGO_LIB -D_64BITS"
 -    ;;
-+     *64 )
-+		JPEG_LIB_CXXFLAGS+=" -D_64BITS"
-+		JPEG_MMX_LIB_CXXFLAGS+=" -D_64BITS"
-+     ;;
  esac
 +fi
  
diff --git a/debian/rules b/debian/rules
index 74b5fea..ac29c1a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,6 @@ BUILDROOT=build
 PACKAGE := $(shell dpkg-parsechangelog | sed -n 's/^Source: //p')
 VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)+.*/\1/p')
 LDFLAGS=$(shell echo $$LDFLAGS | sed -e 's/-Wl,-Bsymbolic-functions//')
-DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
 get-orig-source:
 	uscan --verbose --force-download --download-current-version
@@ -15,11 +14,7 @@ get-orig-source:
 	ln -fs $(PACKAGE)-$(VERSION)+dfsg.tar.gz ../$(PACKAGE)_$(VERSION)+dfsg.orig.tar.gz
 
 override_dh_auto_configure:
-ifeq ($(DEB_HOST_ARCH),i386)
 	dh_auto_configure -- --with-omni=/usr --disable-dbcreate --disable-java --with-doxygen --disable-jpegmmx
-else
-	dh_auto_configure -- --with-omni=/usr --disable-dbcreate --disable-java --with-doxygen
-endif
 
 override_dh_auto_install:
 	dh_auto_install --destdir="$(CURDIR)/debian/tmp/"

-- 
TANGO distributed control system.