r31341 - in /desktop/experimental/gvfs/debian: changelog control control.in gvfs-backends.install patches/02_deprecated.patch patches/05_shared_libdaemon.patch
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Sun Nov 13 09:38:56 UTC 2011
Author: joss
Date: Sun Nov 13 09:38:56 2011
New Revision: 31341
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=31341
Log:
* New upstream release.
* Bump/add build-dependencies: glib, gdu, libgcrypt, libbluray.
* 02_deprecated.patch: updated for the new version.
* 05_shared_libdaemon.patch: refreshed.
* Install afp backend.
Modified:
desktop/experimental/gvfs/debian/changelog
desktop/experimental/gvfs/debian/control
desktop/experimental/gvfs/debian/control.in
desktop/experimental/gvfs/debian/gvfs-backends.install
desktop/experimental/gvfs/debian/patches/02_deprecated.patch
desktop/experimental/gvfs/debian/patches/05_shared_libdaemon.patch
Modified: desktop/experimental/gvfs/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/changelog?rev=31341&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/changelog [utf-8] (original)
+++ desktop/experimental/gvfs/debian/changelog [utf-8] Sun Nov 13 09:38:56 2011
@@ -1,8 +1,13 @@
-gvfs (1.8.2-3) UNRELEASED; urgency=low
+gvfs (1.10.1-1) experimental; urgency=low
* Fix long description grammar. Closes: #648046.
-
- -- Josselin Mouette <joss at debian.org> Fri, 11 Nov 2011 18:36:12 +0100
+ * New upstream release.
+ * Bump/add build-dependencies: glib, gdu, libgcrypt, libbluray.
+ * 02_deprecated.patch: updated for the new version.
+ * 05_shared_libdaemon.patch: refreshed.
+ * Install afp backend.
+
+ -- Josselin Mouette <joss at debian.org> Sun, 13 Nov 2011 10:38:51 +0100
gvfs (1.8.2-2) unstable; urgency=low
Modified: desktop/experimental/gvfs/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/control?rev=31341&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/control [utf-8] (original)
+++ desktop/experimental/gvfs/debian/control [utf-8] Sun Nov 13 09:38:56 2011
@@ -15,7 +15,7 @@
gnome-pkg-tools (>= 0.7),
pkg-config,
gtk-doc-tools,
- libglib2.0-dev (>= 2.27.4),
+ libglib2.0-dev (>= 2.29.14),
libdbus-1-dev,
intltool (>= 0.35.0),
openssh-client,
@@ -26,7 +26,7 @@
libavahi-client-dev (>= 0.6),
libfuse-dev [!hurd-any],
libhal-dev (>= 0.5.10) [!linux-any],
- libgdu-dev (>= 2.29.0) [linux-any],
+ libgdu-dev (>= 3.0.2) [linux-any],
libgudev-1.0-dev (>= 001) [linux-any],
libcdio-paranoia-dev (>= 0.78.2),
libbluetooth-dev (>= 4.0) [linux-any],
@@ -34,8 +34,10 @@
libexpat1-dev,
libgphoto2-2-dev (>= 2.4.0),
libgnome-keyring-dev,
+ libbluray-dev,
libsmbclient-dev (>= 3.0),
libarchive-dev,
+ libgcrypt11-dev (>= 1.2.2),
libltdl-dev,
libimobiledevice-dev (>= 1.1.0) [!hurd-any],
libplist-dev
@@ -102,8 +104,8 @@
API. It also supports exposing the gvfs mounts to non-gio applications
using fuse.
.
- This package contains the afc, archive, cdda, dav, dnssd, ftp, gphoto2,
- http, network, obexftp, sftp, smb and smb-browse backends.
+ This package contains the afc, afp, archive, cdda, dav, dnssd, ftp,
+ gphoto2, http, network, obexftp, sftp, smb and smb-browse backends.
Package: gvfs-bin
Architecture: any
Modified: desktop/experimental/gvfs/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/control.in?rev=31341&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/control.in [utf-8] (original)
+++ desktop/experimental/gvfs/debian/control.in [utf-8] Sun Nov 13 09:38:56 2011
@@ -10,7 +10,7 @@
gnome-pkg-tools (>= 0.7),
pkg-config,
gtk-doc-tools,
- libglib2.0-dev (>= 2.27.4),
+ libglib2.0-dev (>= 2.29.14),
libdbus-1-dev,
intltool (>= 0.35.0),
openssh-client,
@@ -21,7 +21,7 @@
libavahi-client-dev (>= 0.6),
libfuse-dev [!hurd-any],
libhal-dev (>= 0.5.10) [!linux-any],
- libgdu-dev (>= 2.29.0) [linux-any],
+ libgdu-dev (>= 3.0.2) [linux-any],
libgudev-1.0-dev (>= 001) [linux-any],
libcdio-paranoia-dev (>= 0.78.2),
libbluetooth-dev (>= 4.0) [linux-any],
@@ -29,8 +29,10 @@
libexpat1-dev,
libgphoto2-2-dev (>= 2.4.0),
libgnome-keyring-dev,
+ libbluray-dev,
libsmbclient-dev (>= 3.0),
libarchive-dev,
+ libgcrypt11-dev (>= 1.2.2),
libltdl-dev,
libimobiledevice-dev (>= 1.1.0) [!hurd-any],
libplist-dev
@@ -97,8 +99,8 @@
API. It also supports exposing the gvfs mounts to non-gio applications
using fuse.
.
- This package contains the afc, archive, cdda, dav, dnssd, ftp, gphoto2,
- http, network, obexftp, sftp, smb and smb-browse backends.
+ This package contains the afc, afp, archive, cdda, dav, dnssd, ftp,
+ gphoto2, http, network, obexftp, sftp, smb and smb-browse backends.
Package: gvfs-bin
Architecture: any
Modified: desktop/experimental/gvfs/debian/gvfs-backends.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/gvfs-backends.install?rev=31341&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/gvfs-backends.install [utf-8] (original)
+++ desktop/experimental/gvfs/debian/gvfs-backends.install [utf-8] Sun Nov 13 09:38:56 2011
@@ -1,5 +1,7 @@
# Now installed from debian/rules:
# usr/lib/gvfs/gvfsd-afc
+usr/lib/gvfs/gvfsd-afp
+usr/lib/gvfs/gvfsd-afp-browse
usr/lib/gvfs/gvfsd-archive
usr/lib/gvfs/gvfsd-cdda
usr/lib/gvfs/gvfsd-dav
@@ -23,6 +25,8 @@
# Now installed from debian/rules:
# usr/share/dbus-1/services/org.gtk.Private.GPhoto2VolumeMonitor.service
# usr/share/gvfs/mounts/afc.mount
+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
usr/share/gvfs/mounts/dav.mount
Modified: desktop/experimental/gvfs/debian/patches/02_deprecated.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/patches/02_deprecated.patch?rev=31341&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/patches/02_deprecated.patch [utf-8] (original)
+++ desktop/experimental/gvfs/debian/patches/02_deprecated.patch [utf-8] Sun Nov 13 09:38:56 2011
@@ -1,6 +1,8 @@
---- a/client/Makefile.am
-+++ b/client/Makefile.am
-@@ -5,7 +5,7 @@
+Index: gvfs-1.10.1/client/Makefile.am
+===================================================================
+--- gvfs-1.10.1.orig/client/Makefile.am 2011-10-17 14:48:18.000000000 +0200
++++ gvfs-1.10.1/client/Makefile.am 2011-11-13 09:40:33.764434581 +0100
+@@ -5,7 +5,7 @@ INCLUDES = -I$(top_srcdir) \
-I$(top_srcdir)/metadata \
-I$(top_srcdir)/common \
$(GLIB_CFLAGS) $(DBUS_CFLAGS) \
@@ -9,7 +11,7 @@
-DGVFS_MODULE_DIR=\"$(libdir)/gvfs/modules\" \
-DGVFS_LOCALEDIR=\""$(localedir)"\" \
-DDBUS_API_SUBJECT_TO_CHANGE
-@@ -73,7 +73,7 @@
+@@ -74,7 +74,7 @@ gvfs_fuse_daemon_CFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/common \
$(GLIB_CFLAGS) $(DBUS_CFLAGS) $(FUSE_CFLAGS) \
@@ -18,20 +20,24 @@
-DDBUS_API_SUBJECT_TO_CHANGE
gvfs_fuse_daemon_LDADD = \
---- a/common/Makefile.am
-+++ b/common/Makefile.am
-@@ -5,7 +5,7 @@
+Index: gvfs-1.10.1/common/Makefile.am
+===================================================================
+--- gvfs-1.10.1.orig/common/Makefile.am 2011-10-17 14:48:18.000000000 +0200
++++ gvfs-1.10.1/common/Makefile.am 2011-11-13 09:40:46.024494525 +0100
+@@ -5,7 +5,7 @@ lib_LTLIBRARIES=libgvfscommon.la
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/gvfs \
-I$(top_srcdir)/daemon \
- $(GLIB_CFLAGS) $(DBUS_CFLAGS) $(EXPAT_CFLAGS) \
+ $(GLIB_CFLAGS) $(DBUS_CFLAGS) $(BLURAY_CFLAGS) \
- -DG_LOG_DOMAIN=\"GVFS\" -DG_DISABLE_DEPRECATED \
+ -DG_LOG_DOMAIN=\"GVFS\" \
-DDBUS_API_SUBJECT_TO_CHANGE
libgvfscommon_la_SOURCES = \
---- a/daemon/Makefile.am
-+++ b/daemon/Makefile.am
-@@ -17,7 +17,7 @@
+Index: gvfs-1.10.1/daemon/Makefile.am
+===================================================================
+--- gvfs-1.10.1.orig/daemon/Makefile.am 2011-10-17 14:48:18.000000000 +0200
++++ gvfs-1.10.1/daemon/Makefile.am 2011-11-13 09:40:33.764434581 +0100
+@@ -17,7 +17,7 @@ INCLUDES = \
-DLIBEXEC_DIR=\"$(libexecdir)/\" \
-DMOUNTABLE_DIR=\"$(mountdir)/\" \
-DGVFS_LOCALEDIR=\""$(localedir)"\" \
@@ -40,9 +46,11 @@
noinst_LTLIBRARIES=libdaemon.la
---- a/monitor/gphoto2/Makefile.am
-+++ b/monitor/gphoto2/Makefile.am
-@@ -39,7 +39,6 @@
+Index: gvfs-1.10.1/monitor/gphoto2/Makefile.am
+===================================================================
+--- gvfs-1.10.1.orig/monitor/gphoto2/Makefile.am 2011-10-17 14:48:18.000000000 +0200
++++ gvfs-1.10.1/monitor/gphoto2/Makefile.am 2011-11-13 09:40:33.764434581 +0100
+@@ -39,7 +39,6 @@ gvfs_gphoto2_volume_monitor_CFLAGS = \
$(GPHOTO2_CFLAGS) \
-DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\" \
-DGVFS_LOCALEDIR=\""$(localedir)"\" \
@@ -50,9 +58,11 @@
-DG_UDEV_API_IS_SUBJECT_TO_CHANGE \
$(NULL)
---- a/monitor/hal/Makefile.am
-+++ b/monitor/hal/Makefile.am
-@@ -33,7 +33,6 @@
+Index: gvfs-1.10.1/monitor/hal/Makefile.am
+===================================================================
+--- gvfs-1.10.1.orig/monitor/hal/Makefile.am 2011-10-17 14:48:18.000000000 +0200
++++ gvfs-1.10.1/monitor/hal/Makefile.am 2011-11-13 09:40:33.764434581 +0100
+@@ -33,7 +33,6 @@ gvfs_hal_volume_monitor_CFLAGS = \
$(HAL_CFLAGS) \
-DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\" \
-DGVFS_LOCALEDIR=\""$(localedir)"\" \
@@ -60,9 +70,11 @@
$(NULL)
gvfs_hal_volume_monitor_LDFLAGS = \
---- a/monitor/proxy/Makefile.am
-+++ b/monitor/proxy/Makefile.am
-@@ -25,7 +25,6 @@
+Index: gvfs-1.10.1/monitor/proxy/Makefile.am
+===================================================================
+--- gvfs-1.10.1.orig/monitor/proxy/Makefile.am 2011-10-17 14:48:18.000000000 +0200
++++ gvfs-1.10.1/monitor/proxy/Makefile.am 2011-11-13 09:40:33.764434581 +0100
+@@ -25,7 +25,6 @@ libgioremote_volume_monitor_la_CFLAGS =
-DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\" \
-DREMOTE_VOLUME_MONITORS_DIR=\"$(remote_volume_monitorsdir)\" \
-DGVFS_LOCALEDIR=\""$(localedir)"\" \
@@ -70,7 +82,7 @@
$(NULL)
libgioremote_volume_monitor_la_LDFLAGS = \
-@@ -53,7 +52,6 @@
+@@ -53,7 +52,6 @@ libgvfsproxyvolumemonitordaemon_noin_la_
$(GDU_CFLAGS) \
-DG_LOG_DOMAIN=\"GVFS-RemoteVolumeMonitorDaemon\" \
-DGVFS_LOCALEDIR=\""$(localedir)"\" \
@@ -78,9 +90,11 @@
$(NULL)
libgvfsproxyvolumemonitordaemon_noin_la_LIBADD = \
---- a/programs/Makefile.am
-+++ b/programs/Makefile.am
-@@ -5,7 +5,7 @@
+Index: gvfs-1.10.1/programs/Makefile.am
+===================================================================
+--- gvfs-1.10.1.orig/programs/Makefile.am 2011-10-17 14:48:18.000000000 +0200
++++ gvfs-1.10.1/programs/Makefile.am 2011-11-13 09:40:33.764434581 +0100
+@@ -5,7 +5,7 @@ INCLUDES = \
-I$(top_builddir) \
$(GLIB_CFLAGS) \
-DGVFS_LOCALEDIR=\""$(localedir)"\" \
@@ -89,9 +103,11 @@
libraries = \
$(GLIB_LIBS)
---- a/test/Makefile.am
-+++ b/test/Makefile.am
-@@ -4,7 +4,7 @@
+Index: gvfs-1.10.1/test/Makefile.am
+===================================================================
+--- gvfs-1.10.1.orig/test/Makefile.am 2011-10-17 14:48:18.000000000 +0200
++++ gvfs-1.10.1/test/Makefile.am 2011-11-13 09:40:33.764434581 +0100
+@@ -4,7 +4,7 @@ AM_CFLAGS = \
-I$(top_srcdir) \
-I$(top_builddir) \
$(GLIB_CFLAGS) \
@@ -100,3 +116,40 @@
AM_LDFLAGS = \
$(GLIB_LIBS)
+Index: gvfs-1.10.1/metadata/Makefile.am
+===================================================================
+--- gvfs-1.10.1.orig/metadata/Makefile.am 2011-10-17 14:48:18.364514085 +0200
++++ gvfs-1.10.1/metadata/Makefile.am 2011-11-13 09:41:31.624717456 +0100
+@@ -23,7 +23,7 @@ INCLUDES = -I$(top_srcdir) -I$(top_srcdi
+ $(LIBXML_CFLAGS) $(GLIB_CFLAGS) $(DBUS_CFLAGS) \
+ $(UDEV_CFLAGS) \
+ -DGVFS_LOCALEDIR=\""$(localedir)"\" \
+- -DG_LOG_DOMAIN=\"GVFS\" -DG_DISABLE_DEPRECATED \
++ -DG_LOG_DOMAIN=\"GVFS\" \
+ -DDBUS_API_SUBJECT_TO_CHANGE
+
+ libmetadata_la_SOURCES = \
+Index: gvfs-1.10.1/monitor/afc/Makefile.am
+===================================================================
+--- gvfs-1.10.1.orig/monitor/afc/Makefile.am 2011-10-17 14:48:18.364514085 +0200
++++ gvfs-1.10.1/monitor/afc/Makefile.am 2011-11-13 09:41:18.752654517 +0100
+@@ -19,7 +19,6 @@ gvfs_afc_volume_monitor_CFLAGS = \
+ $(WARN_CFLAGS) \
+ -DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\" \
+ -DGVFS_LOCALEDIR=\"$(localedir)\" \
+- -DG_DISABLE_DEPRECATED \
+ $(NULL)
+
+ gvfs_afc_volume_monitor_LDADD = \
+Index: gvfs-1.10.1/monitor/gdu/Makefile.am
+===================================================================
+--- gvfs-1.10.1.orig/monitor/gdu/Makefile.am 2011-10-17 14:48:18.364514085 +0200
++++ gvfs-1.10.1/monitor/gdu/Makefile.am 2011-11-13 09:41:06.096592627 +0100
+@@ -22,7 +22,6 @@ gvfs_gdu_volume_monitor_CFLAGS = \
+ $(DBUS_CFLAGS) \
+ -DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\" \
+ -DGVFS_LOCALEDIR=\""$(localedir)"\" \
+- -DG_DISABLE_DEPRECATED \
+ -DGDU_API_IS_SUBJECT_TO_CHANGE \
+ $(NULL)
+
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=31341&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 Nov 13 09:38:56 2011
@@ -1,6 +1,8 @@
---- a/daemon/Makefile.am
-+++ b/daemon/Makefile.am
-@@ -19,12 +19,14 @@
+Index: gvfs-1.10.1/daemon/Makefile.am
+===================================================================
+--- gvfs-1.10.1.orig/daemon/Makefile.am 2011-11-13 09:41:56.004836632 +0100
++++ gvfs-1.10.1/daemon/Makefile.am 2011-11-13 09:42:19.372950874 +0100
+@@ -19,12 +19,14 @@ INCLUDES = \
-DGVFS_LOCALEDIR=\""$(localedir)"\" \
$(NULL)
@@ -18,7 +20,7 @@
gvfs_gschemas =
gvfs_gschemas_convert =
-@@ -127,7 +129,7 @@
+@@ -133,7 +135,7 @@ noinst_PROGRAMS = \
gvfsd-test \
$(NULL)
@@ -27,7 +29,7 @@
gvfsdaemon.c gvfsdaemon.h \
gvfsbackend.c gvfsbackend.h \
gvfschannel.c gvfschannel.h \
-@@ -175,6 +177,12 @@
+@@ -181,6 +183,12 @@ libdaemon_la_SOURCES = \
gvfskeyring.h gvfskeyring.c \
$(NULL)
@@ -40,8 +42,10 @@
gvfsd_SOURCES = \
mount.c mount.h \
main.c
---- a/common/Makefile.am
-+++ b/common/Makefile.am
+Index: gvfs-1.10.1/common/Makefile.am
+===================================================================
+--- gvfs-1.10.1.orig/common/Makefile.am 2011-11-13 09:41:56.004836632 +0100
++++ gvfs-1.10.1/common/Makefile.am 2011-11-13 09:42:19.372950874 +0100
@@ -1,6 +1,8 @@
NULL =
@@ -52,7 +56,7 @@
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/gvfs \
-I$(top_srcdir)/daemon \
-@@ -22,7 +24,7 @@
+@@ -22,7 +24,7 @@ libgvfscommon_la_SOURCES = \
$(NULL)
# needed by cygwin (see bug #564003)
@@ -61,8 +65,8 @@
libgvfscommon_la_LIBADD = \
$(DBUS_LIBS) \
-@@ -30,7 +32,7 @@
- $(EXPAT_LIBS)
+@@ -30,7 +32,7 @@ libgvfscommon_la_LIBADD = \
+ $(BLURAY_LIBS)
if HAVE_AVAHI
-lib_LTLIBRARIES += libgvfscommon-dnssd.la
@@ -70,7 +74,7 @@
libgvfscommon_dnssd_la_SOURCES = \
gvfsdnssdutils.c gvfsdnssdutils.h \
-@@ -40,6 +42,8 @@
+@@ -40,6 +42,8 @@ libgvfscommon_dnssd_la_SOURCES = \
libgvfscommon_dnssd_la_CFLAGS = \
$(AVAHI_CFLAGS)
More information about the pkg-gnome-commits
mailing list