Merge lp:~xnox/libappindicator/fix-arm64 into lp:libappindicator/13.10

[Dimitri John Ledkov]

Don't build the mono bindings on AArch64, not available.

[Dimitri John Ledkov (xnox)]

urgent; for saucy/arm64 port.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:268
http://jenkins.qa.ubuntu.com/job/libappindicator-ci/17/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libappindicator-saucy-amd64-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libappindicator-saucy-armhf-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/libappindicator-saucy-armhf-ci/1/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/libappindicator-ci/17/rebuild

review: Approve (continuous-integration)

[Ted Gould (ted)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-09-20 10:17:40 +0000
+++ debian/changelog	2013-10-14 00:17:25 +0000
@@ -1,3 +1,10 @@
+libappindicator (12.10.1+13.10.20130920-0ubuntu2) UNRELEASED; urgency=low
+
+  * Don't build the mono bindings on AArch64, not available. (LP:
+    #1239474)
+
+ -- Matthias Klose <[e-mail]>  Mon, 14 Oct 2013 01:47:10 +0200
+
 libappindicator (12.10.1+13.10.20130920-0ubuntu1) saucy; urgency=low
 
   * Automatic snapshot from revision 266

=== modified file 'debian/control'
--- debian/control	2013-08-14 03:13:54 +0000
+++ debian/control	2013-10-14 00:17:25 +0000
@@ -7,22 +7,22 @@
                dh-autoreconf,
                python-all-dev,
                at-spi2-core,
-               cli-common-dev (>= 0.5.7),
+               cli-common-dev (>= 0.5.7) [!arm64],
                gobject-introspection,
                intltool,
                gtk-doc-tools,
                libxml2-utils,
-               libnunit-cil-dev,
+               libnunit-cil-dev [!arm64],
                dbus-test-runner,
                xvfb,
                valac,
-               mono-devel (>= 2.4.3),
+               mono-devel (>= 2.4.3) [!arm64],
                libglib2.0-dev (>= 2.35.4),
                libgtk-3-dev (>= 2.91.3),
                libgtk2.0-dev (>= 2.12.0),
                python-gtk2-dev,
-               gtk-sharp2-gapi,
-               libgtk2.0-cil-dev,
+               gtk-sharp2-gapi [!arm64],
+               libgtk2.0-cil-dev [!arm64],
                libdbus-glib-1-dev (>= 0.82),
                libindicator-dev (>= 0.3.90),
                libindicator3-dev (>= 0.3.90),

=== modified file 'debian/rules'
--- debian/rules	2013-06-08 03:45:07 +0000
+++ debian/rules	2013-10-14 00:17:25 +0000
@@ -4,7 +4,14 @@
 PY_VERSIONS = $(shell pyversions --requested debian/control)
 API_VERSION = 0.1
 
+DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
+
 CONFIGURE_COMMON_FLAGS = --disable-scrollkeeper --enable-introspection
+ifneq (,$(filter $(DEB_HOST_ARCH),arm64))
+  CONFIGURE_COMMON_FLAGS += --disable-mono-test
+else
+  dh_extra_args = ,cli
+endif
 CONFIGURE_FLAGS_gtk2 = --with-gtk=2 --enable-gtk-doc
 CONFIGURE_FLAGS_gtk3 = --with-gtk=3 --enable-gtk-doc=no
 
@@ -15,7 +22,7 @@
 CFLAGS += -fPIC
 
 %:
-	dh $@ --with autoreconf,python2,cli,gir
+	dh $@ --with autoreconf,python2,gir$(dh_extra_args)
 
 override_dh_autoreconf:
 	NOCONFIGURE=1 dh_autoreconf ./autogen.sh