r52395 - in /desktop/experimental/gnome-software/debian: ./ patches/
laney at users.alioth.debian.org
laney at users.alioth.debian.org
Fri May 5 15:46:08 UTC 2017
Author: laney
Date: Fri May 5 15:46:08 2017
New Revision: 52395
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=52395
Log:
New upstream release, build with meson
And many other things
Added:
desktop/experimental/gnome-software/debian/gnome-software-dev.install
desktop/experimental/gnome-software/debian/gnome-software-doc.install
desktop/experimental/gnome-software/debian/patches/
desktop/experimental/gnome-software/debian/patches/0001-build-Use-the-configured-directory-locations-to-inst.patch
desktop/experimental/gnome-software/debian/patches/0002-build-Fix-the-pcfile.patch
desktop/experimental/gnome-software/debian/patches/0003-build-limba-Set-limba-as-a-dependency.patch
desktop/experimental/gnome-software/debian/patches/series
Removed:
desktop/experimental/gnome-software/debian/docs
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/gnome-software-plugin-flatpak.install
desktop/experimental/gnome-software/debian/gnome-software-plugin-limba.install
desktop/experimental/gnome-software/debian/gnome-software-plugin-snap.install
desktop/experimental/gnome-software/debian/gnome-software.install
desktop/experimental/gnome-software/debian/rules
desktop/experimental/gnome-software/debian/watch
Modified: desktop/experimental/gnome-software/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-software/debian/changelog?rev=52395&op=diff
==============================================================================
--- desktop/experimental/gnome-software/debian/changelog [utf-8] (original)
+++ desktop/experimental/gnome-software/debian/changelog [utf-8] Fri May 5 15:46:08 2017
@@ -1,7 +1,22 @@
-gnome-software (3.22.5-2) UNRELEASED; urgency=medium
-
+gnome-software (3.25.1-1) UNRELEASED; urgency=medium
+
+ [ Jeremy Bicha ]
* debian/control.in:
- Bump minimum appstream-glib to 0.6.7
+
+ [ Iain Lane ]
+ * New upstream development release 3.25.1
+ * debian/watch: Find unstable versions
+ * Build with meson. The debhelper support isn't yet in Debian, so we're
+ calling meson directly. Once it is, we can switch.
+ * debian/patches/0001-build-Use-the-configured-directory-locations-to-inst.patch,
+ debian/patches/0002-build-Fix-the-pcfile.patch,
+ debian/patches/0003-build-limba-Set-limba-as-a-dependency.patch: Some
+ cherry-picks I pushed upstream which fix the build to build and install
+ all the right things.
+ * debian/control{,.in}, debian/gnome-software-{dev,doc}.install: Install the
+ headers and gtk-doc documentation so that external plugins can be built.
+ * debian/rules: Build with --fail-missing.
-- Jeremy Bicha <jbicha at ubuntu.com> Mon, 23 Jan 2017 13:59:41 +0000
Modified: desktop/experimental/gnome-software/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-software/debian/control?rev=52395&op=diff
==============================================================================
--- desktop/experimental/gnome-software/debian/control [utf-8] (original)
+++ desktop/experimental/gnome-software/debian/control [utf-8] Fri May 5 15:46:08 2017
@@ -10,12 +10,11 @@
Jeremy Bicha <jbicha at ubuntu.com>, Laurent Bigonville <bigon at debian.org>, Michael Biebl <biebl at debian.org>
Build-Depends: appstream,
appstream-util,
- autoconf-archive,
debhelper (>= 9.0.0),
- dh-autoreconf,
docbook-xsl,
gnome-pkg-tools (>= 0.10),
gsettings-desktop-schemas-dev (>= 3.18),
+ gtk-doc-tools,
intltool (>= 0.35.0),
libappstream-glib-dev (>= 0.6.7),
libflatpak-dev (>= 0.6.12) [linux-any],
@@ -34,7 +33,9 @@
libsoup2.4-dev (>= 2.52),
libsqlite3-dev,
libxml2-utils,
+ meson (>= 0.37),
pkg-config,
+ valgrind,
xsltproc
Standards-Version: 3.9.8
Homepage: https://wiki.gnome.org/Apps/Software
@@ -145,3 +146,28 @@
.
The PackageKit session interface is no separate component anymore, but built
into GNOME-Software.
+
+Package: gnome-software-dev
+Section: libdevel
+Architecture: any
+Depends: libglib2.0-dev,
+ libgtk-3-dev,
+ libappstream-glib-dev,
+ libsoup2.4-dev,
+ ${misc:Depends}
+Suggests: gnome-software-doc
+Description: Software Center for GNOME - development files
+ Software lets you install and update applications and system extensions.
+ .
+ This package contains headers and other files required when compiling external
+ plugins for use with Software.
+
+Package: gnome-software-doc
+Section: doc
+Architecture: all
+Depends: ${misc:Depends}
+Description: Software Center for GNOME - documentation
+ Software lets you install and update applications and system extensions.
+ .
+ This package contains documentation for use when developing plugins for
+ Software.
Modified: desktop/experimental/gnome-software/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-software/debian/control.in?rev=52395&op=diff
==============================================================================
--- desktop/experimental/gnome-software/debian/control.in [utf-8] (original)
+++ desktop/experimental/gnome-software/debian/control.in [utf-8] Fri May 5 15:46:08 2017
@@ -6,12 +6,11 @@
@GNOME_TEAM@
Build-Depends: appstream,
appstream-util,
- autoconf-archive,
debhelper (>= 9.0.0),
- dh-autoreconf,
docbook-xsl,
gnome-pkg-tools (>= 0.10),
gsettings-desktop-schemas-dev (>= 3.18),
+ gtk-doc-tools,
intltool (>= 0.35.0),
libappstream-glib-dev (>= 0.6.7),
libflatpak-dev (>= 0.6.12) [linux-any],
@@ -30,7 +29,9 @@
libsoup2.4-dev (>= 2.52),
libsqlite3-dev,
libxml2-utils,
+ meson (>= 0.37),
pkg-config,
+ valgrind,
xsltproc
Standards-Version: 3.9.8
Homepage: https://wiki.gnome.org/Apps/Software
@@ -141,3 +142,28 @@
.
The PackageKit session interface is no separate component anymore, but built
into GNOME-Software.
+
+Package: gnome-software-dev
+Section: libdevel
+Architecture: any
+Depends: libglib2.0-dev,
+ libgtk-3-dev,
+ libappstream-glib-dev,
+ libsoup2.4-dev,
+ ${misc:Depends}
+Suggests: gnome-software-doc
+Description: Software Center for GNOME - development files
+ Software lets you install and update applications and system extensions.
+ .
+ This package contains headers and other files required when compiling external
+ plugins for use with Software.
+
+Package: gnome-software-doc
+Section: doc
+Architecture: all
+Depends: ${misc:Depends}
+Description: Software Center for GNOME - documentation
+ Software lets you install and update applications and system extensions.
+ .
+ This package contains documentation for use when developing plugins for
+ Software.
Added: desktop/experimental/gnome-software/debian/gnome-software-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-software/debian/gnome-software-dev.install?rev=52395&op=file
==============================================================================
--- desktop/experimental/gnome-software/debian/gnome-software-dev.install (added)
+++ desktop/experimental/gnome-software/debian/gnome-software-dev.install [utf-8] Fri May 5 15:46:08 2017
@@ -0,0 +1,2 @@
+usr/include/gnome-software/
+usr/lib/*/pkgconfig
Added: desktop/experimental/gnome-software/debian/gnome-software-doc.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-software/debian/gnome-software-doc.install?rev=52395&op=file
==============================================================================
--- desktop/experimental/gnome-software/debian/gnome-software-doc.install (added)
+++ desktop/experimental/gnome-software/debian/gnome-software-doc.install [utf-8] Fri May 5 15:46:08 2017
@@ -0,0 +1 @@
+usr/share/gtk-doc
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=52395&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] Fri May 5 15:46:08 2017
@@ -1,2 +1,3 @@
-#usr/lib/gs-plugins-*/libgs_plugin_ostree*.so
-usr/lib/gs-plugins-*/libgs_plugin_flatpak*.so
+#usr/lib/*/gs-plugins-*/libgs_plugin_ostree*.so
+usr/share/appdata/org.gnome.Software.Plugin.Flatpak.metainfo.xml
+usr/lib/*/gs-plugins-*/libgs_plugin_flatpak*.so
Modified: desktop/experimental/gnome-software/debian/gnome-software-plugin-limba.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-software/debian/gnome-software-plugin-limba.install?rev=52395&op=diff
==============================================================================
--- desktop/experimental/gnome-software/debian/gnome-software-plugin-limba.install [utf-8] (original)
+++ desktop/experimental/gnome-software/debian/gnome-software-plugin-limba.install [utf-8] Fri May 5 15:46:08 2017
@@ -1 +1 @@
-usr/lib/gs-plugins-*/libgs_plugin_limba*.so
+usr/lib/*/gs-plugins-*/libgs_plugin_limba*.so
Modified: desktop/experimental/gnome-software/debian/gnome-software-plugin-snap.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-software/debian/gnome-software-plugin-snap.install?rev=52395&op=diff
==============================================================================
--- desktop/experimental/gnome-software/debian/gnome-software-plugin-snap.install [utf-8] (original)
+++ desktop/experimental/gnome-software/debian/gnome-software-plugin-snap.install [utf-8] Fri May 5 15:46:08 2017
@@ -1 +1 @@
-usr/lib/gs-plugins-*/libgs_plugin_snap*.so
+usr/lib/*/gs-plugins-*/libgs_plugin_snap*.so
Modified: desktop/experimental/gnome-software/debian/gnome-software.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-software/debian/gnome-software.install?rev=52395&op=diff
==============================================================================
--- desktop/experimental/gnome-software/debian/gnome-software.install [utf-8] (original)
+++ desktop/experimental/gnome-software/debian/gnome-software.install [utf-8] Fri May 5 15:46:08 2017
@@ -1,10 +1,13 @@
debian/extra/60gnome-software /etc/apt/apt.conf.d/
etc/xdg/autostart/
usr/bin/gnome-software
-usr/lib/gs-plugins-*/*.so
+usr/lib/*/gnome-software/gnome-software-cmd
+usr/lib/*/gnome-software/gnome-software-restarter
+usr/lib/*/gs-plugins-*/*.so
usr/share/appdata/
usr/share/applications/
usr/share/dbus-1/
+usr/share/doc/
usr/share/glib-2.0/schemas/
usr/share/gnome-shell/
usr/share/man/
Added: desktop/experimental/gnome-software/debian/patches/0001-build-Use-the-configured-directory-locations-to-inst.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-software/debian/patches/0001-build-Use-the-configured-directory-locations-to-inst.patch?rev=52395&op=file
==============================================================================
--- desktop/experimental/gnome-software/debian/patches/0001-build-Use-the-configured-directory-locations-to-inst.patch (added)
+++ desktop/experimental/gnome-software/debian/patches/0001-build-Use-the-configured-directory-locations-to-inst.patch [utf-8] Fri May 5 15:46:08 2017
@@ -0,0 +1,50 @@
+From d8dbd5da0cd83d471dd14033d056da253947c29c Mon Sep 17 00:00:00 2001
+From: Iain Lane <iain at orangesquash.org.uk>
+Date: Thu, 4 May 2017 10:01:04 +0100
+Subject: [PATCH 1/3] build: Use the configured directory locations to install
+ executables
+
+Rather than hardcoding them
+---
+ lib/meson.build | 2 +-
+ src/meson.build | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/lib/meson.build b/lib/meson.build
+index 49133ead..70de332b 100644
+--- a/lib/meson.build
++++ b/lib/meson.build
+@@ -82,7 +82,7 @@ executable(
+ ],
+ c_args : cargs,
+ install : true,
+- install_dir : 'libexec'
++ install_dir : get_option('libexecdir')
+ )
+
+ if get_option('enable-tests')
+diff --git a/src/meson.build b/src/meson.build
+index 69be9f4f..d333edd8 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -110,7 +110,7 @@ executable(
+ ],
+ c_args : cargs,
+ install : true,
+- install_dir : 'bin'
++ install_dir : get_option('bindir')
+ )
+
+ executable(
+@@ -124,7 +124,7 @@ executable(
+ ],
+ c_args : cargs,
+ install : true,
+- install_dir : 'libexec'
++ install_dir : get_option('libexecdir')
+ )
+
+ # no quoting
+--
+2.11.0
+
Added: desktop/experimental/gnome-software/debian/patches/0002-build-Fix-the-pcfile.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-software/debian/patches/0002-build-Fix-the-pcfile.patch?rev=52395&op=file
==============================================================================
--- desktop/experimental/gnome-software/debian/patches/0002-build-Fix-the-pcfile.patch (added)
+++ desktop/experimental/gnome-software/debian/patches/0002-build-Fix-the-pcfile.patch [utf-8] Fri May 5 15:46:08 2017
@@ -0,0 +1,93 @@
+From b5847126891520767541b886d438bf1ff7c6fb68 Mon Sep 17 00:00:00 2001
+From: Iain Lane <iain at orangesquash.org.uk>
+Date: Thu, 4 May 2017 15:35:01 +0100
+Subject: [PATCH 2/3] build: Fix the pcfile
+
+Substitutions within it weren't being expanded properly, leading to it
+containing incorrect contents.
+
+Create a new configuration data object that contains what we need, and
+use it when generating the file.
+
+Also provide a template that can be used instead of substitution once
+meson supports setting custom directories.
+---
+ lib/gnome-software.pc.in | 1 -
+ lib/meson.build | 29 ++++++++++++++++++++++++++++-
+ meson.build | 3 ++-
+ 3 files changed, 30 insertions(+), 3 deletions(-)
+
+diff --git a/lib/gnome-software.pc.in b/lib/gnome-software.pc.in
+index 2c22d4b9..cde7122c 100644
+--- a/lib/gnome-software.pc.in
++++ b/lib/gnome-software.pc.in
+@@ -1,5 +1,4 @@
+ prefix=@prefix@
+-exec_prefix=@exec_prefix@
+ libdir=@libdir@
+ includedir=@includedir@
+ plugindir=@libdir@/gs-plugins- at GS_PLUGIN_API_VERSION@
+diff --git a/lib/meson.build b/lib/meson.build
+index 70de332b..b7944e6c 100644
+--- a/lib/meson.build
++++ b/lib/meson.build
+@@ -1,14 +1,41 @@
+ cargs = ['-DG_LOG_DOMAIN="Gs"']
+ cargs += ['-DLOCALPLUGINDIR=""']
+
++# we can't use conf as this is set_quoted()
++
++pkconf = configuration_data()
++pkconf.set('prefix', get_option('prefix'))
++pkconf.set('libdir',
++ join_paths(get_option('prefix'),
++ get_option('libdir')))
++pkconf.set('includedir',
++ join_paths(get_option('prefix'),
++ get_option('includedir')))
++pkconf.set('GS_PLUGIN_API_VERSION', gs_plugin_api_version)
++pkconf.set('VERSION', meson.project_version())
+ configure_file(
+ input : 'gnome-software.pc.in',
+ output : 'gnome-software.pc',
+ install: true,
+ install_dir: join_paths(get_option('libdir'), 'pkgconfig'),
+- configuration : conf
++ configuration : pkconf
+ )
+
++# XXX: This can probably be used (after testing), once
++# https://github.com/mesonbuild/meson/pull/1688 is merged
++#pkg = import('pkgconfig')
++#
++#pkg.generate(
++# description : 'GNOME Software is a software center for GNOME',
++# filebase : 'gnome-software',
++# name : 'gnome-software',
++# requires: [ 'gobject-2.0', 'gdk-3.0', 'appstream-glib', 'libsoup-2.4', 'gio-unix-2.0'],
++# requires_private : [ 'gthread-2.0', 'atk' ],
++# subdirs : [ 'gnome-software' ],
++# variables : [ 'plugindir=${libdir}/lib/gs-plugins-' + gs_plugin_api_version ]
++# version : meson.project_version()
++#)
++
+ install_headers([
+ 'gnome-software.h',
+ 'gs-app.h',
+diff --git a/meson.build b/meson.build
+index 2c473a48..10751507 100644
+--- a/meson.build
++++ b/meson.build
+@@ -12,7 +12,8 @@ conf.set_quoted('PACKAGE_VERSION', meson.project_version())
+
+ # this refers to the gnome-software plugin API version
+ # this is not in any way related to a package or soname version
+-conf.set_quoted('GS_PLUGIN_API_VERSION', '11')
++gs_plugin_api_version = '11'
++conf.set_quoted('GS_PLUGIN_API_VERSION', gs_plugin_api_version)
+
+ # install docs
+ install_data('README', install_dir : 'share/doc/gnome-software')
+--
+2.11.0
+
Added: desktop/experimental/gnome-software/debian/patches/0003-build-limba-Set-limba-as-a-dependency.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-software/debian/patches/0003-build-limba-Set-limba-as-a-dependency.patch?rev=52395&op=file
==============================================================================
--- desktop/experimental/gnome-software/debian/patches/0003-build-limba-Set-limba-as-a-dependency.patch (added)
+++ desktop/experimental/gnome-software/debian/patches/0003-build-limba-Set-limba-as-a-dependency.patch [utf-8] Fri May 5 15:46:08 2017
@@ -0,0 +1,26 @@
+From 2b72af15779549dc945b66725811588c2fff2859 Mon Sep 17 00:00:00 2001
+From: Iain Lane <iain at orangesquash.org.uk>
+Date: Thu, 4 May 2017 15:37:13 +0100
+Subject: [PATCH 3/3] build: limba: Set limba as a dependency
+
+We were failing to build the limba plugin because the dependency was
+missing.
+---
+ plugins/limba/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/plugins/limba/meson.build b/plugins/limba/meson.build
+index 55ccd445..e61a2db1 100644
+--- a/plugins/limba/meson.build
++++ b/plugins/limba/meson.build
+@@ -11,6 +11,6 @@ shared_module(
+ install : true,
+ install_dir: plugin_dir,
+ c_args : cargs,
+- dependencies : plugin_libs
++ dependencies : [ plugin_libs, limba ]
+ )
+ endif
+--
+2.11.0
+
Added: desktop/experimental/gnome-software/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-software/debian/patches/series?rev=52395&op=file
==============================================================================
--- desktop/experimental/gnome-software/debian/patches/series (added)
+++ desktop/experimental/gnome-software/debian/patches/series [utf-8] Fri May 5 15:46:08 2017
@@ -0,0 +1,3 @@
+0001-build-Use-the-configured-directory-locations-to-inst.patch
+0002-build-Fix-the-pcfile.patch
+0003-build-limba-Set-limba-as-a-dependency.patch
Modified: desktop/experimental/gnome-software/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-software/debian/rules?rev=52395&op=diff
==============================================================================
--- desktop/experimental/gnome-software/debian/rules [utf-8] (original)
+++ desktop/experimental/gnome-software/debian/rules [utf-8] Fri May 5 15:46:08 2017
@@ -2,19 +2,27 @@
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
-GS_CONFIGURE_FLAGS = --libdir=/usr/lib \
- --disable-ostree \
- --enable-odrs \
- --enable-packagekit \
- --enable-gnome-desktop
+GS_CONFIGURE_FLAGS = \
+ -Denable-gnome-desktop=true \
+ -Denable-odrs=true \
+ -Denable-ostree=false \
+ -Denable-packagekit=true \
+ -Denable-rpm=false \
+
+# these are conditionally re-enabled later
+GS_CONFIGURE_FLAGS += \
+ -Denable-firmware=false \
+ -Denable-flatpak=false \
+ -Denable-limba=false \
+ -Denable-ubuntu-reviews=true
ifeq ($(DEB_HOST_ARCH_OS), linux)
# Enable Flatpak and Limba support on Linux
- GS_CONFIGURE_FLAGS += --enable-limba --enable-flatpak
+ GS_CONFIGURE_FLAGS += -Denable-limba=true -Denable-flatpak=true
# Enable fwupd support on supported architectures
ifneq (,$(findstring $(DEB_HOST_ARCH), amd64 arm64 armhf i386))
- GS_CONFIGURE_FLAGS += --enable-firmware
+ GS_CONFIGURE_FLAGS += -Denable-firmware=true
endif
endif
@@ -23,7 +31,7 @@
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'
+ GS_CONFIGURE_FLAGS += -Denable-ubuntu-reviews=true
else ifeq (yes,$(shell dpkg-vendor --derives-from Tanglu && echo yes))
DISTRO_ID = tanglu
else ifeq (yes,$(shell dpkg-vendor --derives-from PureOS && echo yes))
@@ -34,15 +42,21 @@
INSTALLDIR = $(CURDIR)/debian/tmp
%:
- dh $@ --with autoreconf,gnome
+ dh $@ --with gnome
override_dh_auto_configure:
- dh_auto_configure -- $(GS_CONFIGURE_FLAGS)
+ meson build-deb $(GS_CONFIGURE_FLAGS) \
+ --prefix=/usr \
+ --libexecdir=/usr/lib/$(DEB_HOST_MULTIARCH)/gnome-software/ \
+ --sysconfdir=/etc
+
+override_dh_auto_build:
+ ninja -v -C build-deb
override_dh_auto_install:
- dh_auto_install --destdir=$(INSTALLDIR)
+ DESTDIR=$(INSTALLDIR) ninja -v -C build-deb install
ifneq (yes,$(shell dpkg-vendor --derives-from Ubuntu && echo yes))
- rm -f $(INSTALLDIR)/usr/lib/gs-plugins-*/libgs_plugin_ubuntu*
+ rm -f $(INSTALLDIR)/usr/lib/*/gs-plugins-*/libgs_plugin_ubuntu*
endif
override_dh_installgsettings:
@@ -50,18 +64,19 @@
sed -i 's/@URL@/$(FREE_URL)/g' debian/gnome-software.gsettings-override
dh_installgsettings
-override_dh_install:
+override_dh_install-arch:
# Remove unused files
- rm -f debian/tmp/usr/lib/gs-plugins-*/*.a
- rm -f debian/tmp/usr/lib/gs-plugins-*/*.la
- rm -f debian/tmp/usr/lib/gs-plugins-*/libgs_plugin_fedora*
- dh_install --list-missing
+ rm -f debian/tmp/usr/lib/*/gs-plugins-*/*.a
+ rm -f debian/tmp/usr/lib/*/gs-plugins-*/*.la
+ rm -f debian/tmp/usr/lib/*/gs-plugins-*/libgs_plugin_fedora*
+ dh_install --fail-missing
# These files are split out to separate packages
- rm -f debian/gnome-software/usr/lib/gs-plugins-*/libgs_plugin_flatpak*
- rm -f debian/gnome-software/usr/lib/gs-plugins-*/libgs_plugin_limba*
- rm -f debian/gnome-software/usr/lib/gs-plugins-*/libgs_plugin_ostree*
- rm -f debian/gnome-software/usr/lib/gs-plugins-*/libgs_plugin_snap*
+ rm -f debian/gnome-software/usr/lib/*/gs-plugins-*/libgs_plugin_flatpak*
+ rm -f debian/gnome-software/usr/lib/*/gs-plugins-*/libgs_plugin_limba*
+ rm -f debian/gnome-software/usr/lib/*/gs-plugins-*/libgs_plugin_ostree*
+ rm -f debian/gnome-software/usr/lib/*/gs-plugins-*/libgs_plugin_snap*
+ rm -f debian/gnome-software/usr/share/appdata/org.gnome.Software.Plugin.Flatpak.metainfo.xml
override_dh_makeshlibs:
dh_makeshlibs -Xlibgs_plugin
Modified: desktop/experimental/gnome-software/debian/watch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-software/debian/watch?rev=52395&op=diff
==============================================================================
--- desktop/experimental/gnome-software/debian/watch [utf-8] (original)
+++ desktop/experimental/gnome-software/debian/watch [utf-8] Fri May 5 15:46:08 2017
@@ -1,3 +1,3 @@
version=4
-https://download.gnome.org/sources/@PACKAGE@/([\d\.]+[02468])/ \
+https://download.gnome.org/sources/@PACKAGE@/([\d\.]+)/ \
@PACKAGE@@ANY_VERSION@\.tar\.xz
More information about the pkg-gnome-commits
mailing list