Package: release.debian.org Severity: normal User: release.debian....@packages.debian.org Usertags: unblock
Hello! I'd like to ask for another pre-approval. This time it's fixing a regression when tweaking so that nautilus handles the desktop. Many people seem to still want to have icons on the (gnome-shell) desktop and are now running into #766021 (and duplicates). Additional minor bugfixes included as a bonus. I'm attaching a filtered debdiff, created by using: debdiff /var/cache/pbuilder/result/nautilus_3.14.[01]-1*dsc | filterdiff -x '*/Makefile.in' -x '*/aclocal.m4' -x '*/configure' -x '*/docs/*' -x '*/po/*' -x '*/data/*.in' -x '*/data/*.desktop' ie. excluding autogenerated files and translations. ======================================================================================= diff -Nru nautilus-3.14.0/aclocal.m4 nautilus-3.14.1/aclocal.m4 diff -Nru nautilus-3.14.0/configure nautilus-3.14.1/configure diff -Nru nautilus-3.14.0/configure.ac nautilus-3.14.1/configure.ac --- nautilus-3.14.0/configure.ac 2014-09-23 12:16:06.000000000 +0200 +++ nautilus-3.14.1/configure.ac 2014-11-12 23:53:46.000000000 +0100 @@ -18,7 +18,7 @@ m4_define(nautilus_extension_current, 5) m4_define(nautilus_extension_revision, 0) -AC_INIT([nautilus],[3.14.0],[http://bugzilla.gnome.org/enter_bug.cgi?product=nautilus]) +AC_INIT([nautilus],[3.14.1],[http://bugzilla.gnome.org/enter_bug.cgi?product=nautilus]) dnl =========================================================================== diff -Nru nautilus-3.14.0/data/nautilus-autorun-software.desktop.in nautilus-3.14.1/data/nautilus-autorun-software.desktop.in diff -Nru nautilus-3.14.0/data/nautilus-connect-server.desktop.in nautilus-3.14.1/data/nautilus-connect-server.desktop.in diff -Nru nautilus-3.14.0/data/org.gnome.Nautilus.desktop nautilus-3.14.1/data/org.gnome.Nautilus.desktop diff -Nru nautilus-3.14.0/data/org.gnome.Nautilus.desktop.in nautilus-3.14.1/data/org.gnome.Nautilus.desktop.in diff -Nru nautilus-3.14.0/debian/changelog nautilus-3.14.1/debian/changelog --- nautilus-3.14.0/debian/changelog 2014-09-23 15:50:26.000000000 +0200 +++ nautilus-3.14.1/debian/changelog 2014-11-20 14:15:55.000000000 +0100 @@ -1,3 +1,10 @@ +nautilus (3.14.1-1) unstable; urgency=medium + + * New upstream release. + - includes fix for --new-window (Closes: #766021) + + -- Andreas Henriksson <andr...@fatal.se> Thu, 20 Nov 2014 14:15:54 +0100 + nautilus (3.14.0-1) unstable; urgency=medium * New upstream release. diff -Nru nautilus-3.14.0/docs/reference/libnautilus-extension/html/libnautilus-extension-nautilus-column.html nautilus-3.14.1/docs/reference/libnautilus-extension/html/libnautilus-extension-nautilus-column.html diff -Nru nautilus-3.14.0/docs/reference/libnautilus-extension/html/libnautilus-extension-nautilus-column-provider.html nautilus-3.14.1/docs/reference/libnautilus-extension/html/libnautilus-extension-nautilus-column-provider.html diff -Nru nautilus-3.14.0/docs/reference/libnautilus-extension/html/libnautilus-extension-nautilus-extension-types.html nautilus-3.14.1/docs/reference/libnautilus-extension/html/libnautilus-extension-nautilus-extension-types.html diff -Nru nautilus-3.14.0/docs/reference/libnautilus-extension/html/libnautilus-extension-nautilus-file-info.html nautilus-3.14.1/docs/reference/libnautilus-extension/html/libnautilus-extension-nautilus-file-info.html diff -Nru nautilus-3.14.0/docs/reference/libnautilus-extension/html/libnautilus-extension-nautilus-info-provider.html nautilus-3.14.1/docs/reference/libnautilus-extension/html/libnautilus-extension-nautilus-info-provider.html diff -Nru nautilus-3.14.0/docs/reference/libnautilus-extension/html/libnautilus-extension-nautilus-location-widget-provider.html nautilus-3.14.1/docs/reference/libnautilus-extension/html/libnautilus-extension-nautilus-location-widget-provider.html diff -Nru nautilus-3.14.0/docs/reference/libnautilus-extension/html/libnautilus-extension-nautilus-menu.html nautilus-3.14.1/docs/reference/libnautilus-extension/html/libnautilus-extension-nautilus-menu.html diff -Nru nautilus-3.14.0/docs/reference/libnautilus-extension/html/libnautilus-extension-nautilus-menu-provider.html nautilus-3.14.1/docs/reference/libnautilus-extension/html/libnautilus-extension-nautilus-menu-provider.html diff -Nru nautilus-3.14.0/docs/reference/libnautilus-extension/html/libnautilus-extension-nautilus-property-page.html nautilus-3.14.1/docs/reference/libnautilus-extension/html/libnautilus-extension-nautilus-property-page.html diff -Nru nautilus-3.14.0/docs/reference/libnautilus-extension/html/libnautilus-extension-nautilus-property-page-provider.html nautilus-3.14.1/docs/reference/libnautilus-extension/html/libnautilus-extension-nautilus-property-page-provider.html diff -Nru nautilus-3.14.0/libnautilus-private/nautilus-file-operations.c nautilus-3.14.1/libnautilus-private/nautilus-file-operations.c --- nautilus-3.14.0/libnautilus-private/nautilus-file-operations.c 2014-04-11 23:56:10.000000000 +0200 +++ nautilus-3.14.1/libnautilus-private/nautilus-file-operations.c 2014-10-17 21:40:03.000000000 +0200 @@ -792,19 +792,24 @@ GFile *file; GFileInfo *info; char *name, *basename, *tmp; + GMount *mount; file = va_arg (va, GFile *); - info = g_file_query_info (file, - G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME, - 0, - g_cancellable_get_current (), - NULL); - - name = NULL; - if (info) { - name = g_strdup (g_file_info_get_display_name (info)); - g_object_unref (info); + if ((mount = nautilus_get_mounted_mount_for_root (file)) != NULL) { + name = g_mount_get_name (mount); + g_object_unref (mount); + } else { + info = g_file_query_info (file, + G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME, + 0, + g_cancellable_get_current (), + NULL); + name = NULL; + if (info) { + name = g_strdup (g_file_info_get_display_name (info)); + g_object_unref (info); + } } if (name == NULL) { diff -Nru nautilus-3.14.0/Makefile.in nautilus-3.14.1/Makefile.in diff -Nru nautilus-3.14.0/NEWS nautilus-3.14.1/NEWS --- nautilus-3.14.0/NEWS 2014-09-23 12:15:56.000000000 +0200 +++ nautilus-3.14.1/NEWS 2014-11-12 23:57:05.000000000 +0100 @@ -1,3 +1,9 @@ +Major changes in 3.14.1: +* Fix regression with --new-window option (Lubomir Rintel) +* Use mount name if available for file operations progress report +* Set max-width for value labels in properties (Lars Uebernickel) +* Increase default window width (Michael Catanzaro) + Changes in 3.14.0: * Translation updates diff -Nru nautilus-3.14.0/po/bn_IN.po nautilus-3.14.1/po/bn_IN.po diff -Nru nautilus-3.14.0/po/fa.po nautilus-3.14.1/po/fa.po diff -Nru nautilus-3.14.0/po/pl.po nautilus-3.14.1/po/pl.po diff -Nru nautilus-3.14.0/po/te.po nautilus-3.14.1/po/te.po diff -Nru nautilus-3.14.0/src/nautilus-application.c nautilus-3.14.1/src/nautilus-application.c --- nautilus-3.14.0/src/nautilus-application.c 2014-07-12 05:22:11.000000000 +0200 +++ nautilus-3.14.1/src/nautilus-application.c 2014-10-17 21:40:03.000000000 +0200 @@ -844,16 +844,20 @@ g_variant_dict_lookup (options, G_OPTION_REMAINING, "^a&s", &remaining); - if (remaining == NULL) { - return -1; - } - /* Convert args to GFiles */ file_array = g_ptr_array_new_full (0, g_object_unref); - for (idx = 0; remaining[idx] != NULL; idx++) { - file = g_file_new_for_commandline_arg (remaining[idx]); + if (remaining) { + for (idx = 0; remaining[idx] != NULL; idx++) { + file = g_file_new_for_commandline_arg (remaining[idx]); + g_ptr_array_add (file_array, file); + } + } else if (g_variant_dict_contains (options, "new-window")) { + file = g_file_new_for_path (g_get_home_dir ()); g_ptr_array_add (file_array, file); + } else { + /* No options or options that glib already manages */ + return -1; } len = file_array->len; diff -Nru nautilus-3.14.0/src/nautilus-properties-window.c nautilus-3.14.1/src/nautilus-properties-window.c --- nautilus-3.14.0/src/nautilus-properties-window.c 2014-08-28 22:07:18.000000000 +0200 +++ nautilus-3.14.1/src/nautilus-properties-window.c 2014-10-17 21:40:03.000000000 +0200 @@ -1288,6 +1288,7 @@ if (ellipsize_text) { gtk_widget_set_hexpand (label_field, TRUE); + gtk_label_set_max_width_chars (GTK_LABEL (label_field), 24); } if (sibling != NULL) { diff -Nru nautilus-3.14.0/src/nautilus-window-private.h nautilus-3.14.1/src/nautilus-window-private.h --- nautilus-3.14.0/src/nautilus-window-private.h 2014-08-28 22:07:18.000000000 +0200 +++ nautilus-3.14.1/src/nautilus-window-private.h 2014-10-17 21:40:03.000000000 +0200 @@ -82,7 +82,7 @@ #define NAUTILUS_WINDOW_MIN_WIDTH 200 #define NAUTILUS_WINDOW_MIN_HEIGHT 200 -#define NAUTILUS_WINDOW_DEFAULT_WIDTH 855 +#define NAUTILUS_WINDOW_DEFAULT_WIDTH 890 #define NAUTILUS_WINDOW_DEFAULT_HEIGHT 550 typedef void (*NautilusBookmarkFailedCallback) (NautilusWindow *window, ======================================================================================= If you approve, then please unblock package nautilus unblock nautilus/3.14.1-1 -- System Information: Debian Release: jessie/sid APT prefers testing-updates APT policy: (500, 'testing-updates'), (500, 'testing'), (1, 'experimental') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 3.16.0-4-amd64 (SMP w/4 CPU cores) Locale: LANG=en_DK.UTF-8, LC_CTYPE=en_DK.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
