r12226 - in /desktop/experimental/gnome-vfs2: ./ debian/changelog debian/control debian/patches/14_app_cdda.patch debian/patches/15_uuid_mount.patch debian/patches/16_no_extra_dbus_messages.patch debian/patches/series

he at users.alioth.debian.org he at users.alioth.debian.org
Fri Aug 3 15:58:02 UTC 2007


Author: he
Date: Fri Aug  3 15:58:02 2007
New Revision: 12226

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=12226
Log:
* New upstream release - no ABI and API changes.
* debian/patches synced a bit with the Ubuntu tree:
  + 14_app_cdda.patch: Register sound-juicer as default application
    for cdda URLs
  + 15_uuid_mount.patch: Look at disk UUIDs to not display dupes of
    the same disks.
  + 16_no_extra_dbus_messages.patch: Turn off some annoying warnings
    when dbus isn't running.

Added:
    desktop/experimental/gnome-vfs2/
      - copied from r12225, desktop/unstable/gnome-vfs2/
    desktop/experimental/gnome-vfs2/debian/patches/14_app_cdda.patch
    desktop/experimental/gnome-vfs2/debian/patches/15_uuid_mount.patch
    desktop/experimental/gnome-vfs2/debian/patches/16_no_extra_dbus_messages.patch
Modified:
    desktop/experimental/gnome-vfs2/debian/changelog
    desktop/experimental/gnome-vfs2/debian/control
    desktop/experimental/gnome-vfs2/debian/patches/series

Modified: desktop/experimental/gnome-vfs2/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-vfs2/debian/changelog?rev=12226&op=diff
==============================================================================
--- desktop/experimental/gnome-vfs2/debian/changelog (original)
+++ desktop/experimental/gnome-vfs2/debian/changelog Fri Aug  3 15:58:02 2007
@@ -1,9 +1,20 @@
-gnome-vfs2 (1:2.18.1-4) UNRELEASED; urgency=low
-
+gnome-vfs2 (1:2.19.3-1) experimental; urgency=low
+
+  [ Loic Minier ]
   * Build-dep on linux-libc-dev instead of linux-kernel-headers; keep the
     version intact.
 
- -- Loic Minier <lool at dooz.org>  Sun, 15 Jul 2007 00:11:40 +0200
+  [ Marc 'HE' Brockschmidt ]
+  * New upstream release - no ABI and API changes.
+  * debian/patches synced a bit with the Ubuntu tree:
+    + 14_app_cdda.patch: Register sound-juicer as default application
+      for cdda URLs
+    + 15_uuid_mount.patch: Look at disk UUIDs to not display dupes of
+      the same disks.
+    + 16_no_extra_dbus_messages.patch: Turn off some annoying warnings
+      when dbus isn't running.
+
+ -- Marc 'HE' Brockschmidt <he at debian.org>  Fri, 03 Aug 2007 17:22:58 +0200
 
 gnome-vfs2 (1:2.18.1-3) unstable; urgency=low
 

Modified: desktop/experimental/gnome-vfs2/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-vfs2/debian/control?rev=12226&op=diff
==============================================================================
--- desktop/experimental/gnome-vfs2/debian/control (original)
+++ desktop/experimental/gnome-vfs2/debian/control Fri Aug  3 15:58:02 2007
@@ -2,7 +2,7 @@
 Section: libs
 Priority: optional
 Maintainer: Josselin Mouette <joss at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Loic Minier <lool at dooz.org>, Sebastian Dröge <slomo at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Loic Minier <lool at dooz.org>, Marc 'HE' Brockschmidt <he at debian.org>, Sebastian Dröge <slomo at debian.org>
 Build-Depends: cdbs,
                quilt,
                type-handling,

