r13662 - in /desktop/unstable/nautilus/debian: ./ patches/
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Wed Nov 28 11:23:26 UTC 2007
Author: joss
Date: Wed Nov 28 11:23:25 2007
New Revision: 13662
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=13662
Log:
* Add missing references to all patches.
Modified:
desktop/unstable/nautilus/debian/changelog
desktop/unstable/nautilus/debian/patches/01_prompt_same_file.patch
desktop/unstable/nautilus/debian/patches/03_sftp_connect.patch
desktop/unstable/nautilus/debian/patches/04_show_backup_files.patch
desktop/unstable/nautilus/debian/patches/05_places-sidebar_single-click.patch
desktop/unstable/nautilus/debian/patches/06_dont_create_Desktop.patch
desktop/unstable/nautilus/debian/patches/07_desktop_file_activation.patch
desktop/unstable/nautilus/debian/patches/08_folder_handler.patch
desktop/unstable/nautilus/debian/patches/10_location_titlebar.patch
desktop/unstable/nautilus/debian/patches/11_gnomevfs_query_eject.patch
desktop/unstable/nautilus/debian/patches/12_list-view_expand.patch
desktop/unstable/nautilus/debian/patches/14_sidebar_network-protocol.patch
desktop/unstable/nautilus/debian/patches/15_tracker_check.patch
desktop/unstable/nautilus/debian/patches/20_upstream_nautilus-dnd-user-owned.patch
desktop/unstable/nautilus/debian/patches/21_nautilus_xmp.patch
desktop/unstable/nautilus/debian/patches/23_thumbnails_add-border.patch
Modified: desktop/unstable/nautilus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/changelog?rev=13662&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/changelog (original)
+++ desktop/unstable/nautilus/debian/changelog Wed Nov 28 11:23:25 2007
@@ -1,9 +1,13 @@
nautilus (2.20.0-3) UNRELEASED; urgency=low
+ [ Diego Escalante Urrelo ]
* New patch, 23_thumbnails_add-border.patch, restore the
thumbnail borders; (GNOME #478363).
- -- Diego Escalante Urrelo <dieguito at gmail.com> Tue, 27 Nov 2007 03:31:28 +0000
+ [ Josselin Mouette ]
+ * Add missing references to all patches.
+
+ -- Josselin Mouette <joss at debian.org> Wed, 28 Nov 2007 12:23:02 +0100
nautilus (2.20.0-2) unstable; urgency=high
Modified: desktop/unstable/nautilus/debian/patches/01_prompt_same_file.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/01_prompt_same_file.patch?rev=13662&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/patches/01_prompt_same_file.patch (original)
+++ desktop/unstable/nautilus/debian/patches/01_prompt_same_file.patch Wed Nov 28 11:23:25 2007
@@ -1,3 +1,7 @@
+Debian #419525
+GNOME #431472
+Handle a case where trying to overwrite a file by itself deletes it
+instead.
Index: nautilus-2.18.1/libnautilus-private/nautilus-file-operations.c
===================================================================
--- nautilus-2.18.1.orig/libnautilus-private/nautilus-file-operations.c 2007-04-10 14:06:07.000000000 +0200
Modified: desktop/unstable/nautilus/debian/patches/03_sftp_connect.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/03_sftp_connect.patch?rev=13662&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/patches/03_sftp_connect.patch (original)
+++ desktop/unstable/nautilus/debian/patches/03_sftp_connect.patch Wed Nov 28 11:23:25 2007
@@ -1,3 +1,5 @@
+Debian #375181
+GNOME #385608
Index: nautilus-2.20.0/src/file-manager/fm-directory-view.c
===================================================================
--- nautilus-2.20.0.orig/src/file-manager/fm-directory-view.c 2007-08-27 10:03:57.000000000 +0200
Modified: desktop/unstable/nautilus/debian/patches/04_show_backup_files.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/04_show_backup_files.patch?rev=13662&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/patches/04_show_backup_files.patch (original)
+++ desktop/unstable/nautilus/debian/patches/04_show_backup_files.patch Wed Nov 28 11:23:25 2007
@@ -1,3 +1,5 @@
+Debian #401583
+GNOME #335315
Index: nautilus-2.18.3/src/file-manager/fm-directory-view.c
===================================================================
--- nautilus-2.18.3.orig/src/file-manager/fm-directory-view.c 2007-07-18 23:35:06.747181882 +0200
Modified: desktop/unstable/nautilus/debian/patches/05_places-sidebar_single-click.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/05_places-sidebar_single-click.patch?rev=13662&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/patches/05_places-sidebar_single-click.patch (original)
+++ desktop/unstable/nautilus/debian/patches/05_places-sidebar_single-click.patch Wed Nov 28 11:23:25 2007
@@ -1,3 +1,4 @@
+GNOME #355760
Index: nautilus-2.20.0/src/nautilus-places-sidebar.c
===================================================================
--- nautilus-2.20.0.orig/src/nautilus-places-sidebar.c 2007-09-24 11:59:51.082093228 +0200
Modified: desktop/unstable/nautilus/debian/patches/06_dont_create_Desktop.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/06_dont_create_Desktop.patch?rev=13662&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/patches/06_dont_create_Desktop.patch (original)
+++ desktop/unstable/nautilus/debian/patches/06_dont_create_Desktop.patch Wed Nov 28 11:23:25 2007
@@ -1,3 +1,6 @@
+Debian #230757
+GNOME #139470
+Don't create the Desktop folder when launched with --no-desktop.
Index: libnautilus-private/nautilus-monitor.c
===================================================================
--- libnautilus-private/nautilus-monitor.c.orig 2007-04-03 12:08:46.000000000 +0200
Modified: desktop/unstable/nautilus/debian/patches/07_desktop_file_activation.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/07_desktop_file_activation.patch?rev=13662&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/patches/07_desktop_file_activation.patch (original)
+++ desktop/unstable/nautilus/debian/patches/07_desktop_file_activation.patch Wed Nov 28 11:23:25 2007
@@ -1,3 +1,6 @@
+Fixes two security issues about disguised .desktop files.
+Debian #408556, GNOME #405291
+Debian #408948, GNOME #405052
Index: nautilus-2.20.0/libnautilus-private/nautilus-file.c
===================================================================
--- nautilus-2.20.0.orig/libnautilus-private/nautilus-file.c 2007-09-10 09:03:46.000000000 +0200
Modified: desktop/unstable/nautilus/debian/patches/08_folder_handler.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/08_folder_handler.patch?rev=13662&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/patches/08_folder_handler.patch (original)
+++ desktop/unstable/nautilus/debian/patches/08_folder_handler.patch Wed Nov 28 11:23:25 2007
@@ -1,3 +1,4 @@
+Debian #396969
Index: nautilus-2.16.3/nautilus-folder-handler.desktop.in.in
===================================================================
--- nautilus-2.16.3.orig/nautilus-folder-handler.desktop.in.in 2007-02-17 00:16:34.000000000 +0100
Modified: desktop/unstable/nautilus/debian/patches/10_location_titlebar.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/10_location_titlebar.patch?rev=13662&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/patches/10_location_titlebar.patch (original)
+++ desktop/unstable/nautilus/debian/patches/10_location_titlebar.patch Wed Nov 28 11:23:25 2007
@@ -1,3 +1,6 @@
+Debian #413018
+GNOME #142087
+Option to show the full location in the title bar
Index: nautilus-2.20.0/libnautilus-private/apps_nautilus_preferences.schemas.in
===================================================================
--- nautilus-2.20.0.orig/libnautilus-private/apps_nautilus_preferences.schemas.in 2007-09-18 08:51:48.000000000 +0200
Modified: desktop/unstable/nautilus/debian/patches/11_gnomevfs_query_eject.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/11_gnomevfs_query_eject.patch?rev=13662&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/patches/11_gnomevfs_query_eject.patch (original)
+++ desktop/unstable/nautilus/debian/patches/11_gnomevfs_query_eject.patch Wed Nov 28 11:23:25 2007
@@ -1,3 +1,5 @@
+GNOME #333252
+Query gnome-vfs for drive ejection.
Index: nautilus-2.20.0/libnautilus-private/nautilus-desktop-link-monitor.c
===================================================================
--- nautilus-2.20.0.orig/libnautilus-private/nautilus-desktop-link-monitor.c 2007-04-03 12:08:46.000000000 +0200
Modified: desktop/unstable/nautilus/debian/patches/12_list-view_expand.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/12_list-view_expand.patch?rev=13662&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/patches/12_list-view_expand.patch (original)
+++ desktop/unstable/nautilus/debian/patches/12_list-view_expand.patch Wed Nov 28 11:23:25 2007
@@ -1,3 +1,5 @@
+Revert upstream commits r12779 and r13045.
+We can do this because we fix GNOME #316087 in our GTK+ packages.
Index: nautilus-2.20.0/src/file-manager/fm-list-view.c
===================================================================
--- nautilus-2.20.0.orig/src/file-manager/fm-list-view.c 2007-08-21 11:37:48.000000000 +0200
Modified: desktop/unstable/nautilus/debian/patches/14_sidebar_network-protocol.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/14_sidebar_network-protocol.patch?rev=13662&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/patches/14_sidebar_network-protocol.patch (original)
+++ desktop/unstable/nautilus/debian/patches/14_sidebar_network-protocol.patch Wed Nov 28 11:23:25 2007
@@ -1,3 +1,4 @@
+GNOME #350974
Index: nautilus-2.20.0/src/nautilus-places-sidebar.c
===================================================================
--- nautilus-2.20.0.orig/src/nautilus-places-sidebar.c 2007-09-24 11:36:56.503760473 +0200
Modified: desktop/unstable/nautilus/debian/patches/15_tracker_check.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/15_tracker_check.patch?rev=13662&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/patches/15_tracker_check.patch (original)
+++ desktop/unstable/nautilus/debian/patches/15_tracker_check.patch Wed Nov 28 11:23:25 2007
@@ -1,3 +1,6 @@
+Debian #439863
+Partially fixes GNOME #386521
+Check that tracker actually works before using it
Index: nautilus-2.18.3/libnautilus-private/nautilus-search-engine-tracker.c
===================================================================
--- nautilus-2.18.3.orig/libnautilus-private/nautilus-search-engine-tracker.c 2006-01-16 10:30:59.000000000 +0100
Modified: desktop/unstable/nautilus/debian/patches/20_upstream_nautilus-dnd-user-owned.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/20_upstream_nautilus-dnd-user-owned.patch?rev=13662&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/patches/20_upstream_nautilus-dnd-user-owned.patch (original)
+++ desktop/unstable/nautilus/debian/patches/20_upstream_nautilus-dnd-user-owned.patch Wed Nov 28 11:23:25 2007
@@ -1,3 +1,5 @@
+LP #36647
+GNOME #339154
Index: libnautilus-private/nautilus-dnd.c
===================================================================
--- libnautilus-private/nautilus-dnd.c.orig 2007-04-10 14:06:07.000000000 +0200
Modified: desktop/unstable/nautilus/debian/patches/21_nautilus_xmp.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/21_nautilus_xmp.patch?rev=13662&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/patches/21_nautilus_xmp.patch (original)
+++ desktop/unstable/nautilus/debian/patches/21_nautilus_xmp.patch Wed Nov 28 11:23:25 2007
@@ -1,3 +1,5 @@
+Debian #450486
+GNOME #500171
diff --git a/src/nautilus-image-properties-page.c b/src/nautilus-image-properties-page.c
index 8744103..56120ed 100644
--- a/src/nautilus-image-properties-page.c
Modified: desktop/unstable/nautilus/debian/patches/23_thumbnails_add-border.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/23_thumbnails_add-border.patch?rev=13662&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/patches/23_thumbnails_add-border.patch (original)
+++ desktop/unstable/nautilus/debian/patches/23_thumbnails_add-border.patch Wed Nov 28 11:23:25 2007
@@ -1,7 +1,7 @@
# 23_thumbnails_add-border.patch:
# Restore the missing thumbnail borders.
#
-# Bug 478363 – Missing thumbnail frames
+# GNOME Bug#478363 – Missing thumbnail frames
# http://bugzilla.gnome.org/show_bug.cgi?id=478363
Index: nautilus/libnautilus-private/nautilus-icon-factory.c
===================================================================
More information about the pkg-gnome-commits
mailing list