r30097 - in /desktop/experimental/gvfs/debian: changelog control control.in gvfs-backends.install patches/02_deprecated.patch patches/03_xdg-mount.patch patches/04_hurd_path_max.patch patches/05_shared_libdaemon.patch
ah at users.alioth.debian.org
ah at users.alioth.debian.org
Fri Oct 7 13:05:55 UTC 2011
Author: ah
Date: Fri Oct 7 13:05:54 2011
New Revision: 30097
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=30097
Log:
Update for new upstream release.
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/03_xdg-mount.patch
desktop/experimental/gvfs/debian/patches/04_hurd_path_max.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=30097&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/changelog [utf-8] (original)
+++ desktop/experimental/gvfs/debian/changelog [utf-8] Fri Oct 7 13:05:54 2011
@@ -1,4 +1,4 @@
-gvfs (1.8.2-2) UNRELEASED; urgency=low
+gvfs (1.10.0-1) UNRELEASED; urgency=low
[ Josselin Mouette ]
* Break glib < 2.28.6-2. Closes: #628811.
@@ -8,7 +8,17 @@
[ Martin Pitt ]
* debian/watch: Look for tar.bz2, upstream stopped publishing tar.gz.
- -- Josselin Mouette <joss at debian.org> Thu, 02 Jun 2011 18:56:00 +0200
+ [ Andreas Henriksson ]
+ * New upstream release.
+ + debian/control.in:
+ - Bump glib and gdu build dependencies.
+ - Add libbluray-dev and libgcrypt11-dev build-deps.
+ + debian/gvfs-backends.install:
+ - install new Apple Filing Protocol (gvfsd-afp) backend.
+ + debian/patches/*:
+ - update and refresh patches.
+
+ -- Andreas Henriksson <andreas at fatal.se> Fri, 07 Oct 2011 12:59:04 +0200
gvfs (1.8.2-1) experimental; urgency=low
Modified: desktop/experimental/gvfs/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/control?rev=30097&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/control [utf-8] (original)
+++ desktop/experimental/gvfs/debian/control [utf-8] Fri Oct 7 13:05:54 2011
@@ -14,7 +14,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,
@@ -25,7 +25,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],
@@ -37,7 +37,9 @@
libarchive-dev,
libltdl-dev,
libimobiledevice-dev (>= 1.1.0) [!hurd-any],
- libplist-dev
+ libplist-dev,
+ libbluray-dev,
+ libgcrypt11-dev
Standards-Version: 3.9.2
Section: gnome
Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/gvfs
Modified: desktop/experimental/gvfs/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/control.in?rev=30097&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/control.in [utf-8] (original)
+++ desktop/experimental/gvfs/debian/control.in [utf-8] Fri Oct 7 13:05:54 2011
@@ -9,7 +9,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,
@@ -20,7 +20,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],
@@ -32,7 +32,9 @@
libarchive-dev,
libltdl-dev,
libimobiledevice-dev (>= 1.1.0) [!hurd-any],
- libplist-dev
+ libplist-dev,
+ libbluray-dev,
+ libgcrypt11-dev
Standards-Version: 3.9.2
Section: gnome
Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/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=30097&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/gvfs-backends.install [utf-8] (original)
+++ desktop/experimental/gvfs/debian/gvfs-backends.install [utf-8] Fri Oct 7 13:05:54 2011
@@ -5,6 +5,8 @@
debian/tmp/usr/lib/gvfs/gvfsd-dav
debian/tmp/usr/lib/gvfs/gvfsd-dnssd
debian/tmp/usr/lib/gvfs/gvfsd-ftp
+debian/tmp/usr/lib/gvfs/gvfsd-afp
+debian/tmp/usr/lib/gvfs/gvfsd-afp-browse
# Now installed from debian/rules:
# debian/tmp/usr/lib/gvfs/gvfsd-gphoto2
debian/tmp/usr/lib/gvfs/gvfsd-http
@@ -29,6 +31,8 @@
debian/tmp/usr/share/gvfs/mounts/dav+sd.mount
debian/tmp/usr/share/gvfs/mounts/dns-sd.mount
debian/tmp/usr/share/gvfs/mounts/ftp.mount
+debian/tmp/usr/share/gvfs/mounts/afp.mount
+debian/tmp/usr/share/gvfs/mounts/afp-browse.mount
# Now installed from debian/rules:
# debian/tmp/usr/share/gvfs/mounts/gphoto2.mount
debian/tmp/usr/share/gvfs/mounts/http.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=30097&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/patches/02_deprecated.patch [utf-8] (original)
+++ desktop/experimental/gvfs/debian/patches/02_deprecated.patch [utf-8] Fri Oct 7 13:05:54 2011
@@ -1,47 +1,7 @@
---- a/client/Makefile.am
-+++ b/client/Makefile.am
-@@ -5,7 +5,7 @@
- -I$(top_srcdir)/metadata \
- -I$(top_srcdir)/common \
- $(GLIB_CFLAGS) $(DBUS_CFLAGS) \
-- -DG_LOG_DOMAIN=\"GVFS\" -DG_DISABLE_DEPRECATED \
-+ -DG_LOG_DOMAIN=\"GVFS\" \
- -DGVFS_MODULE_DIR=\"$(libdir)/gvfs/modules\" \
- -DGVFS_LOCALEDIR=\""$(localedir)"\" \
- -DDBUS_API_SUBJECT_TO_CHANGE
-@@ -73,7 +73,7 @@
- -I$(top_srcdir) \
- -I$(top_srcdir)/common \
- $(GLIB_CFLAGS) $(DBUS_CFLAGS) $(FUSE_CFLAGS) \
-- -UG_LOG_DOMAIN -DG_LOG_DOMAIN=\"GVFS-FUSE\" -DG_DISABLE_DEPRECATED \
-+ -UG_LOG_DOMAIN -DG_LOG_DOMAIN=\"GVFS-FUSE\" \
- -DDBUS_API_SUBJECT_TO_CHANGE
-
- gvfs_fuse_daemon_LDADD = \
---- a/common/Makefile.am
-+++ b/common/Makefile.am
-@@ -5,7 +5,7 @@
- INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/gvfs \
- -I$(top_srcdir)/daemon \
- $(GLIB_CFLAGS) $(DBUS_CFLAGS) $(EXPAT_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 @@
- -DLIBEXEC_DIR=\"$(libexecdir)/\" \
- -DMOUNTABLE_DIR=\"$(mountdir)/\" \
- -DGVFS_LOCALEDIR=\""$(localedir)"\" \
-- -DG_DISABLE_DEPRECATED
-+ $(NULL)
-
- noinst_LTLIBRARIES=libdaemon.la
-
---- a/monitor/gphoto2/Makefile.am
-+++ b/monitor/gphoto2/Makefile.am
+Index: gvfs-1.10.0/monitor/gphoto2/Makefile.am
+===================================================================
+--- gvfs-1.10.0.orig/monitor/gphoto2/Makefile.am 2011-09-26 15:14:03.000000000 +0200
++++ gvfs-1.10.0/monitor/gphoto2/Makefile.am 2011-10-07 13:57:35.000000000 +0200
@@ -39,7 +39,6 @@
$(GPHOTO2_CFLAGS) \
-DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\" \
@@ -50,8 +10,10 @@
-DG_UDEV_API_IS_SUBJECT_TO_CHANGE \
$(NULL)
---- a/monitor/hal/Makefile.am
-+++ b/monitor/hal/Makefile.am
+Index: gvfs-1.10.0/monitor/hal/Makefile.am
+===================================================================
+--- gvfs-1.10.0.orig/monitor/hal/Makefile.am 2011-09-26 15:14:03.000000000 +0200
++++ gvfs-1.10.0/monitor/hal/Makefile.am 2011-10-07 13:57:35.000000000 +0200
@@ -33,7 +33,6 @@
$(HAL_CFLAGS) \
-DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\" \
@@ -60,8 +22,10 @@
$(NULL)
gvfs_hal_volume_monitor_LDFLAGS = \
---- a/monitor/proxy/Makefile.am
-+++ b/monitor/proxy/Makefile.am
+Index: gvfs-1.10.0/monitor/proxy/Makefile.am
+===================================================================
+--- gvfs-1.10.0.orig/monitor/proxy/Makefile.am 2011-09-26 15:14:03.000000000 +0200
++++ gvfs-1.10.0/monitor/proxy/Makefile.am 2011-10-07 13:57:35.000000000 +0200
@@ -25,7 +25,6 @@
-DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\" \
-DREMOTE_VOLUME_MONITORS_DIR=\"$(remote_volume_monitorsdir)\" \
@@ -78,8 +42,95 @@
$(NULL)
libgvfsproxyvolumemonitordaemon_noin_la_LIBADD = \
---- a/programs/Makefile.am
-+++ b/programs/Makefile.am
+Index: gvfs-1.10.0/metadata/Makefile.am
+===================================================================
+--- gvfs-1.10.0.orig/metadata/Makefile.am 2011-09-26 15:14:03.000000000 +0200
++++ gvfs-1.10.0/metadata/Makefile.am 2011-10-07 13:57:35.000000000 +0200
+@@ -23,7 +23,7 @@
+ $(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.0/client/Makefile.am
+===================================================================
+--- gvfs-1.10.0.orig/client/Makefile.am 2011-09-26 15:14:03.000000000 +0200
++++ gvfs-1.10.0/client/Makefile.am 2011-10-07 13:57:35.000000000 +0200
+@@ -5,7 +5,7 @@
+ -I$(top_srcdir)/metadata \
+ -I$(top_srcdir)/common \
+ $(GLIB_CFLAGS) $(DBUS_CFLAGS) \
+- -DG_LOG_DOMAIN=\"GVFS\" -DG_DISABLE_DEPRECATED \
++ -DG_LOG_DOMAIN=\"GVFS\" \
+ -DGVFS_MODULE_DIR=\"$(libdir)/gvfs/modules\" \
+ -DGVFS_LOCALEDIR=\""$(localedir)"\" \
+ -DDBUS_API_SUBJECT_TO_CHANGE
+@@ -74,7 +74,7 @@
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/common \
+ $(GLIB_CFLAGS) $(DBUS_CFLAGS) $(FUSE_CFLAGS) \
+- -UG_LOG_DOMAIN -DG_LOG_DOMAIN=\"GVFS-FUSE\" -DG_DISABLE_DEPRECATED \
++ -UG_LOG_DOMAIN -DG_LOG_DOMAIN=\"GVFS-FUSE\" \
+ -DDBUS_API_SUBJECT_TO_CHANGE
+
+ gvfs_fuse_daemon_LDADD = \
+Index: gvfs-1.10.0/common/Makefile.am
+===================================================================
+--- gvfs-1.10.0.orig/common/Makefile.am 2011-09-26 15:14:03.000000000 +0200
++++ gvfs-1.10.0/common/Makefile.am 2011-10-07 13:57:35.000000000 +0200
+@@ -5,7 +5,7 @@
+ INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/gvfs \
+ -I$(top_srcdir)/daemon \
+ $(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 = \
+Index: gvfs-1.10.0/daemon/Makefile.am
+===================================================================
+--- gvfs-1.10.0.orig/daemon/Makefile.am 2011-09-26 15:14:03.000000000 +0200
++++ gvfs-1.10.0/daemon/Makefile.am 2011-10-07 13:57:35.000000000 +0200
+@@ -17,7 +17,7 @@
+ -DLIBEXEC_DIR=\"$(libexecdir)/\" \
+ -DMOUNTABLE_DIR=\"$(mountdir)/\" \
+ -DGVFS_LOCALEDIR=\""$(localedir)"\" \
+- -DG_DISABLE_DEPRECATED
++ $(NULL)
+
+ noinst_LTLIBRARIES=libdaemon.la
+
+Index: gvfs-1.10.0/monitor/afc/Makefile.am
+===================================================================
+--- gvfs-1.10.0.orig/monitor/afc/Makefile.am 2011-09-26 15:14:03.000000000 +0200
++++ gvfs-1.10.0/monitor/afc/Makefile.am 2011-10-07 13:57:35.000000000 +0200
+@@ -19,7 +19,6 @@
+ $(WARN_CFLAGS) \
+ -DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\" \
+ -DGVFS_LOCALEDIR=\"$(localedir)\" \
+- -DG_DISABLE_DEPRECATED \
+ $(NULL)
+
+ gvfs_afc_volume_monitor_LDADD = \
+Index: gvfs-1.10.0/monitor/gdu/Makefile.am
+===================================================================
+--- gvfs-1.10.0.orig/monitor/gdu/Makefile.am 2011-09-26 15:14:03.000000000 +0200
++++ gvfs-1.10.0/monitor/gdu/Makefile.am 2011-10-07 13:57:35.000000000 +0200
+@@ -22,7 +22,6 @@
+ $(DBUS_CFLAGS) \
+ -DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\" \
+ -DGVFS_LOCALEDIR=\""$(localedir)"\" \
+- -DG_DISABLE_DEPRECATED \
+ -DGDU_API_IS_SUBJECT_TO_CHANGE \
+ $(NULL)
+
+Index: gvfs-1.10.0/programs/Makefile.am
+===================================================================
+--- gvfs-1.10.0.orig/programs/Makefile.am 2011-09-26 15:14:03.000000000 +0200
++++ gvfs-1.10.0/programs/Makefile.am 2011-10-07 13:57:35.000000000 +0200
@@ -5,7 +5,7 @@
-I$(top_builddir) \
$(GLIB_CFLAGS) \
@@ -89,8 +140,10 @@
libraries = \
$(GLIB_LIBS)
---- a/test/Makefile.am
-+++ b/test/Makefile.am
+Index: gvfs-1.10.0/test/Makefile.am
+===================================================================
+--- gvfs-1.10.0.orig/test/Makefile.am 2011-09-26 15:14:03.000000000 +0200
++++ gvfs-1.10.0/test/Makefile.am 2011-10-07 13:57:35.000000000 +0200
@@ -4,7 +4,7 @@
-I$(top_srcdir) \
-I$(top_builddir) \
Modified: desktop/experimental/gvfs/debian/patches/03_xdg-mount.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/patches/03_xdg-mount.patch?rev=30097&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/patches/03_xdg-mount.patch [utf-8] (original)
+++ desktop/experimental/gvfs/debian/patches/03_xdg-mount.patch [utf-8] Fri Oct 7 13:05:54 2011
@@ -1,10 +1,10 @@
Note: Since we --disable-hal these days, this patch is only useful on
non-Linux architectures.
-Index: b/monitor/hal/ghaldrive.c
+Index: gvfs-1.10.0/monitor/hal/ghaldrive.c
===================================================================
---- a/monitor/hal/ghaldrive.c 2010-05-31 10:31:50.106446532 +0200
-+++ b/monitor/hal/ghaldrive.c 2010-05-31 10:32:10.522446609 +0200
+--- gvfs-1.10.0.orig/monitor/hal/ghaldrive.c 2011-09-26 15:14:03.000000000 +0200
++++ gvfs-1.10.0/monitor/hal/ghaldrive.c 2011-10-07 13:57:40.000000000 +0200
@@ -545,9 +545,19 @@
if (WEXITSTATUS (status) != 0)
{
@@ -49,10 +49,10 @@
}
-Index: b/monitor/hal/ghalmount.c
+Index: gvfs-1.10.0/monitor/hal/ghalmount.c
===================================================================
---- a/monitor/hal/ghalmount.c 2010-05-31 10:31:49.982446557 +0200
-+++ b/monitor/hal/ghalmount.c 2010-05-31 10:32:10.522446609 +0200
+--- gvfs-1.10.0.orig/monitor/hal/ghalmount.c 2011-09-26 15:14:03.000000000 +0200
++++ gvfs-1.10.0/monitor/hal/ghalmount.c 2011-10-07 13:57:40.000000000 +0200
@@ -786,30 +786,31 @@
if (WEXITSTATUS (status) != 0)
@@ -115,10 +115,10 @@
else
{
using_legacy = TRUE;
-Index: b/monitor/hal/ghalvolume.c
+Index: gvfs-1.10.0/monitor/hal/ghalvolume.c
===================================================================
---- a/monitor/hal/ghalvolume.c 2010-05-31 10:31:50.042446637 +0200
-+++ b/monitor/hal/ghalvolume.c 2010-05-31 10:32:10.866444321 +0200
+--- gvfs-1.10.0.orig/monitor/hal/ghalvolume.c 2011-09-26 15:14:03.000000000 +0200
++++ gvfs-1.10.0/monitor/hal/ghalvolume.c 2011-10-07 13:57:40.000000000 +0200
@@ -702,9 +702,19 @@
if (WEXITSTATUS (status) != 0)
{
Modified: desktop/experimental/gvfs/debian/patches/04_hurd_path_max.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/patches/04_hurd_path_max.patch?rev=30097&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/patches/04_hurd_path_max.patch [utf-8] (original)
+++ desktop/experimental/gvfs/debian/patches/04_hurd_path_max.patch [utf-8] Fri Oct 7 13:05:54 2011
@@ -1,10 +1,10 @@
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=555055
https://bugzilla.gnome.org/show_bug.cgi?id=601497
-Index: gvfs-experimental/monitor/hal/ghalvolumemonitor.c
+Index: gvfs-1.10.0/monitor/hal/ghalvolumemonitor.c
===================================================================
---- gvfs-experimental.orig/monitor/hal/ghalvolumemonitor.c 2011-04-26 14:25:12.000000000 +0200
-+++ gvfs-experimental/monitor/hal/ghalvolumemonitor.c 2011-05-17 16:38:54.956764883 +0200
+--- gvfs-1.10.0.orig/monitor/hal/ghalvolumemonitor.c 2011-09-26 15:14:03.000000000 +0200
++++ gvfs-1.10.0/monitor/hal/ghalvolumemonitor.c 2011-10-07 13:57:47.000000000 +0200
@@ -739,11 +739,23 @@
}
else
@@ -30,10 +30,10 @@
}
}
-Index: gvfs-experimental/monitor/gdu/ggduvolumemonitor.c
+Index: gvfs-1.10.0/monitor/gdu/ggduvolumemonitor.c
===================================================================
---- gvfs-experimental.orig/monitor/gdu/ggduvolumemonitor.c 2011-04-26 14:25:12.000000000 +0200
-+++ gvfs-experimental/monitor/gdu/ggduvolumemonitor.c 2011-05-17 16:40:03.586764915 +0200
+--- gvfs-1.10.0.orig/monitor/gdu/ggduvolumemonitor.c 2011-09-26 15:14:03.000000000 +0200
++++ gvfs-1.10.0/monitor/gdu/ggduvolumemonitor.c 2011-10-07 13:57:47.000000000 +0200
@@ -695,15 +695,28 @@
}
else
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=30097&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] Fri Oct 7 13:05:54 2011
@@ -1,5 +1,7 @@
---- a/daemon/Makefile.am
-+++ b/daemon/Makefile.am
+Index: gvfs-1.10.0/daemon/Makefile.am
+===================================================================
+--- gvfs-1.10.0.orig/daemon/Makefile.am 2011-10-07 13:57:35.000000000 +0200
++++ gvfs-1.10.0/daemon/Makefile.am 2011-10-07 13:57:54.000000000 +0200
@@ -19,12 +19,14 @@
-DGVFS_LOCALEDIR=\""$(localedir)"\" \
$(NULL)
@@ -18,7 +20,7 @@
gvfs_gschemas =
gvfs_gschemas_convert =
-@@ -127,7 +129,7 @@
+@@ -133,7 +135,7 @@
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 @@
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.0/common/Makefile.am
+===================================================================
+--- gvfs-1.10.0.orig/common/Makefile.am 2011-10-07 13:57:35.000000000 +0200
++++ gvfs-1.10.0/common/Makefile.am 2011-10-07 13:57:54.000000000 +0200
@@ -1,6 +1,8 @@
NULL =
@@ -62,7 +66,7 @@
libgvfscommon_la_LIBADD = \
$(DBUS_LIBS) \
@@ -30,7 +32,7 @@
- $(EXPAT_LIBS)
+ $(BLURAY_LIBS)
if HAVE_AVAHI
-lib_LTLIBRARIES += libgvfscommon-dnssd.la
More information about the pkg-gnome-commits
mailing list