r50653 - in /desktop/experimental/gnome-software/debian: changelog control control.in copyright gnome-software-plugin-flatpak.install gnome-software.gsettings-override.in patches/01_debian-dfsg.patch patches/series rules
jbicha-guest at users.alioth.debian.org
jbicha-guest at users.alioth.debian.org
Thu Sep 15 20:24:23 UTC 2016
Author: jbicha-guest
Date: Thu Sep 15 20:24:23 2016
New Revision: 50653
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=50653
Log:
merge smcv's commits from packages/experimental/
Removed:
desktop/experimental/gnome-software/debian/patches/01_debian-dfsg.patch
Modified:
desktop/experimental/gnome-software/debian/changelog
desktop/experimental/gnome-software/debian/control
desktop/experimental/gnome-software/debian/control.in
desktop/experimental/gnome-software/debian/copyright
desktop/experimental/gnome-software/debian/gnome-software-plugin-flatpak.install
desktop/experimental/gnome-software/debian/gnome-software.gsettings-override.in
desktop/experimental/gnome-software/debian/patches/series
desktop/experimental/gnome-software/debian/rules
Modified: desktop/experimental/gnome-software/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-software/debian/changelog?rev=50653&op=diff
==============================================================================
--- desktop/experimental/gnome-software/debian/changelog [utf-8] (original)
+++ desktop/experimental/gnome-software/debian/changelog [utf-8] Thu Sep 15 20:24:23 2016
@@ -1,4 +1,4 @@
-gnome-software (3.21.91-1) UNRELEASED; urgency=medium
+gnome-software (3.21.92-1) UNRELEASED; urgency=medium
[ Jeremy Bicha ]
* New upstream release
@@ -6,7 +6,7 @@
* Use separate packages for flatpak and limba plugins
* debian/control.in:
- Update Vcs links
- - Build-depend on autoconf-archive and libflatpak-dev
+ - Build-depend on autoconf-archive
- Have gnome-software suggest flatpak and limba plugins
- Bump build-dependencies based on configure.ac
* debian/rules:
@@ -15,6 +15,22 @@
[ Michael Biebl ]
* Drop --disable-silent-rules from debian/rules. This is now handled by dh
directly depending on whether the DH_QUIET environment variable is set.
+
+ [ Simon McVittie ]
+ * New upstream release
+ - build-depend on libappstream-glib-dev (>= 0.6.2) to get all mandatory
+ and optional functionality
+ - build-depend on libflatpak-dev and enable Flatpak
+ - build-depend on libsecret-1-dev
+ - build-depend on gudev on linux-any
+ - bump Gtk build-dependency
+ - explicitly disable OSTree support for now, OSTree in Debian is not
+ ready to be used for OS deployment
+ - d/p/01_debian-dfsg.patch: remove, the same result can be achieved
+ with GSettings now
+ - d/gnome-software.gsettings-override.in: consider the 'main'
+ component to be Free Software (Ubuntu will likely want to patch this
+ to do the same for universe)
-- Jeremy Bicha <jbicha at linux.com> Tue, 24 May 2016 23:33:35 -0400
Modified: desktop/experimental/gnome-software/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-software/debian/control?rev=50653&op=diff
==============================================================================
--- desktop/experimental/gnome-software/debian/control [utf-8] (original)
+++ desktop/experimental/gnome-software/debian/control [utf-8] Thu Sep 15 20:24:23 2016
@@ -19,11 +19,12 @@
intltool (>= 0.35.0),
libappstream-glib-dev (>= 0.6.1),
libflatpak-dev (>= 0.4.14) [linux-any],
- libfwupd-dev (>= 0.6) [amd64 arm64 armhf i386],
+ libfwupd-dev (>= 0.7) [amd64 arm64 armhf i386],
libglib2.0-dev (>= 2.46),
libgnome-desktop-3-dev (>= 3.18),
libgtk-3-dev (>= 3.20),
libgtkspell3-3-dev (>= 3.0),
+ libgudev-1.0-dev [linux-any],
libjson-glib-dev,
liblimba-dev (>= 0.5.6) [linux-any],
liboauth-dev,
Modified: desktop/experimental/gnome-software/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-software/debian/control.in?rev=50653&op=diff
==============================================================================
--- desktop/experimental/gnome-software/debian/control.in [utf-8] (original)
+++ desktop/experimental/gnome-software/debian/control.in [utf-8] Thu Sep 15 20:24:23 2016
@@ -15,11 +15,12 @@
intltool (>= 0.35.0),
libappstream-glib-dev (>= 0.6.1),
libflatpak-dev (>= 0.4.14) [linux-any],
- libfwupd-dev (>= 0.6) [amd64 arm64 armhf i386],
+ libfwupd-dev (>= 0.7) [amd64 arm64 armhf i386],
libglib2.0-dev (>= 2.46),
libgnome-desktop-3-dev (>= 3.18),
libgtk-3-dev (>= 3.20),
libgtkspell3-3-dev (>= 3.0),
+ libgudev-1.0-dev [linux-any],
libjson-glib-dev,
liblimba-dev (>= 0.5.6) [linux-any],
liboauth-dev,
@@ -96,8 +97,8 @@
limba,
${misc:Depends},
${shlibs:Depends}
-Breaks: gnome-software (<< 3.20.4-1~)
-Replaces: gnome-software (<< 3.20.4-1~)
+Breaks: gnome-software (<< 3.21.92)
+Replaces: gnome-software (<< 3.21.92)
Description: Limba support for GNOME Software
Software lets you install and update applications and system extensions.
.
Modified: desktop/experimental/gnome-software/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-software/debian/copyright?rev=50653&op=diff
==============================================================================
--- desktop/experimental/gnome-software/debian/copyright [utf-8] (original)
+++ desktop/experimental/gnome-software/debian/copyright [utf-8] Thu Sep 15 20:24:23 2016
@@ -3,7 +3,8 @@
Source: https://download.gnome.org/sources/gnome-software/
Files: *
-Copyright: 2013-2014 Richard Hughes <richard at hughsie.com>
+Copyright: 2013-2016 Richard Hughes <richard at hughsie.com>
+ 2013-2016 Free Software Foundation, Inc.
2013 Matthias Clasen <mclasen at redhat.com>
2014 Kalev Lember <kalevlember at gmail.com>
License: GPL-2+
Modified: desktop/experimental/gnome-software/debian/gnome-software-plugin-flatpak.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-software/debian/gnome-software-plugin-flatpak.install?rev=50653&op=diff
==============================================================================
--- desktop/experimental/gnome-software/debian/gnome-software-plugin-flatpak.install [utf-8] (original)
+++ desktop/experimental/gnome-software/debian/gnome-software-plugin-flatpak.install [utf-8] Thu Sep 15 20:24:23 2016
@@ -1,3 +1,3 @@
usr/lib/gs-plugins-*/libgs_plugin_flatpak*.so
-usr/lib/gs-plugins-*/libgs_plugin_ostree*.so
+#usr/lib/gs-plugins-*/libgs_plugin_ostree*.so
Modified: desktop/experimental/gnome-software/debian/gnome-software.gsettings-override.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-software/debian/gnome-software.gsettings-override.in?rev=50653&op=diff
==============================================================================
--- desktop/experimental/gnome-software/debian/gnome-software.gsettings-override.in [utf-8] (original)
+++ desktop/experimental/gnome-software/debian/gnome-software.gsettings-override.in [utf-8] Thu Sep 15 20:24:23 2016
@@ -1,2 +1,4 @@
[org.gnome.software]
official-sources=['@DISTRO at -*']
+free-sources=['@DISTRO at -*-main']
+free-sources-url='https://www.debian.org/social_contract#guidelines'
Modified: desktop/experimental/gnome-software/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-software/debian/patches/series?rev=50653&op=diff
==============================================================================
--- desktop/experimental/gnome-software/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gnome-software/debian/patches/series [utf-8] Thu Sep 15 20:24:23 2016
@@ -1 +0,0 @@
-#01_debian-dfsg.patch
Modified: desktop/experimental/gnome-software/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-software/debian/rules?rev=50653&op=diff
==============================================================================
--- desktop/experimental/gnome-software/debian/rules [utf-8] (original)
+++ desktop/experimental/gnome-software/debian/rules [utf-8] Thu Sep 15 20:24:23 2016
@@ -3,6 +3,7 @@
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
GS_CONFIGURE_FLAGS = --libdir=/usr/lib \
+ --disable-ostree \
--enable-odrs
ifeq ($(DEB_HOST_ARCH_OS), linux)
More information about the pkg-gnome-commits
mailing list