r51754 - in /desktop/unstable/gnome-software/debian: changelog control control.in gnome-software.gsettings-override.in rules

[jbicha-guest at users.alioth.debian.org]

Author: jbicha-guest
Date: Fri Nov 18 22:57:17 2016
New Revision: 51754

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=51754
Log:
Use Ubuntu's licensing URL when built on Ubuntu; enable Ubuntu Reviews 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/gnome-software.gsettings-override.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=51754&op=diff
==============================================================================
--- desktop/unstable/gnome-software/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-software/debian/changelog	[utf-8] Fri Nov 18 22:57:17 2016
@@ -1,3 +1,12 @@
+gnome-software (3.22.1-2) UNRELEASED; urgency=medium
+
+  * debian/gnome-software.gsettings-override.in, debian/rules:
+    - Use Ubuntu's licensing URL when built on Ubuntu
+  * debian/rules:
+    - Enable Ubuntu Reviews on Ubuntu
+
+ -- Jeremy Bicha <jbicha at ubuntu.com>  Fri, 18 Nov 2016 15:06:55 -0500
+
 gnome-software (3.22.1-1) unstable; urgency=medium
 
   [ Helmut Grohne ]

Modified: desktop/unstable/gnome-software/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-software/debian/control?rev=51754&op=diff
==============================================================================
--- desktop/unstable/gnome-software/debian/control	[utf-8] (original)
+++ desktop/unstable/gnome-software/debian/control	[utf-8] Fri Nov 18 22:57:17 2016
@@ -66,6 +66,7 @@
 
 Package: gnome-software-common
 Architecture: all
+Multi-Arch: foreign
 Depends: ${misc:Depends}
 Description: Software Center for GNOME (common files)
  Software lets you install and update applications and system extensions.
@@ -76,7 +77,7 @@
  appdata plugin provides additional metadata from locally installed data in the
  appdata format.
  .
- This package contains the architectures independent files
+ This package contains the architecture-independent files.
 
 Package: gnome-software-plugin-flatpak
 Architecture: linux-any

Modified: desktop/unstable/gnome-software/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-software/debian/control.in?rev=51754&op=diff
==============================================================================
--- desktop/unstable/gnome-software/debian/control.in	[utf-8] (original)
+++ desktop/unstable/gnome-software/debian/control.in	[utf-8] Fri Nov 18 22:57:17 2016
@@ -62,6 +62,7 @@
 
 Package: gnome-software-common
 Architecture: all
+Multi-Arch: foreign
 Depends: ${misc:Depends}
 Description: Software Center for GNOME (common files)
  Software lets you install and update applications and system extensions.
@@ -72,7 +73,7 @@
  appdata plugin provides additional metadata from locally installed data in the
  appdata format.
  .
- This package contains the architectures independent files
+ This package contains the architecture-independent files.
 
 Package: gnome-software-plugin-flatpak
 Architecture: linux-any

Modified: desktop/unstable/gnome-software/debian/gnome-software.gsettings-override.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-software/debian/gnome-software.gsettings-override.in?rev=51754&op=diff
==============================================================================
--- desktop/unstable/gnome-software/debian/gnome-software.gsettings-override.in	[utf-8] (original)
+++ desktop/unstable/gnome-software/debian/gnome-software.gsettings-override.in	[utf-8] Fri Nov 18 22:57:17 2016
@@ -1,4 +1,4 @@
 [org.gnome.software]
 official-sources=['@DISTRO at -*']
 free-sources=['@DISTRO at -*-main']
-free-sources-url='https://www.debian.org/social_contract#guidelines'
+free-sources-url='@URL@'

Modified: desktop/unstable/gnome-software/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-software/debian/rules?rev=51754&op=diff
==============================================================================
--- desktop/unstable/gnome-software/debian/rules	[utf-8] (original)
+++ desktop/unstable/gnome-software/debian/rules	[utf-8] Fri Nov 18 22:57:17 2016
@@ -19,8 +19,11 @@
 endif
 
 DISTRO_ID = debian
+FREE_URL = https:\/\/www.debian.org\/social_contract\#guidelines
 ifeq (yes,$(shell dpkg-vendor --derives-from Ubuntu && echo yes))
 	DISTRO_ID = ubuntu
+	FREE_URL = https:\/\/www.ubuntu.com\/about\/about-ubuntu\/licensing
+	GS_CONFIGURE_FLAGS += '--enable-ubuntu-reviews'
 else ifeq (yes,$(shell dpkg-vendor --derives-from Tanglu && echo yes))
 	DISTRO_ID = tanglu
 endif
@@ -42,6 +45,7 @@
 
 override_dh_installgsettings:
 	sed 's/@DISTRO@/$(DISTRO_ID)/g' debian/gnome-software.gsettings-override.in > debian/gnome-software.gsettings-override
+	sed -i 's/@URL@/$(FREE_URL)/g' debian/gnome-software.gsettings-override
 	dh_installgsettings
 
 override_dh_install: