r22277 - in /desktop/unstable/gvfs/debian: changelog control.in gvfs-backends.install patches/04_hurd_path_max.patch rules
pochu at users.alioth.debian.org
pochu at users.alioth.debian.org
Tue Nov 10 22:04:57 UTC 2009
Author: pochu
Date: Tue Nov 10 22:04:57 2009
New Revision: 22277
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=22277
Log:
* debian/patches/04_hurd_path_max.patch:
- Fix the build in the Hurd.
* debian/control.in:
- Build-dep on libcdio-paranoia-dev on the Hurd now that it's available
there.
* debian/gvfs-backends.install,
debian/rules:
- Don't install the gphoto2 backend on the Hurd.
* Thanks to Samuel Thibault for all the above. This closes: #555055.
Added:
desktop/unstable/gvfs/debian/patches/04_hurd_path_max.patch
Modified:
desktop/unstable/gvfs/debian/changelog
desktop/unstable/gvfs/debian/control.in
desktop/unstable/gvfs/debian/gvfs-backends.install
desktop/unstable/gvfs/debian/rules
Modified: desktop/unstable/gvfs/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gvfs/debian/changelog?rev=22277&op=diff
==============================================================================
--- desktop/unstable/gvfs/debian/changelog [utf-8] (original)
+++ desktop/unstable/gvfs/debian/changelog [utf-8] Tue Nov 10 22:04:57 2009
@@ -1,3 +1,17 @@
+gvfs (1.4.1-3) unstable; urgency=low
+
+ * debian/patches/04_hurd_path_max.patch:
+ - Fix the build in the Hurd.
+ * debian/control.in:
+ - Build-dep on libcdio-paranoia-dev on the Hurd now that it's available
+ there.
+ * debian/gvfs-backends.install,
+ debian/rules:
+ - Don't install the gphoto2 backend on the Hurd.
+ * Thanks to Samuel Thibault for all the above. This closes: #555055.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org> Tue, 10 Nov 2009 23:08:45 +0100
+
gvfs (1.4.1-2) unstable; urgency=low
* Disable GDU because of the ide-cd fiasco in devicekit-disks.
Modified: desktop/unstable/gvfs/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gvfs/debian/control.in?rev=22277&op=diff
==============================================================================
--- desktop/unstable/gvfs/debian/control.in [utf-8] (original)
+++ desktop/unstable/gvfs/debian/control.in [utf-8] Tue Nov 10 22:04:57 2009
@@ -23,7 +23,7 @@
libgconf2-dev,
libhal-dev (>= 0.5.10),
libgudev-1.0-dev (>= 001) | not+linux-gnu,
- libcdio-paranoia-dev (>= 0.78.2) | hurd,
+ libcdio-paranoia-dev (>= 0.78.2),
libbluetooth-dev (>= 4.0) | not+linux-gnu,
libdbus-glib-1-dev,
libexpat1-dev,
Modified: desktop/unstable/gvfs/debian/gvfs-backends.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gvfs/debian/gvfs-backends.install?rev=22277&op=diff
==============================================================================
--- desktop/unstable/gvfs/debian/gvfs-backends.install [utf-8] (original)
+++ desktop/unstable/gvfs/debian/gvfs-backends.install [utf-8] Tue Nov 10 22:04:57 2009
@@ -3,7 +3,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-gphoto2
+# Now installed from debian/rules:
+# debian/tmp/usr/lib/gvfs/gvfsd-gphoto2
debian/tmp/usr/lib/gvfs/gvfsd-http
debian/tmp/usr/lib/gvfs/gvfsd-network
# Now installed from debian/rules:
@@ -11,16 +12,19 @@
debian/tmp/usr/lib/gvfs/gvfsd-sftp
debian/tmp/usr/lib/gvfs/gvfsd-smb
debian/tmp/usr/lib/gvfs/gvfsd-smb-browse
-debian/tmp/usr/lib/gvfs/gvfs-gphoto2-volume-monitor
+# Now installed from debian/rules:
+# debian/tmp/usr/lib/gvfs/gvfs-gphoto2-volume-monitor
debian/tmp/usr/lib/libgvfscommon-dnssd.so.*
-debian/tmp/usr/share/dbus-1/services/org.gtk.Private.GPhoto2VolumeMonitor.service
+# Now installed from debian/rules:
+# debian/tmp/usr/share/dbus-1/services/org.gtk.Private.GPhoto2VolumeMonitor.service
debian/tmp/usr/share/gvfs/mounts/archive.mount
debian/tmp/usr/share/gvfs/mounts/cdda.mount
debian/tmp/usr/share/gvfs/mounts/dav.mount
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/gphoto2.mount
+# Now installed from debian/rules:
+# debian/tmp/usr/share/gvfs/mounts/gphoto2.mount
debian/tmp/usr/share/gvfs/mounts/http.mount
debian/tmp/usr/share/gvfs/mounts/network.mount
# Now installed from debian/rules:
Added: desktop/unstable/gvfs/debian/patches/04_hurd_path_max.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gvfs/debian/patches/04_hurd_path_max.patch?rev=22277&op=file
==============================================================================
--- desktop/unstable/gvfs/debian/patches/04_hurd_path_max.patch (added)
+++ desktop/unstable/gvfs/debian/patches/04_hurd_path_max.patch [utf-8] Tue Nov 10 22:04:57 2009
@@ -1,0 +1,90 @@
+--- ./monitor/hal/ghalvolumemonitor.c.orig 2009-11-08 00:15:19.000000000 +0000
++++ ./monitor/hal/ghalvolumemonitor.c 2009-11-08 00:18:53.000000000 +0000
+@@ -739,11 +739,23 @@
+ }
+ else
+ {
+- char resolved_device_path[PATH_MAX];
+ /* handle symlinks such as /dev/disk/by-uuid/47C2-1994 */
++#ifdef __GLIBC__
++ char *resolved_device_path;
++ resolved_device_path = realpath (device_path, NULL);
++ if (resolved_device_path != NULL &&
++ strcmp (resolved_device_path, device_file) == 0)
++ {
++ free (resolved_device_path);
++ return mount_point;
++ }
++ free (resolved_device_path);
++#else
++ char resolved_device_path[PATH_MAX];
+ if (realpath (device_path, resolved_device_path) != NULL &&
+ strcmp (resolved_device_path, device_file) == 0)
+ return mount_point;
++#endif
+ }
+ }
+
+--- ./monitor/gdu/ggduvolumemonitor.c.orig 2009-11-08 00:17:33.000000000 +0000
++++ ./monitor/gdu/ggduvolumemonitor.c 2009-11-08 00:22:27.000000000 +0000
+@@ -695,15 +695,27 @@
+ }
+ else
+ {
++ /* handle symlinks such as /dev/disk/by-uuid/47C2-1994 */
++#ifdef __GLIBC__
++ char *resolved_fstab_device_file;
++ resolved_fstab_device_file = realpath (fstab_device_file, NULL);
++ if (resolved_fstab_device_file != NULL &&
++ g_strcmp0 (resolved_fstab_device_file, device_file) == 0)
++ {
++ free (resolved_fstab_device_file);
++ goto out;
++ }
++ free(resolved_fstab_device_file);
++#else
+ char resolved_fstab_device_file[PATH_MAX];
+
+- /* handle symlinks such as /dev/disk/by-uuid/47C2-1994 */
+ if (realpath (fstab_device_file, resolved_fstab_device_file) != NULL &&
+ g_strcmp0 (resolved_fstab_device_file, device_file) == 0)
+ {
+ ret = mount_point;
+ goto out;
+ }
++#endif
+ }
+ }
+
+@@ -1384,15 +1396,29 @@
+ device_file = g_unix_mount_point_get_device_path (mount_point);
+ if (g_str_has_prefix (device_file, "/dev/"))
+ {
+- gchar resolved_path[PATH_MAX];
+ GduDevice *device;
++#ifdef __GLIBC__
++ gchar *resolved_path;
++
++ /* doesn't exist */
++ resolved_path = realpath (device_file, NULL);
++ if (resolved_path == NULL) {
++ free(resolved_path);
++ continue;
++ }
++#else
++ gchar resolved_path[PATH_MAX];
+
+ /* doesn't exist */
+- if (realpath (device_file, resolved_path) != 0)
++ if (realpath (device_file, resolved_path) == NULL)
+ continue;
++#endif
+
+ /* is handled by DKD */
+ device = gdu_pool_get_by_device_file (monitor->pool, resolved_path);
++#ifdef __GLIBC__
++ free(resolved_path);
++#endif
+ if (device != NULL)
+ {
+ g_object_unref (device);
Modified: desktop/unstable/gvfs/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gvfs/debian/rules?rev=22277&op=diff
==============================================================================
--- desktop/unstable/gvfs/debian/rules [utf-8] (original)
+++ desktop/unstable/gvfs/debian/rules [utf-8] Tue Nov 10 22:04:57 2009
@@ -26,13 +26,21 @@
--center="Debian GNU/Linux" $< $@
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-obexftp \
debian/tmp/usr/share/gvfs/mounts/obexftp.mount
+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-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
endif
DEB_INSTALL_MANPAGES_gvfs += $(MANPAGES)
More information about the pkg-gnome-commits
mailing list