Build with libcloudproviders

This wasn't enabled years ago because it caused a test failure
with the autotools tests. But we've switched to meson now and
finally it looks like libcloudproviders has fixed enough issues

diff --git a/debian/control b/debian/control
index c825b5a713b71aa0b9f3fbb1a71ddd4b13468c03..3a75a4841dd48c370420362737fb99fffb3f63a4 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: gtk+3.0
 Section: libs
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
-Uploaders: Simon McVittie <smcv@debian.org>, Jeremy Bicha <jbicha@ubuntu.com>
+Uploaders: Simon McVittie <smcv@debian.org>, Jeremy Bícha <jbicha@ubuntu.com>
 Build-Depends: adwaita-icon-theme-full <!nocheck>,
                at-spi2-core <!nocheck>,
                dbus-daemon <!nocheck>,
@@ -18,6 +18,7 @@ Build-Depends: adwaita-icon-theme-full <!nocheck>,
                libatk-bridge2.0-dev (>= 2.15.1),
                libatk1.0-dev (>= 2.35.1),
                libcairo2-dev (>= 1.14.0),
+               libcloudproviders-dev (>= 0.3.2),
                libcolord-dev (>= 0.1.9),
                libcups2-dev (>= 1.7),
                libegl1-mesa-dev [linux-any],

diff --git a/debian/control.in b/debian/control.in
index cf49e8523ed9055098812f38414fdcf7422ab124..10d59d2786c8acb85e455933bdb4804b8a8961a1 100644 (file)
--- a/debian/control.in
+++ b/debian/control.in
@@ -18,6 +18,7 @@ Build-Depends: adwaita-icon-theme-full <!nocheck>,
                libatk-bridge2.0-dev (>= 2.15.1),
                libatk1.0-dev (>= 2.35.1),
                libcairo2-dev (>= 1.14.0),
+               libcloudproviders-dev (>= 0.3.2),
                libcolord-dev (>= 0.1.9),
                libcups2-dev (>= 1.7),
                libegl1-mesa-dev [linux-any],

diff --git a/debian/rules b/debian/rules
index b294cf68dbfaeda132078b6f0b7dbe1fae275f4e..ee0ac06fcf32273d3edb1ed5173c18cb2c6f9a3e 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -120,6 +120,13 @@ else
 configure_flags_deb += -Dgtk_doc=true
 endif
 
+ifeq ($(shell dpkg-vendor --is Ubuntu && echo yes), yes)
+# Not in main repository
+configure_flags_deb += -Dcloudproviders=false
+else
+configure_flags_deb += -Dcloudproviders=true
+endif
+
 configure_flags_udeb = \
        -Dbroadway_backend=false \
        -Dcolord=no \