[Pkg-bluetooth-maintainers] Bug#636545: FTBFS: s390x architecture missing from the controlf file

[Aurelien Jarno]

Package: bluez
Version: 4.94-2
Severity: important
Tags: patch
Justification: fails to build from source
User: debian-s390 at lists.debian.org
Usertags: s390x

bluez fails to build on s390x as this architecture is not present in the
debian/control file. Unfortunately CDBS doesn't support the "linux-any" 
alias in debian/control, so s390x has to be added manually, as in the
patch below. Would it be possible to include it in the next upload?
Thanks in advance.

diff -u bluez-4.94/debian/control bluez-4.94/debian/control
--- bluez-4.94/debian/control
+++ bluez-4.94/debian/control
@@ -30,7 +30,7 @@
 Conflicts: libsdp2 (<= 1.5-2)
 Replaces: libsdp2 (<= 1.5-2)
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Architecture: amd64 armel i386 ia64 mips mipsel powerpc s390 sparc alpha armhf avr32 hppa m68k powerpcspe sh4 sparc64 ppc64
+Architecture: amd64 armel i386 ia64 mips mipsel powerpc s390 sparc alpha armhf avr32 hppa m68k powerpcspe sh4 sparc64 ppc64 s390x
 Description: Library to use the BlueZ Linux Bluetooth stack
  BlueZ is the official Linux Bluetooth protocol stack. It is an Open Source
  project distributed under GNU General Public License (GPL).
@@ -43,7 +43,7 @@
 Depends: libbluetooth3 (= ${binary:Version}), libc6-dev | libc-dev, ${misc:Depends}
 Suggests: pkg-config
 Priority: extra
-Architecture: amd64 armel i386 ia64 mips mipsel powerpc s390 sparc alpha armhf avr32 hppa m68k powerpcspe sh4 sparc64 ppc64
+Architecture: amd64 armel i386 ia64 mips mipsel powerpc s390 sparc alpha armhf avr32 hppa m68k powerpcspe sh4 sparc64 ppc64 s390x
 Description: Development files for using the BlueZ Linux Bluetooth library
  BlueZ is the official Linux Bluetooth protocol stack. It is an Open Source
  project distributed under GNU General Public License (GPL).
@@ -57,7 +57,7 @@
  by the Bluez bluetooth stack.
 
 Package: bluez
-Architecture: amd64 armel i386 ia64 mips mipsel powerpc s390 sparc alpha armhf avr32 hppa m68k powerpcspe sh4 sparc64 ppc64
+Architecture: amd64 armel i386 ia64 mips mipsel powerpc s390 sparc alpha armhf avr32 hppa m68k powerpcspe sh4 sparc64 ppc64 s390x
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, module-init-tools, udev (>= 170-1), lsb-base, dbus, python-gobject, python-dbus
 Replaces: bluez-input, bluez-network, bluez-serial, bluez-utils (<= 3.36-3), bluez-audio (<= 3.36-3), udev (<< 170-1)
 Conflicts: bluez-utils (<= 3.36-3), bluez-audio (<= 3.36-3)
@@ -70,7 +70,7 @@
 
 Package: bluez-alsa
 Replaces: bluez-audio
-Architecture: amd64 armel i386 ia64 mips mipsel powerpc s390 sparc alpha armhf avr32 hppa m68k powerpcspe sh4 sparc64 ppc64
+Architecture: amd64 armel i386 ia64 mips mipsel powerpc s390 sparc alpha armhf avr32 hppa m68k powerpcspe sh4 sparc64 ppc64 s390x
 Depends: ${shlibs:Depends}, ${misc:Depends}, bluez
 Description: Bluetooth ALSA support
  This package contains a driver operate with the ALSA stack.
@@ -79,7 +79,7 @@
  project distributed under GNU General Public License (GPL).
 
 Package: bluez-gstreamer
-Architecture: amd64 armel i386 ia64 mips mipsel powerpc s390 sparc alpha armhf avr32 hppa m68k powerpcspe sh4 sparc64 ppc64
+Architecture: amd64 armel i386 ia64 mips mipsel powerpc s390 sparc alpha armhf avr32 hppa m68k powerpcspe sh4 sparc64 ppc64 s390x
 Depends: ${shlibs:Depends}, ${misc:Depends}, bluez
 Replaces: bluez-audio
 Description: Bluetooth GStreamer support
@@ -89,7 +89,7 @@
  project distributed under GNU General Public License (GPL).
 
 Package: bluez-cups
-Architecture: amd64 armel i386 ia64 mips mipsel powerpc s390 sparc alpha armhf avr32 hppa m68k powerpcspe sh4 sparc64 ppc64
+Architecture: amd64 armel i386 ia64 mips mipsel powerpc s390 sparc alpha armhf avr32 hppa m68k powerpcspe sh4 sparc64 ppc64 s390x
 Depends: ${shlibs:Depends}, cups, ${misc:Depends}
 Description: Bluetooth printer driver for CUPS
  This package contains a driver to let CUPS print to Bluetooth-connected
@@ -99,7 +99,7 @@
  project distributed under GNU General Public License (GPL).
 
 Package: bluez-pcmcia-support
-Architecture: amd64 armel i386 ia64 mips mipsel powerpc s390 sparc alpha armhf avr32 hppa m68k powerpcspe sh4 sparc64 ppc64
+Architecture: amd64 armel i386 ia64 mips mipsel powerpc s390 sparc alpha armhf avr32 hppa m68k powerpcspe sh4 sparc64 ppc64 s390x
 Priority: extra
 Depends: pcmciautils, ${misc:Depends}
 Recommends: setserial
@@ -111,7 +111,7 @@
  project distributed under GNU General Public License (GPL).
 
 Package: bluez-compat
-Architecture: amd64 armel i386 ia64 mips mipsel powerpc s390 sparc alpha armhf avr32 hppa m68k powerpcspe sh4 sparc64 ppc64
+Architecture: amd64 armel i386 ia64 mips mipsel powerpc s390 sparc alpha armhf avr32 hppa m68k powerpcspe sh4 sparc64 ppc64 s390x
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: BlueZ 3.x compatibility binaries
  This package provides the legacy binaries that were reminiscent of the

-- System Information:
Debian Release: wheezy/sid
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: s390x

Kernel: Linux 2.6.32-5-s390x (SMP w/3 CPU cores)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash