r39851 - in /desktop/experimental/gvfs/debian: ./ patches/

ah at users.alioth.debian.org ah at users.alioth.debian.org
Sun Oct 13 23:39:07 UTC 2013 

Author: ah
Date: Sun Oct 13 23:39:07 2013
New Revision: 39851

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=39851
Log:
* New upstream release.
* Update build-dependencies according to configure.ac:
  - Bump libglib2.0-dev to >= 2.37.0
  - Bump libmtp-dev to >= 1.1.6
  - Bump libimobiledevice-dev to >= 1.1.5
* Make debian/patches/05_shared_libdaemon.patch apply
* Refresh patches:
  - debian/patches/ref-jobs-in-thread.patch
  - debian/patches/build_old_libgphoto.patch
  - debian/patches/handle-inactive-vfs.patch
* Drop debian/patches/00git_testsuite_fixes.patch
* debian/gvfs-common.install:
  - install usr/lib/tmpfiles.d/gvfsd-fuse-tmpfiles.conf

Removed:
    desktop/experimental/gvfs/debian/patches/00git_testsuite_fixes.patch
Modified:
    desktop/experimental/gvfs/debian/changelog
    desktop/experimental/gvfs/debian/control.in
    desktop/experimental/gvfs/debian/gvfs-common.install
    desktop/experimental/gvfs/debian/patches/05_shared_libdaemon.patch
    desktop/experimental/gvfs/debian/patches/build_old_libgphoto.patch
    desktop/experimental/gvfs/debian/patches/handle-inactive-vfs.patch
    desktop/experimental/gvfs/debian/patches/ref-jobs-in-thread.patch
    desktop/experimental/gvfs/debian/patches/series

Modified: desktop/experimental/gvfs/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/changelog?rev=39851&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/changelog	[utf-8] (original)
+++ desktop/experimental/gvfs/debian/changelog	[utf-8] Sun Oct 13 23:39:07 2013
@@ -1,3 +1,21 @@
+gvfs (1.18.2-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+  * Update build-dependencies according to configure.ac:
+    - Bump libglib2.0-dev to >= 2.37.0
+    - Bump libmtp-dev to >= 1.1.6
+    - Bump libimobiledevice-dev to >= 1.1.5
+  * Make debian/patches/05_shared_libdaemon.patch apply
+  * Refresh patches:
+    - debian/patches/ref-jobs-in-thread.patch
+    - debian/patches/build_old_libgphoto.patch
+    - debian/patches/handle-inactive-vfs.patch
+  * Drop debian/patches/00git_testsuite_fixes.patch
+  * debian/gvfs-common.install:
+    - install usr/lib/tmpfiles.d/gvfsd-fuse-tmpfiles.conf
+
+ -- Andreas Henriksson <andreas at fatal.se>  Mon, 14 Oct 2013 00:55:47 +0200
+
 gvfs (1.16.3-1) unstable; urgency=low
 
   * New upstream release.

Modified: desktop/experimental/gvfs/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/control.in?rev=39851&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/control.in	[utf-8] (original)
+++ desktop/experimental/gvfs/debian/control.in	[utf-8] Sun Oct 13 23:39:07 2013
@@ -10,7 +10,7 @@
                gnome-pkg-tools (>= 0.7),
                pkg-config,
                gtk-doc-tools,
-               libglib2.0-dev (>= 2.35.0),
+               libglib2.0-dev (>= 2.37.0),
                libdbus-1-dev,
                intltool (>= 0.35.0),
                openssh-client,
@@ -29,12 +29,12 @@
                libgphoto2-2-dev (>= 2.4.0),
                libsecret-1-dev,
                libbluray-dev,
-               libmtp-dev (>= 1.1.0),
+               libmtp-dev (>= 1.1.6),
                libsmbclient-dev (>= 3.0),
                libarchive-dev,
                libgcrypt11-dev (>= 1.2.2),
                libltdl-dev,
-               libimobiledevice-dev (>= 1.1.0) [!hurd-any],
+               libimobiledevice-dev (>= 1.1.5) [!hurd-any],
                libplist-dev,
                libudisks2-dev (>= 1.97) [linux-any],
                libsystemd-login-dev (>= 44) [linux-any],

Modified: desktop/experimental/gvfs/debian/gvfs-common.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/gvfs-common.install?rev=39851&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/gvfs-common.install	[utf-8] (original)
+++ desktop/experimental/gvfs/debian/gvfs-common.install	[utf-8] Sun Oct 13 23:39:07 2013
@@ -1,3 +1,4 @@
 usr/share/locale
 usr/share/man/man1
 usr/share/man/man7
+usr/lib/tmpfiles.d/gvfsd-fuse-tmpfiles.conf

Modified: desktop/experimental/gvfs/debian/patches/05_shared_libdaemon.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/patches/05_shared_libdaemon.patch?rev=39851&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/patches/05_shared_libdaemon.patch	[utf-8] (original)
+++ desktop/experimental/gvfs/debian/patches/05_shared_libdaemon.patch	[utf-8] Sun Oct 13 23:39:07 2013
@@ -11,10 +11,8 @@
  daemon/Makefile.am |   14 +++++++++++---
  2 files changed, 15 insertions(+), 5 deletions(-)
 
-Index: gvfs-1.16.2/common/Makefile.am
-===================================================================
---- gvfs-1.16.2.orig/common/Makefile.am	2013-05-24 18:24:28.867643627 +0200
-+++ gvfs-1.16.2/common/Makefile.am	2013-05-24 18:24:28.863643583 +0200
+--- a/common/Makefile.am
++++ b/common/Makefile.am
 @@ -1,6 +1,8 @@
  NULL =
  
@@ -34,10 +32,8 @@
  
  libgvfscommon_la_LIBADD =	\
  	$(GLIB_LIBS)		\
-Index: gvfs-1.16.2/daemon/Makefile.am
-===================================================================
---- gvfs-1.16.2.orig/daemon/Makefile.am	2013-05-24 18:24:28.867643627 +0200
-+++ gvfs-1.16.2/daemon/Makefile.am	2013-05-24 18:24:28.863643583 +0200
+--- a/daemon/Makefile.am
++++ b/daemon/Makefile.am
 @@ -18,10 +18,12 @@
  	-DMOUNTABLE_DIR=\"$(mountdir)/\" 	\
  	-DGVFS_LOCALEDIR=\""$(localedir)"\"
@@ -59,10 +55,10 @@
  
 -libdaemon_la_SOURCES = \
 +libgvfsdaemon_la_SOURCES = \
+ 	gvfstypes.h \
  	gvfsdaemon.c gvfsdaemon.h \
  	gvfsbackend.c gvfsbackend.h \
- 	gvfschannel.c gvfschannel.h \
-@@ -198,6 +200,12 @@
+@@ -199,6 +201,12 @@
  	gvfskeyring.h gvfskeyring.c \
          $(NULL)
  

Modified: desktop/experimental/gvfs/debian/patches/build_old_libgphoto.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/patches/build_old_libgphoto.patch?rev=39851&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/patches/build_old_libgphoto.patch	[utf-8] (original)
+++ desktop/experimental/gvfs/debian/patches/build_old_libgphoto.patch	[utf-8] Sun Oct 13 23:39:07 2013
@@ -5,7 +5,7 @@
 
 --- a/configure.ac
 +++ b/configure.ac
-@@ -472,10 +472,6 @@
+@@ -469,10 +469,6 @@
    if test "x$msg_gphoto2" = "xyes"; then
      if test "x$use_gphoto2" = "xyes"; then
        AC_DEFINE(HAVE_GPHOTO2, 1, [Define to 1 if gphoto2 is available])

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=39851&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] Sun Oct 13 23:39:07 2013
@@ -4,7 +4,7 @@
 
 --- a/client/gdaemonvfs.c
 +++ b/client/gdaemonvfs.c
-@@ -1476,7 +1476,7 @@
+@@ -1483,7 +1483,7 @@
  GDBusConnection *
  _g_daemon_vfs_get_async_bus (void)
  {

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=39851&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] Sun Oct 13 23:39:07 2013
@@ -3,7 +3,7 @@
 
 --- a/daemon/gvfsdaemon.c
 +++ b/daemon/gvfsdaemon.c
-@@ -182,6 +182,7 @@
+@@ -198,6 +198,7 @@
    GVfsJob *job = G_VFS_JOB (data);
  
    g_vfs_job_run (job);
@@ -11,7 +11,7 @@
  }
  
  static void
-@@ -574,7 +575,8 @@
+@@ -590,7 +591,8 @@
    if (!g_vfs_job_try (job))
      {
        /* Couldn't finish / run async, queue worker thread */
@@ -21,7 +21,7 @@
      }
  }
  
-@@ -1025,7 +1027,8 @@
+@@ -1057,7 +1059,8 @@
  g_vfs_daemon_run_job_in_thread (GVfsDaemon *daemon,
  				GVfsJob    *job)
  {

Modified: desktop/experimental/gvfs/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/patches/series?rev=39851&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/patches/series	[utf-8] (original)
+++ desktop/experimental/gvfs/debian/patches/series	[utf-8] Sun Oct 13 23:39:07 2013
@@ -1,4 +1,3 @@
-00git_testsuite_fixes.patch
 01_modules_dir.patch
 04_hurd_path_max.patch
 05_shared_libdaemon.patch

More information about the pkg-gnome-commits mailing list