r54909 - in /desktop/unstable/gnome-software/debian: changelog control control.in rules

[jbicha at users.alioth.debian.org]

Author: jbicha
Date: Fri Nov 24 00:20:02 2017
New Revision: 54909

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=54909
Log:
Only build snap plugin on architectures where snapd is built

Modified:
    desktop/unstable/gnome-software/debian/changelog
    desktop/unstable/gnome-software/debian/control
    desktop/unstable/gnome-software/debian/control.in
    desktop/unstable/gnome-software/debian/rules

Modified: desktop/unstable/gnome-software/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-software/debian/changelog?rev=54909&op=diff
==============================================================================
--- desktop/unstable/gnome-software/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-software/debian/changelog	[utf-8] Fri Nov 24 00:20:02 2017
@@ -1,3 +1,9 @@
+gnome-software (3.26.3-2) UNRELEASED; urgency=medium
+
+  * Only build snap plugin on architectures where snapd is built
+
+ -- Jeremy Bicha <jbicha at debian.org>  Thu, 23 Nov 2017 19:16:30 -0500
+
 gnome-software (3.26.3-1) unstable; urgency=medium
 
   * New upstream release

Modified: desktop/unstable/gnome-software/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-software/debian/control?rev=54909&op=diff
==============================================================================
--- desktop/unstable/gnome-software/debian/control	[utf-8] (original)
+++ desktop/unstable/gnome-software/debian/control	[utf-8] Fri Nov 24 00:20:02 2017
@@ -29,7 +29,7 @@
                libpackagekit-glib2-dev (>= 1.1.4),
                libpolkit-gobject-1-dev,
                libsecret-1-dev,
-               libsnapd-glib-dev (>= 1.19) [linux-any],
+               libsnapd-glib-dev (>= 1.19) [amd64 arm64 armel armhf i386 ppc64 ppc64el],
                libsoup2.4-dev (>= 2.52),
                libsqlite3-dev,
                libxml2-utils,
@@ -118,7 +118,7 @@
  This package contains the Limba plugin.
 
 Package: gnome-software-plugin-snap
-Architecture: linux-any
+Architecture: amd64 arm64 armel armhf i386 ppc64 ppc64el
 Depends: gnome-software (= ${binary:Version}),
          snapd,
          ${misc:Depends},

Modified: desktop/unstable/gnome-software/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-software/debian/control.in?rev=54909&op=diff
==============================================================================
--- desktop/unstable/gnome-software/debian/control.in	[utf-8] (original)
+++ desktop/unstable/gnome-software/debian/control.in	[utf-8] Fri Nov 24 00:20:02 2017
@@ -25,7 +25,7 @@
                libpackagekit-glib2-dev (>= 1.1.4),
                libpolkit-gobject-1-dev,
                libsecret-1-dev,
-               libsnapd-glib-dev (>= 1.19) [linux-any],
+               libsnapd-glib-dev (>= 1.19) [amd64 arm64 armel armhf i386 ppc64 ppc64el],
                libsoup2.4-dev (>= 2.52),
                libsqlite3-dev,
                libxml2-utils,
@@ -114,7 +114,7 @@
  This package contains the Limba plugin.
 
 Package: gnome-software-plugin-snap
-Architecture: linux-any
+Architecture: amd64 arm64 armel armhf i386 ppc64 ppc64el
 Depends: gnome-software (= ${binary:Version}),
          snapd,
          ${misc:Depends},

Modified: desktop/unstable/gnome-software/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-software/debian/rules?rev=54909&op=diff
==============================================================================
--- desktop/unstable/gnome-software/debian/rules	[utf-8] (original)
+++ desktop/unstable/gnome-software/debian/rules	[utf-8] Fri Nov 24 00:20:02 2017
@@ -20,7 +20,7 @@
 
 ifeq ($(DEB_HOST_ARCH_OS), linux)
 	# Enable Flatpak and Limba support on Linux
-	GS_CONFIGURE_FLAGS += -Denable-limba=true -Denable-flatpak=true -Denable-snap=true
+	GS_CONFIGURE_FLAGS += -Denable-limba=true -Denable-flatpak=true
 
 	# Enable GUdev support on Linux
 	GS_CONFIGURE_FLAGS += -Denable-gudev=true
@@ -28,6 +28,11 @@
 	# Enable fwupd support on supported architectures
 	ifneq (,$(findstring $(DEB_HOST_ARCH), amd64 arm64 armhf i386))
 		GS_CONFIGURE_FLAGS += -Denable-fwupd=true
+	endif
+
+	# Enable snap support on supported architectures
+	ifneq (,$(findstring $(DEB_HOST_ARCH), amd64 arm64 armel armhf i386 ppc64 ppc64el))
+		GS_CONFIGURE_FLAGS += -Denable-snap=true
 	endif
 
 	# Enable valgrind support on supported architectures