Added: desktop/experimental/gnome-vfs2/debian/patches/14_app_cdda.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-vfs2/debian/patches/14_app_cdda.patch?rev=12226&op=file
==============================================================================
--- desktop/experimental/gnome-vfs2/debian/patches/14_app_cdda.patch (added)
+++ desktop/experimental/gnome-vfs2/debian/patches/14_app_cdda.patch Fri Aug  3 15:58:02 2007
@@ -1,0 +1,44 @@
+diff -Nur gnome-vfs2-2.12.0.orig/schemas/desktop_gnome_url_handlers.schemas.in gnome-vfs2-2.12.0/schemas/desktop_gnome_url_handlers.schemas.in
+--- gnome-vfs2-2.12.0.orig/schemas/desktop_gnome_url_handlers.schemas.in	2004-08-14 16:08:28.000000000 +0200
++++ gnome-vfs2-2.12.0/schemas/desktop_gnome_url_handlers.schemas.in	2005-09-29 15:16:04.000000000 +0200
+@@ -172,6 +172,40 @@
+     </schema>
+ 
+     <schema>
++      <key>/schemas/desktop/gnome/url-handlers/cdda/enabled</key>
++      <applyto>/desktop/gnome/url-handlers/cdda/enabled</applyto>
++      <owner>gnome</owner>
++      <type>bool</type>
++      <default>true</default>
++      <locale name="C">
++        <short>Whether the specified command should handle "cdda" URLs</short>
++        <long>True if the command specified in the "command" key should handle "cdda" URLs.</long>
++      </locale>
++    </schema>
++    <schema>
++      <key>/schemas/desktop/gnome/url-handlers/cdda/command</key>
++      <applyto>/desktop/gnome/url-handlers/cdda/command</applyto>
++      <owner>gnome</owner>
++      <type>string</type>
++      <default>sound-juicer %s</default>
++      <locale name="C">
++        <short>The handler for "cdda" URLs</short>
++        <long>The command used to handle "cdda" URLs, if enabled.</long>
++      </locale>
++    </schema>
++    <schema>
++      <key>/schemas/desktop/gnome/url-handlers/cdda/needs_terminal</key>
++      <applyto>/desktop/gnome/url-handlers/cdda/needs_terminal</applyto>
++      <owner>gnome</owner>
++      <type>bool</type>
++      <default>false</default>
++      <locale name="C">
++        <short>Run the command in a terminal</short>
++        <long>True if the command used to handle this type of URL should be run in a terminal.</long>
++      </locale>
++    </schema>
++
++    <schema>
+       <key>/schemas/desktop/gnome/url-handlers/https/enabled</key>
+       <applyto>/desktop/gnome/url-handlers/https/enabled</applyto>
+       <owner>gnome</owner>

Added: desktop/experimental/gnome-vfs2/debian/patches/15_uuid_mount.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-vfs2/debian/patches/15_uuid_mount.patch?rev=12226&op=file
==============================================================================
--- desktop/experimental/gnome-vfs2/debian/patches/15_uuid_mount.patch (added)
+++ desktop/experimental/gnome-vfs2/debian/patches/15_uuid_mount.patch Fri Aug  3 15:58:02 2007
@@ -1,0 +1,50 @@
+diff -Nur gnome-vfs2-2.16.0/libgnomevfs/gnome-vfs-unix-mounts.c gnome-vfs2-2.16.0.new/libgnomevfs/gnome-vfs-unix-mounts.c
+--- gnome-vfs2-2.16.0/libgnomevfs/gnome-vfs-unix-mounts.c	2006-03-27 11:05:42.000000000 +0200
++++ gnome-vfs2-2.16.0.new/libgnomevfs/gnome-vfs-unix-mounts.c	2006-09-25 14:23:15.000000000 +0200
+@@ -290,6 +290,15 @@
+ 
+ 		mount_entry->mount_path = g_strdup (mntent->mnt_dir);
+ 		mount_entry->device_path = g_strdup (mntent->mnt_fsname);
++
++		if (g_file_test (mntent->mnt_fsname, G_FILE_TEST_IS_SYMLINK)) {
++			char rpath[PATH_MAX];
++			if (realpath (mntent->mnt_fsname, rpath)) {
++				g_free (mount_entry->device_path);
++				mount_entry->device_path = g_strdup (rpath);
++			}
++		}
++
+ 		mount_entry->filesystem_type = g_strdup (mntent->mnt_type);
+ 		
+ 		g_hash_table_insert (mounts_hash,
+@@ -574,6 +583,30 @@
+ 
+ 		mount_entry->mount_path = g_strdup (mntent->mnt_dir);
+ 		mount_entry->device_path = g_strdup (mntent->mnt_fsname);
++
++		if(strlen(mount_entry->device_path) >= 5 && !strncmp (mount_entry->device_path, "UUID=", 5)) {
++			gchar *device_path;
++
++			device_path = g_strdup_printf ("/dev/disk/by-uuid/%s", mount_entry->device_path+5);
++			   
++			if (g_file_test (device_path, G_FILE_TEST_IS_SYMLINK)) {
++				char rpath[PATH_MAX];
++				if (realpath (device_path, rpath)) {
++					g_free (mount_entry->device_path);
++					mount_entry->device_path = g_strdup (rpath);
++				}
++				else {
++					g_free (device_path);
++					continue;
++				}
++			}
++			else {
++				g_free (device_path);
++				continue;
++			}
++			g_free (device_path);
++		}	
++
+ 		mount_entry->filesystem_type = g_strdup (mntent->mnt_type);
+ 
+ #ifdef HAVE_HASMNTOPT

Added: desktop/experimental/gnome-vfs2/debian/patches/16_no_extra_dbus_messages.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-vfs2/debian/patches/16_no_extra_dbus_messages.patch?rev=12226&op=file
==============================================================================
--- desktop/experimental/gnome-vfs2/debian/patches/16_no_extra_dbus_messages.patch (added)
+++ desktop/experimental/gnome-vfs2/debian/patches/16_no_extra_dbus_messages.patch Fri Aug  3 15:58:02 2007
@@ -1,0 +1,22 @@
+--- gnome-vfs-2.16.0/libgnomevfs/gnome-vfs-volume-monitor-client.c.no-dbus	2006-09-19 13:36:28.000000000 -0400
++++ gnome-vfs-2.16.0/libgnomevfs/gnome-vfs-volume-monitor-client.c	2006-09-19 13:37:11.000000000 -0400
+@@ -201,6 +201,9 @@
+ 
+ 	volume_monitor = GNOME_VFS_VOLUME_MONITOR (volume_monitor_client);
+ 
++	if (volume_monitor_client->dbus_conn == NULL)
++		return;
++
+ 	list = get_drives (volume_monitor_client->dbus_conn, volume_monitor);
+ 	for (l = list; l; l = l->next) {
+ 		drive = l->data;
+@@ -221,6 +224,9 @@
+ 
+ 	volume_monitor = GNOME_VFS_VOLUME_MONITOR (volume_monitor_client);
+ 
++	if (volume_monitor_client->dbus_conn == NULL)
++		return;
++
+ 	list = get_volumes (volume_monitor_client->dbus_conn, volume_monitor);
+ 	for (l = list; l; l = l->next) {
+ 		volume = l->data;

Modified: desktop/experimental/gnome-vfs2/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-vfs2/debian/patches/series?rev=12226&op=diff
==============================================================================
--- desktop/experimental/gnome-vfs2/debian/patches/series (original)
+++ desktop/experimental/gnome-vfs2/debian/patches/series Fri Aug  3 15:58:02 2007
@@ -9,6 +9,9 @@
 10_configuration_loop.patch
 12_user_visible_drives.patch
 13_resolve_fstab_symlinks.patch
+14_app_cdda.patch
+15_uuid_mount.patch
+16_no_extra_dbus_messages.patch
 19_hurd_path_max.patch
 20_dont_register_keys_for_gaim.patch
 22_ignore_inaccessible_volumes.patch




More information about the pkg-gnome-commits mailing list