r45940 - in /desktop/experimental/gvfs/debian: ./ patches/
ah at users.alioth.debian.org
ah at users.alioth.debian.org
Thu Sep 17 13:49:00 UTC 2015
Author: ah
Date: Thu Sep 17 13:49:00 2015
New Revision: 45940
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=45940
Log:
* New upstream release candidate.
* Drop obsolete patch debian/patches/add-support-for-libsystemd.patch
* Have quilt refresh remaining patches to apply cleanly.
* Update build-dependencies according to configure.ac:
- Bump libglib2.0-dev to >= 2.45.7
- Add libgcr-3-dev
* Use dh-exec install arch filter instead of debian/rules installation
* Bump debian/compat to 9 for executable debian/*.install to work.
* Add debian/source.lintian-overrides for dh-exec related overrides.
* gvfs-backends: ship new usr/share/gvfs/mounts/ftps.mount
Added:
desktop/experimental/gvfs/debian/source.lintian-overrides
Removed:
desktop/experimental/gvfs/debian/patches/add-support-for-libsystemd.patch
Modified:
desktop/experimental/gvfs/debian/changelog
desktop/experimental/gvfs/debian/compat
desktop/experimental/gvfs/debian/control
desktop/experimental/gvfs/debian/control.in
desktop/experimental/gvfs/debian/gvfs-backends.install (contents, props changed)
desktop/experimental/gvfs/debian/gvfs-daemons.install (contents, props changed)
desktop/experimental/gvfs/debian/patches/01_modules_dir.patch
desktop/experimental/gvfs/debian/patches/dont-crash-on-null-job.patch
desktop/experimental/gvfs/debian/patches/handle-inactive-vfs.patch
desktop/experimental/gvfs/debian/patches/metadata-nuke-junk-data.patch
desktop/experimental/gvfs/debian/patches/ref-jobs-in-thread.patch
desktop/experimental/gvfs/debian/patches/series
desktop/experimental/gvfs/debian/rules
Modified: desktop/experimental/gvfs/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/changelog?rev=45940&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/changelog [utf-8] (original)
+++ desktop/experimental/gvfs/debian/changelog [utf-8] Thu Sep 17 13:49:00 2015
@@ -1,3 +1,18 @@
+gvfs (1.25.92-1) experimental; urgency=medium
+
+ * New upstream release candidate.
+ * Drop obsolete patch debian/patches/add-support-for-libsystemd.patch
+ * Have quilt refresh remaining patches to apply cleanly.
+ * Update build-dependencies according to configure.ac:
+ - Bump libglib2.0-dev to >= 2.45.7
+ - Add libgcr-3-dev
+ * Use dh-exec install arch filter instead of debian/rules installation
+ * Bump debian/compat to 9 for executable debian/*.install to work.
+ * Add debian/source.lintian-overrides for dh-exec related overrides.
+ * gvfs-backends: ship new usr/share/gvfs/mounts/ftps.mount
+
+ -- Andreas Henriksson <andreas at fatal.se> Thu, 17 Sep 2015 15:37:16 +0200
+
gvfs (1.24.2-1) unstable; urgency=medium
* New upstream bugfix release.
Modified: desktop/experimental/gvfs/debian/compat
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/compat?rev=45940&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/compat [utf-8] (original)
+++ desktop/experimental/gvfs/debian/compat [utf-8] Thu Sep 17 13:49:00 2015
@@ -1 +1 @@
-8
+9
Modified: desktop/experimental/gvfs/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/control?rev=45940&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/control [utf-8] (original)
+++ desktop/experimental/gvfs/debian/control [utf-8] Thu Sep 17 13:49:00 2015
@@ -7,14 +7,15 @@
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
Uploaders: Andreas Henriksson <andreas at fatal.se>, Iain Lane <laney at debian.org>, Josselin Mouette <joss at debian.org>, Michael Biebl <biebl at debian.org>
-Build-Depends: debhelper (>= 8.1.3),
+Build-Depends: debhelper (>= 9),
+ dh-exec (>= 0.13),
autotools-dev,
cdbs (>= 0.4.93),
dh-autoreconf,
gnome-pkg-tools (>= 0.7),
pkg-config,
gtk-doc-tools,
- libglib2.0-dev (>= 2.43.2),
+ libglib2.0-dev (>= 2.45.7),
libdbus-1-dev,
intltool (>= 0.35.0),
openssh-client,
@@ -41,6 +42,7 @@
libplist-dev,
libudisks2-dev (>= 1.97) [linux-any],
libsystemd-dev [linux-any],
+ libgcr-3-dev,
libgtk-3-dev
Standards-Version: 3.9.6
Homepage: https://wiki.gnome.org/Projects/gvfs
Modified: desktop/experimental/gvfs/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/control.in?rev=45940&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/control.in [utf-8] (original)
+++ desktop/experimental/gvfs/debian/control.in [utf-8] Thu Sep 17 13:49:00 2015
@@ -3,14 +3,15 @@
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
Uploaders: @GNOME_TEAM@
-Build-Depends: debhelper (>= 8.1.3),
+Build-Depends: debhelper (>= 9),
+ dh-exec (>= 0.13),
autotools-dev,
cdbs (>= 0.4.93),
dh-autoreconf,
gnome-pkg-tools (>= 0.7),
pkg-config,
gtk-doc-tools,
- libglib2.0-dev (>= 2.43.2),
+ libglib2.0-dev (>= 2.45.7),
libdbus-1-dev,
intltool (>= 0.35.0),
openssh-client,
@@ -37,6 +38,7 @@
libplist-dev,
libudisks2-dev (>= 1.97) [linux-any],
libsystemd-dev [linux-any],
+ libgcr-3-dev,
libgtk-3-dev
Standards-Version: 3.9.6
Homepage: https://wiki.gnome.org/Projects/gvfs
Modified: desktop/experimental/gvfs/debian/gvfs-backends.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/gvfs-backends.install?rev=45940&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/gvfs-backends.install [utf-8] (original)
+++ desktop/experimental/gvfs/debian/gvfs-backends.install [utf-8] Thu Sep 17 13:49:00 2015
@@ -1,45 +1,50 @@
-# Now installed from debian/rules:
-# usr/lib/gvfs/gvfsd-afc
+#!/usr/bin/dh-exec
+usr/lib/gvfs/gvfsd-afc [!hurd-any]
usr/lib/gvfs/gvfsd-afp
usr/lib/gvfs/gvfsd-afp-browse
usr/lib/gvfs/gvfsd-archive
+usr/lib/gvfs/gvfsd-cdda [linux-any]
usr/lib/gvfs/gvfsd-dav
usr/lib/gvfs/gvfsd-dnssd
usr/lib/gvfs/gvfsd-ftp
-# Now installed from debian/rules:
-# usr/lib/gvfs/gvfsd-gphoto2
+usr/lib/gvfs/gvfsd-gphoto2 [linux-any]
+usr/lib/gvfs/gvfs-goa-volume-monitor [!hurd-any]
+usr/share/dbus-1/services/org.gtk.vfs.GoaVolumeMonitor.service [!hurd-any]
usr/lib/gvfs/gvfsd-http
+usr/lib/gvfs/gvfsd-mtp [linux-any]
+usr/lib/gvfs/gvfs-mtp-volume-monitor [linux-any]
+usr/share/dbus-1/services/org.gtk.vfs.MTPVolumeMonitor.service [linux-any]
usr/lib/gvfs/gvfsd-network
usr/lib/gvfs/gvfsd-recent
usr/lib/gvfs/gvfsd-sftp
usr/lib/gvfs/gvfsd-smb
usr/lib/gvfs/gvfsd-smb-browse
-# Now installed from debian/rules:
-# usr/lib/gvfs/gvfs-afc-volume-monitor
-# usr/share/dbus-1/services/org.gtk.Private.AfcVolumeMonitor.service
-# Now installed from debian/rules:
-# usr/lib/gvfs/gvfs-gphoto2-volume-monitor
-# Now installed from debian/rules:
-# usr/share/dbus-1/services/org.gtk.Private.GPhoto2VolumeMonitor.service
-# usr/share/gvfs/mounts/afc.mount
+usr/lib/gvfs/gvfs-afc-volume-monitor [!hurd-any]
+usr/share/dbus-1/services/org.gtk.vfs.AfcVolumeMonitor.service [!hurd-any]
+usr/lib/gvfs/gvfs-gphoto2-volume-monitor [linux-any]
+usr/share/dbus-1/services/org.gtk.vfs.GPhoto2VolumeMonitor.service [linux-any]
+usr/share/gvfs/mounts/afc.mount [!hurd-any]
usr/share/gvfs/mounts/afp.mount
usr/share/gvfs/mounts/afp-browse.mount
usr/share/gvfs/mounts/archive.mount
+usr/share/gvfs/mounts/cdda.mount [linux-any]
usr/share/gvfs/mounts/dav.mount
usr/share/gvfs/mounts/dav+sd.mount
usr/share/gvfs/mounts/dns-sd.mount
usr/share/gvfs/mounts/ftp.mount
-# Now installed from debian/rules:
-# usr/share/gvfs/mounts/gphoto2.mount
+usr/share/gvfs/mounts/ftps.mount
+usr/share/gvfs/mounts/gphoto2.mount [linux-any]
usr/share/gvfs/mounts/http.mount
+usr/share/gvfs/mounts/mtp.mount [linux-any]
usr/share/gvfs/mounts/network.mount
usr/share/gvfs/mounts/recent.mount
usr/share/gvfs/mounts/sftp.mount
usr/share/gvfs/mounts/smb-browse.mount
usr/share/gvfs/mounts/smb.mount
-# Now installed from debian/rules:
-# usr/share/gvfs/remote-volume-monitors/gphoto2.monitor
-# usr/share/gvfs/remote-volume-monitors/afc.monitor
+usr/share/gvfs/remote-volume-monitors/gphoto2.monitor [linux-any]
+usr/share/gvfs/remote-volume-monitors/goa.monitor [!hurd-any]
+usr/share/gvfs/remote-volume-monitors/afc.monitor [!hurd-any]
+usr/share/gvfs/remote-volume-monitors/mtp.monitor [linux-any]
# Schemas moved from gvfs-common, only used for smb and dns-sd
usr/share/glib-2.0
usr/share/GConf
Propchange: desktop/experimental/gvfs/debian/gvfs-backends.install
------------------------------------------------------------------------------
svn:executable = *
Modified: desktop/experimental/gvfs/debian/gvfs-daemons.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/gvfs-daemons.install?rev=45940&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/gvfs-daemons.install [utf-8] (original)
+++ desktop/experimental/gvfs/debian/gvfs-daemons.install [utf-8] Thu Sep 17 13:49:00 2015
@@ -1,3 +1,4 @@
+#!/usr/bin/dh-exec
usr/lib/gvfs/gvfsd
usr/lib/gvfs/gvfsd-burn
usr/lib/gvfs/gvfsd-computer
@@ -10,7 +11,6 @@
usr/share/gvfs/mounts/computer.mount
usr/share/gvfs/mounts/localtest.mount
usr/share/gvfs/mounts/trash.mount
-# Now installed from debian/rules
-# usr/lib/gvfs/gvfs-udisks2-volume-monitor
-# usr/share/dbus-1/services/org.gtk.Private.UDisks2.VolumeMonitor.service
-# usr/share/gvfs/remote-volume-monitors/udisks2.monitor
+usr/lib/gvfs/gvfs-udisks2-volume-monitor [linux-any]
+usr/share/dbus-1/services/org.gtk.vfs.UDisks2VolumeMonitor.service [linux-any]
+usr/share/gvfs/remote-volume-monitors/udisks2.monitor [linux-any]
Propchange: desktop/experimental/gvfs/debian/gvfs-daemons.install
------------------------------------------------------------------------------
svn:executable = *
Modified: desktop/experimental/gvfs/debian/patches/01_modules_dir.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/patches/01_modules_dir.patch?rev=45940&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/patches/01_modules_dir.patch [utf-8] (original)
+++ desktop/experimental/gvfs/debian/patches/01_modules_dir.patch [utf-8] Thu Sep 17 13:49:00 2015
@@ -8,4 +8,4 @@
+giomodulesdir=`$PKG_CONFIG --variable=giomoduledir gio-2.0`
AC_SUBST(giomodulesdir)
- dnl ****************************
+ dnl *********************
Modified: desktop/experimental/gvfs/debian/patches/dont-crash-on-null-job.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/patches/dont-crash-on-null-job.patch?rev=45940&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/patches/dont-crash-on-null-job.patch [utf-8] (original)
+++ desktop/experimental/gvfs/debian/patches/dont-crash-on-null-job.patch [utf-8] Thu Sep 17 13:49:00 2015
@@ -2,11 +2,9 @@
Origin: vendor, Ubuntu
Bug-Ubuntu: LP #345754, #838464
-Index: gvfs-1.22.1/daemon/gvfschannel.c
-===================================================================
---- gvfs-1.22.1.orig/daemon/gvfschannel.c 2014-10-13 15:47:06.258335776 +0200
-+++ gvfs-1.22.1/daemon/gvfschannel.c 2014-10-13 15:47:06.258335776 +0200
-@@ -603,7 +603,8 @@
+--- a/daemon/gvfschannel.c
++++ b/daemon/gvfschannel.c
+@@ -611,7 +611,8 @@
job = channel->priv->current_job;
channel->priv->current_job = NULL;
@@ -16,7 +14,7 @@
class = G_VFS_CHANNEL_GET_CLASS (channel);
-@@ -624,7 +625,7 @@
+@@ -632,7 +633,7 @@
}
/* Start queued request or readahead */
else if (!start_queued_request (channel) &&
Modified: desktop/experimental/gvfs/debian/patches/handle-inactive-vfs.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/patches/handle-inactive-vfs.patch?rev=45940&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/patches/handle-inactive-vfs.patch [utf-8] (original)
+++ desktop/experimental/gvfs/debian/patches/handle-inactive-vfs.patch [utf-8] Thu Sep 17 13:49:00 2015
@@ -2,11 +2,9 @@
Origin: vendor, Ubuntu
Bug-Ubuntu: LP #832533
-Index: gvfs-1.22.1/client/gdaemonvfs.c
-===================================================================
---- gvfs-1.22.1.orig/client/gdaemonvfs.c 2014-10-13 15:47:09.482390820 +0200
-+++ gvfs-1.22.1/client/gdaemonvfs.c 2014-10-13 15:47:09.478390751 +0200
-@@ -1459,7 +1459,7 @@
+--- a/client/gdaemonvfs.c
++++ b/client/gdaemonvfs.c
+@@ -1443,7 +1443,7 @@
GDBusConnection *
_g_daemon_vfs_get_async_bus (void)
{
Modified: desktop/experimental/gvfs/debian/patches/metadata-nuke-junk-data.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/patches/metadata-nuke-junk-data.patch?rev=45940&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/patches/metadata-nuke-junk-data.patch [utf-8] (original)
+++ desktop/experimental/gvfs/debian/patches/metadata-nuke-junk-data.patch [utf-8] Thu Sep 17 13:49:00 2015
@@ -7,11 +7,9 @@
metadata/metatree.c | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
-Index: b/metadata/metatree.c
-===================================================================
--- a/metadata/metatree.c
+++ b/metadata/metatree.c
-@@ -420,7 +420,15 @@
+@@ -445,7 +445,15 @@
if (memcmp (tree->header->magic, MAGIC, MAGIC_LEN) != 0)
{
g_warning ("can't init metadata tree %s: wrong magic", tree->filename);
Modified: desktop/experimental/gvfs/debian/patches/ref-jobs-in-thread.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/patches/ref-jobs-in-thread.patch?rev=45940&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/patches/ref-jobs-in-thread.patch [utf-8] (original)
+++ desktop/experimental/gvfs/debian/patches/ref-jobs-in-thread.patch [utf-8] Thu Sep 17 13:49:00 2015
@@ -1,11 +1,9 @@
Description: make sure to keep a ref to jobs while they run in a thread
Origin: vendor, Ubuntu
-Index: gvfs-1.22.1/daemon/gvfsdaemon.c
-===================================================================
---- gvfs-1.22.1.orig/daemon/gvfsdaemon.c 2014-10-13 15:47:13.298456084 +0200
-+++ gvfs-1.22.1/daemon/gvfsdaemon.c 2014-10-13 15:47:13.294456016 +0200
-@@ -201,6 +201,7 @@
+--- a/daemon/gvfsdaemon.c
++++ b/daemon/gvfsdaemon.c
+@@ -206,6 +206,7 @@
GVfsJob *job = G_VFS_JOB (data);
g_vfs_job_run (job);
@@ -13,7 +11,7 @@
}
static void
-@@ -593,7 +594,8 @@
+@@ -599,7 +600,8 @@
if (!g_vfs_job_try (job))
{
/* Couldn't finish / run async, queue worker thread */
@@ -23,7 +21,7 @@
}
}
-@@ -1091,7 +1093,8 @@
+@@ -1115,7 +1117,8 @@
g_vfs_daemon_run_job_in_thread (GVfsDaemon *daemon,
GVfsJob *job)
{
@@ -33,11 +31,9 @@
}
void
-Index: gvfs-1.22.1/daemon/gvfschannel.c
-===================================================================
---- gvfs-1.22.1.orig/daemon/gvfschannel.c 2014-10-13 15:47:13.298456084 +0200
-+++ gvfs-1.22.1/daemon/gvfschannel.c 2014-10-13 15:47:13.294456016 +0200
-@@ -635,6 +635,7 @@
+--- a/daemon/gvfschannel.c
++++ b/daemon/gvfschannel.c
+@@ -643,6 +643,7 @@
}
g_object_unref (job);
@@ -45,7 +41,7 @@
}
/* Might be called on an i/o thread */
-@@ -658,7 +659,7 @@
+@@ -666,7 +667,7 @@
channel->priv->reply_buffer,
G_VFS_DAEMON_SOCKET_PROTOCOL_REPLY_SIZE,
0, NULL,
@@ -54,7 +50,7 @@
}
else
{
-@@ -667,7 +668,7 @@
+@@ -675,7 +676,7 @@
channel->priv->output_data,
channel->priv->output_data_size,
0, NULL,
Modified: desktop/experimental/gvfs/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/patches/series?rev=45940&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gvfs/debian/patches/series [utf-8] Thu Sep 17 13:49:00 2015
@@ -4,4 +4,3 @@
dont-crash-on-null-job.patch
handle-inactive-vfs.patch
ref-jobs-in-thread.patch
-add-support-for-libsystemd.patch
Modified: desktop/experimental/gvfs/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/rules?rev=45940&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/rules [utf-8] (original)
+++ desktop/experimental/gvfs/debian/rules [utf-8] Thu Sep 17 13:49:00 2015
@@ -19,43 +19,3 @@
--libexecdir=/usr/lib/gvfs \
--disable-hal
-ifeq ($(DEB_HOST_ARCH_OS),linux)
-
-install/gvfs-backends::
- # Those are only available on Linux:
- dh_install --autodest -pgvfs-backends --ignore=debian/gvfs-backends.install \
- debian/tmp/usr/lib/gvfs/gvfsd-gphoto2 \
- debian/tmp/usr/lib/gvfs/gvfs-gphoto2-volume-monitor \
- debian/tmp/usr/share/dbus-1/services/org.gtk.Private.GPhoto2VolumeMonitor.service \
- debian/tmp/usr/share/gvfs/mounts/gphoto2.mount \
- debian/tmp/usr/share/gvfs/remote-volume-monitors/gphoto2.monitor \
- debian/tmp/usr/lib/gvfs/gvfsd-cdda \
- debian/tmp/usr/share/gvfs/mounts/cdda.mount \
- debian/tmp/usr/lib/gvfs/gvfsd-mtp \
- debian/tmp/usr/lib/gvfs/gvfs-mtp-volume-monitor \
- debian/tmp/usr/share/gvfs/mounts/mtp.mount \
- debian/tmp/usr/share/dbus-1/services/org.gtk.Private.MTPVolumeMonitor.service \
- debian/tmp/usr/share/gvfs/remote-volume-monitors/mtp.monitor
-
-
-install/gvfs::
- dh_install --autodest -pgvfs-daemons --ignore=debian/gvfs-daemons.install \
- debian/tmp/usr/lib/gvfs/gvfs-udisks2-volume-monitor \
- debian/tmp/usr/share/dbus-1/services/org.gtk.Private.UDisks2VolumeMonitor.service \
- debian/tmp/usr/share/gvfs/remote-volume-monitors/udisks2.monitor
-
-endif
-
-ifneq ($(DEB_HOST_ARCH_OS),hurd)
-install/gvfs-backends::
- dh_install --autodest -pgvfs-backends --ignore=debian/gvfs-backends.install \
- debian/tmp/usr/lib/gvfs/gvfsd-afc \
- debian/tmp/usr/lib/gvfs/gvfs-afc-volume-monitor \
- debian/tmp/usr/share/dbus-1/services/org.gtk.Private.AfcVolumeMonitor.service \
- debian/tmp/usr/share/gvfs/mounts/afc.mount \
- debian/tmp/usr/share/gvfs/remote-volume-monitors/afc.monitor \
- debian/tmp/usr/share/dbus-1/services/org.gtk.Private.GoaVolumeMonitor.service \
- debian/tmp/usr/share/gvfs/remote-volume-monitors/goa.monitor \
- debian/tmp/usr/lib/gvfs/gvfs-goa-volume-monitor
-endif
-
Added: desktop/experimental/gvfs/debian/source.lintian-overrides
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/source.lintian-overrides?rev=45940&op=file
==============================================================================
--- desktop/experimental/gvfs/debian/source.lintian-overrides (added)
+++ desktop/experimental/gvfs/debian/source.lintian-overrides [utf-8] Thu Sep 17 13:49:00 2015
@@ -0,0 +1,3 @@
+# lintian needs updating to detect dh-exec >= 0.13 features.
+gvfs source: dh-exec-script-without-dh-exec-features debian/gvfs-backends.install
+gvfs source: dh-exec-script-without-dh-exec-features debian/gvfs-daemons.install
More information about the pkg-gnome-commits
mailing list