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

[jbicha at users.alioth.debian.org]

Author: jbicha
Date: Fri Nov 24 13:58:37 2017
New Revision: 54911

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=54911
Log:
Build snap plugin on s390x since snapd is available there on Ubuntu

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=54911&op=diff
==============================================================================
--- desktop/unstable/gnome-software/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-software/debian/changelog	[utf-8] Fri Nov 24 13:58:37 2017
@@ -1,6 +1,6 @@
 gnome-software (3.26.3-2) UNRELEASED; urgency=medium
 
-  * Only build snap plugin on architectures where snapd is built
+  * Only build snap plugin on architectures where snapd is built.
 
  -- Jeremy Bicha <jbicha at debian.org>  Thu, 23 Nov 2017 19:16:30 -0500
 

Modified: desktop/unstable/gnome-software/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-software/debian/control?rev=54911&op=diff
==============================================================================
--- desktop/unstable/gnome-software/debian/control	[utf-8] (original)
+++ desktop/unstable/gnome-software/debian/control	[utf-8] Fri Nov 24 13:58:37 2017
@@ -29,7 +29,7 @@
                libpackagekit-glib2-dev (>= 1.1.4),
                libpolkit-gobject-1-dev,
                libsecret-1-dev,
-               libsnapd-glib-dev (>= 1.19) [amd64 arm64 armel armhf i386 ppc64 ppc64el],
+               libsnapd-glib-dev (>= 1.19) [amd64 arm64 armel armhf i386 ppc64 ppc64el s390x],
                libsoup2.4-dev (>= 2.52),
                libsqlite3-dev,
                libxml2-utils,
@@ -118,11 +118,12 @@
  This package contains the Limba plugin.
 
 Package: gnome-software-plugin-snap
-Architecture: amd64 arm64 armel armhf i386 ppc64 ppc64el
+Architecture: amd64 arm64 armel armhf i386 ppc64 ppc64el s390x
 Depends: gnome-software (= ${binary:Version}),
-         snapd,
+         snapd [amd64 arm64 armel armhf i386 ppc64 ppc64el],
          ${misc:Depends},
          ${shlibs:Depends},
+Recommends: snapd [s390x]
 Breaks: gnome-software (<< 3.22.3)
 Replaces: gnome-software (<< 3.22.3)
 Description: Snap support for GNOME Software

Modified: desktop/unstable/gnome-software/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-software/debian/control.in?rev=54911&op=diff
==============================================================================
--- desktop/unstable/gnome-software/debian/control.in	[utf-8] (original)
+++ desktop/unstable/gnome-software/debian/control.in	[utf-8] Fri Nov 24 13:58:37 2017
@@ -25,7 +25,7 @@
                libpackagekit-glib2-dev (>= 1.1.4),
                libpolkit-gobject-1-dev,
                libsecret-1-dev,
-               libsnapd-glib-dev (>= 1.19) [amd64 arm64 armel armhf i386 ppc64 ppc64el],
+               libsnapd-glib-dev (>= 1.19) [amd64 arm64 armel armhf i386 ppc64 ppc64el s390x],
                libsoup2.4-dev (>= 2.52),
                libsqlite3-dev,
                libxml2-utils,
@@ -114,11 +114,12 @@
  This package contains the Limba plugin.
 
 Package: gnome-software-plugin-snap
-Architecture: amd64 arm64 armel armhf i386 ppc64 ppc64el
+Architecture: amd64 arm64 armel armhf i386 ppc64 ppc64el s390x
 Depends: gnome-software (= ${binary:Version}),
-         snapd,
+         snapd [amd64 arm64 armel armhf i386 ppc64 ppc64el],
          ${misc:Depends},
          ${shlibs:Depends},
+Recommends: snapd [s390x]
 Breaks: gnome-software (<< 3.22.3)
 Replaces: gnome-software (<< 3.22.3)
 Description: Snap support for GNOME Software

Modified: desktop/unstable/gnome-software/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-software/debian/rules?rev=54911&op=diff
==============================================================================
--- desktop/unstable/gnome-software/debian/rules	[utf-8] (original)
+++ desktop/unstable/gnome-software/debian/rules	[utf-8] Fri Nov 24 13:58:37 2017
@@ -31,7 +31,7 @@
 	endif
 
 	# Enable snap support on supported architectures
-	ifneq (,$(findstring $(DEB_HOST_ARCH), amd64 arm64 armel armhf i386 ppc64 ppc64el))
+	ifneq (,$(findstring $(DEB_HOST_ARCH), amd64 arm64 armel armhf i386 ppc64 ppc64el s390x))
 		GS_CONFIGURE_FLAGS += -Denable-snap=true
 	endif