r12823 - in /desktop/unstable/nautilus/debian: ./ patches/
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Mon Sep 24 10:53:03 UTC 2007
Author: joss
Date: Mon Sep 24 10:53:03 2007
New Revision: 12823
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=12823
Log:
* New upstream release.
* Update build dependencies.
* Pass --disable-update-mimedb to configure flags.
* Don't ship the XML file in nautilus, ugh.
* Call dh_installmime by hand for nautilus-data.
* Refresh patches.
* 05_places-sidebar_single-click.patch: updated to new version.
* 12_list-view_expand.patch: updated for 2.20; revert upstream commit
r13045.
* 13_thumbnail_size_pref.patch: removed, integrated upstream.
* 60_combobox-changed-signal.patch: removed, integrated upstream.
* Update menu file.
Removed:
desktop/unstable/nautilus/debian/patches/13_thumbnail_size_pref.patch
desktop/unstable/nautilus/debian/patches/60_combobox-changed-signal.patch
Modified:
desktop/unstable/nautilus/debian/changelog
desktop/unstable/nautilus/debian/control
desktop/unstable/nautilus/debian/control.in
desktop/unstable/nautilus/debian/menu
desktop/unstable/nautilus/debian/nautilus.install
desktop/unstable/nautilus/debian/patches/03_sftp_connect.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/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/series
desktop/unstable/nautilus/debian/rules
Modified: desktop/unstable/nautilus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/changelog?rev=12823&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/changelog (original)
+++ desktop/unstable/nautilus/debian/changelog Mon Sep 24 10:53:03 2007
@@ -1,10 +1,22 @@
-nautilus (2.18.3-4) UNRELEASED; urgency=low
+nautilus (2.20.0-1) unstable; urgency=low
* 15_tracker_check.patch: new patch, properly checks that tracker is
installed before using it. Closes: #439863.
* Suggest tracker.
-
- -- Josselin Mouette <joss at debian.org> Sat, 22 Sep 2007 18:26:04 +0200
+ * New upstream release.
+ * Update build dependencies.
+ * Pass --disable-update-mimedb to configure flags.
+ * Don't ship the XML file in nautilus, ugh.
+ * Call dh_installmime by hand for nautilus-data.
+ * Refresh patches.
+ * 05_places-sidebar_single-click.patch: updated to new version.
+ * 12_list-view_expand.patch: updated for 2.20; revert upstream commit
+ r13045.
+ * 13_thumbnail_size_pref.patch: removed, integrated upstream.
+ * 60_combobox-changed-signal.patch: removed, integrated upstream.
+ * Update menu file.
+
+ -- Josselin Mouette <joss at debian.org> Mon, 24 Sep 2007 12:34:46 +0200
nautilus (2.18.3-3) unstable; urgency=low
Modified: desktop/unstable/nautilus/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/control?rev=12823&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/control (original)
+++ desktop/unstable/nautilus/debian/control Mon Sep 24 10:53:03 2007
@@ -7,11 +7,11 @@
cdbs (>= 0.4.41),
quilt,
gettext,
- libgtk2.0-dev (>= 2.10.0),
+ libgtk2.0-dev (>= 2.11.6),
libgnomeui-dev (>= 2.16.0-2),
libbonobo2-dev (>= 2.15),
- libgnomevfs2-dev (>= 1:2.16.0-1),
- libeel2-dev (>= 2.16.0),
+ libgnomevfs2-dev (>= 1:2.19.3),
+ libeel2-dev (>= 2.20.0),
librsvg2-dev (>= 2.16.0-2),
libgnome-desktop-dev (>= 2.9.91),
libesd0-dev (>= 0.2.27),
@@ -33,7 +33,9 @@
libgnome2-dev (>= 2.14.0),
libpango1.0-dev (>= 1.1.2),
x11proto-core-dev,
- libtrackerclient-dev (>= 0.0.1)
+ libtrackerclient-dev (>= 0.0.1),
+ libexempi-dev (>= 1.99.2),
+ intltool (>= 0.35.0)
Standards-Version: 3.7.2
Package: nautilus
Modified: desktop/unstable/nautilus/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/control.in?rev=12823&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/control.in (original)
+++ desktop/unstable/nautilus/debian/control.in Mon Sep 24 10:53:03 2007
@@ -7,11 +7,11 @@
cdbs (>= 0.4.41),
quilt,
gettext,
- libgtk2.0-dev (>= 2.10.0),
+ libgtk2.0-dev (>= 2.11.6),
libgnomeui-dev (>= 2.16.0-2),
libbonobo2-dev (>= 2.15),
- libgnomevfs2-dev (>= 1:2.16.0-1),
- libeel2-dev (>= 2.16.0),
+ libgnomevfs2-dev (>= 1:2.19.3),
+ libeel2-dev (>= 2.20.0),
librsvg2-dev (>= 2.16.0-2),
libgnome-desktop-dev (>= 2.9.91),
libesd0-dev (>= 0.2.27),
@@ -33,7 +33,9 @@
libgnome2-dev (>= 2.14.0),
libpango1.0-dev (>= 1.1.2),
x11proto-core-dev,
- libtrackerclient-dev (>= 0.0.1)
+ libtrackerclient-dev (>= 0.0.1),
+ libexempi-dev (>= 1.99.2),
+ intltool (>= 0.35.0)
Standards-Version: 3.7.2
Package: nautilus
Modified: desktop/unstable/nautilus/debian/menu
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/menu?rev=12823&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/menu (original)
+++ desktop/unstable/nautilus/debian/menu Mon Sep 24 10:53:03 2007
@@ -1,2 +1,2 @@
-?package(nautilus):needs="X11" section="Apps/System" \
+?package(nautilus):needs="X11" section="Applications/File Management" \
title="Nautilus" command="/usr/bin/nautilus" icon="/usr/share/pixmaps/nautilus.xpm"
Modified: desktop/unstable/nautilus/debian/nautilus.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/nautilus.install?rev=12823&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/nautilus.install (original)
+++ desktop/unstable/nautilus/debian/nautilus.install Mon Sep 24 10:53:03 2007
@@ -1,3 +1,2 @@
debian/tmp/usr/bin
debian/tmp/usr/share/applications
-debian/tmp/usr/share/mime/application
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=12823&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/patches/03_sftp_connect.patch (original)
+++ desktop/unstable/nautilus/debian/patches/03_sftp_connect.patch Mon Sep 24 10:53:03 2007
@@ -1,8 +1,8 @@
-Index: nautilus-2.18.3/src/file-manager/fm-directory-view.c
+Index: nautilus-2.20.0/src/file-manager/fm-directory-view.c
===================================================================
---- nautilus-2.18.3.orig/src/file-manager/fm-directory-view.c 2007-04-11 16:59:21.000000000 +0200
-+++ nautilus-2.18.3/src/file-manager/fm-directory-view.c 2007-07-18 23:35:06.747181882 +0200
-@@ -7283,6 +7283,8 @@
+--- nautilus-2.20.0.orig/src/file-manager/fm-directory-view.c 2007-08-27 10:03:57.000000000 +0200
++++ nautilus-2.20.0/src/file-manager/fm-directory-view.c 2007-09-24 11:22:33.738594288 +0200
+@@ -7357,6 +7357,8 @@
uri = nautilus_file_get_activation_uri (file);
if (uri != NULL &&
(eel_istr_has_prefix (uri, "ftp:") ||
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=12823&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 Mon Sep 24 10:53:03 2007
@@ -1,8 +1,8 @@
-Index: nautilus-2.18.1/src/nautilus-places-sidebar.c
+Index: nautilus-2.20.0/src/nautilus-places-sidebar.c
===================================================================
---- nautilus-2.18.1.orig/src/nautilus-places-sidebar.c 2007-04-10 14:05:31.000000000 +0200
-+++ nautilus-2.18.1/src/nautilus-places-sidebar.c 2007-04-26 00:30:54.709098500 +0200
-@@ -454,9 +454,7 @@
+--- nautilus-2.20.0.orig/src/nautilus-places-sidebar.c 2007-09-24 11:59:51.082093228 +0200
++++ nautilus-2.20.0/src/nautilus-places-sidebar.c 2007-09-24 12:09:36.843473867 +0200
+@@ -472,11 +472,11 @@
}
static void
@@ -12,22 +12,12 @@
+cursor_changed_callback (GtkTreeView *tree_view,
gpointer user_data)
{
- NautilusPlacesSidebar *sidebar;
-@@ -465,11 +463,8 @@
- char *uri;
-
- sidebar = NAUTILUS_PLACES_SIDEBAR (user_data);
-- model = gtk_tree_view_get_model (tree_view);
--
-- if (!gtk_tree_model_get_iter (model, &iter, path)) {
-- return;
-- }
-+
-+ gtk_tree_selection_get_selected(gtk_tree_view_get_selection(tree_view), &model, &iter);
-
- gtk_tree_model_get
- (model, &iter, PLACES_SIDEBAR_COLUMN_URI, &uri, -1);
-@@ -1557,8 +1552,8 @@
++ GtkTreePath *path;
++ gtk_tree_view_get_cursor (tree_view, &path, NULL);
+ open_selected_bookmark (NAUTILUS_PLACES_SIDEBAR (user_data),
+ gtk_tree_view_get_model (tree_view),
+ path,
+@@ -1679,8 +1679,8 @@
gtk_tree_selection_set_mode (selection, GTK_SELECTION_BROWSE);
g_signal_connect_object
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=12823&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/patches/06_dont_create_Desktop.patch (original)
+++ desktop/unstable/nautilus/debian/patches/06_dont_create_Desktop.patch Mon Sep 24 10:53:03 2007
@@ -1,7 +1,7 @@
Index: libnautilus-private/nautilus-monitor.c
===================================================================
---- libnautilus-private/nautilus-monitor.c.orig 2007-04-10 14:06:07.000000000 +0200
-+++ libnautilus-private/nautilus-monitor.c 2007-04-26 00:30:58.445332000 +0200
+--- libnautilus-private/nautilus-monitor.c.orig 2007-04-03 12:08:46.000000000 +0200
++++ libnautilus-private/nautilus-monitor.c 2007-09-24 11:38:42.713813039 +0200
@@ -38,6 +38,13 @@
GnomeVFSMonitorHandle *handle;
};
@@ -51,8 +51,8 @@
Index: libnautilus-private/nautilus-monitor.h
===================================================================
---- libnautilus-private/nautilus-monitor.h.orig 2007-04-10 14:06:07.000000000 +0200
-+++ libnautilus-private/nautilus-monitor.h 2007-04-26 00:30:58.445332000 +0200
+--- libnautilus-private/nautilus-monitor.h.orig 2007-04-03 12:08:46.000000000 +0200
++++ libnautilus-private/nautilus-monitor.h 2007-09-24 11:38:42.713813039 +0200
@@ -30,6 +30,7 @@
typedef struct NautilusMonitor NautilusMonitor;
@@ -63,9 +63,9 @@
NautilusMonitor *nautilus_monitor_directory (const char *uri);
Index: src/nautilus-application.c
===================================================================
---- src/nautilus-application.c.orig 2007-04-10 14:05:31.000000000 +0200
-+++ src/nautilus-application.c 2007-04-26 00:30:58.445332000 +0200
-@@ -239,7 +239,7 @@
+--- src/nautilus-application.c.orig 2007-09-10 08:56:43.000000000 +0200
++++ src/nautilus-application.c 2007-09-24 11:38:42.713813039 +0200
+@@ -245,7 +245,7 @@
}
static gboolean
@@ -74,7 +74,7 @@
{
char *user_directory;
char *desktop_directory;
-@@ -252,20 +252,24 @@
+@@ -258,20 +258,24 @@
g_assert (NAUTILUS_IS_APPLICATION (application));
@@ -107,7 +107,7 @@
failed_count = eel_string_list_get_length (directories);
-@@ -394,7 +398,7 @@
+@@ -400,7 +404,7 @@
}
static void
@@ -116,7 +116,7 @@
{
/* initialize nautilus modules */
nautilus_module_init ();
-@@ -410,8 +414,9 @@
+@@ -416,8 +420,9 @@
/* Make the desktop work with old Nautilus. */
migrate_old_nautilus_files ();
@@ -128,7 +128,7 @@
}
static void
-@@ -514,7 +519,7 @@
+@@ -520,7 +525,7 @@
/* Check the user's ~/.nautilus directories and post warnings
* if there are problems.
*/
@@ -137,7 +137,7 @@
return;
}
-@@ -532,7 +537,7 @@
+@@ -538,7 +543,7 @@
case Bonobo_ACTIVATION_REG_SUCCESS:
/* We are registered and all is right with the world. */
application->shell_registered = TRUE;
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=12823&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/patches/07_desktop_file_activation.patch (original)
+++ desktop/unstable/nautilus/debian/patches/07_desktop_file_activation.patch Mon Sep 24 10:53:03 2007
@@ -1,7 +1,7 @@
-Index: nautilus-2.18.3/libnautilus-private/nautilus-file.c
+Index: nautilus-2.20.0/libnautilus-private/nautilus-file.c
===================================================================
---- nautilus-2.18.3.orig/libnautilus-private/nautilus-file.c 2007-05-06 14:59:08.000000000 +0200
-+++ nautilus-2.18.3/libnautilus-private/nautilus-file.c 2007-07-18 23:35:20.895988177 +0200
+--- nautilus-2.20.0.orig/libnautilus-private/nautilus-file.c 2007-09-10 09:03:46.000000000 +0200
++++ nautilus-2.20.0/libnautilus-private/nautilus-file.c 2007-09-24 11:38:54.306473667 +0200
@@ -40,6 +40,7 @@
#include "nautilus-link-desktop-file.h"
#include "nautilus-metadata.h"
@@ -10,7 +10,7 @@
#include "nautilus-search-directory.h"
#include "nautilus-search-directory-file.h"
#include "nautilus-thumbnails.h"
-@@ -2755,6 +2756,33 @@
+@@ -2757,6 +2758,33 @@
monitor_remove, (file, client));
}
@@ -44,7 +44,7 @@
/* Return the uri associated with the passed-in file, which may not be
* the actual uri if the file is an desktop file or a nautilus
-@@ -2769,7 +2797,9 @@
+@@ -2771,7 +2799,9 @@
return NULL;
}
@@ -55,7 +55,7 @@
return g_strdup (file->details->activation_uri);
}
-@@ -5227,6 +5257,12 @@
+@@ -5229,6 +5259,12 @@
return nautilus_file_is_mime_type (file, "application/x-desktop");
}
@@ -68,11 +68,11 @@
/**
* nautilus_file_is_directory
*
-Index: nautilus-2.18.3/src/file-manager/fm-directory-view.c
+Index: nautilus-2.20.0/src/file-manager/fm-directory-view.c
===================================================================
---- nautilus-2.18.3.orig/src/file-manager/fm-directory-view.c 2007-07-18 23:35:13.647575113 +0200
-+++ nautilus-2.18.3/src/file-manager/fm-directory-view.c 2007-07-18 23:35:20.903988633 +0200
-@@ -4608,7 +4608,8 @@
+--- nautilus-2.20.0.orig/src/file-manager/fm-directory-view.c 2007-09-24 11:22:49.619499289 +0200
++++ nautilus-2.20.0/src/file-manager/fm-directory-view.c 2007-09-24 11:38:54.310473895 +0200
+@@ -4626,7 +4626,8 @@
{
return (nautilus_file_is_directory (file) ||
NAUTILUS_IS_DESKTOP_ICON_FILE (file) ||
@@ -82,7 +82,7 @@
}
static ActivationAction
-@@ -4689,12 +4690,14 @@
+@@ -4707,12 +4708,14 @@
for (node = selection; node != NULL; node = node->next) {
file = NAUTILUS_FILE (node->data);
@@ -101,10 +101,10 @@
/* Only use the default app for open if there is not
a mime mismatch, otherwise we can't use it in the
open with menu */
-Index: nautilus-2.18.3/libnautilus-private/nautilus-file.h
+Index: nautilus-2.20.0/libnautilus-private/nautilus-file.h
===================================================================
---- nautilus-2.18.3.orig/libnautilus-private/nautilus-file.h 2006-06-16 17:02:57.000000000 +0200
-+++ nautilus-2.18.3/libnautilus-private/nautilus-file.h 2007-07-18 23:35:20.903988633 +0200
+--- nautilus-2.20.0.orig/libnautilus-private/nautilus-file.h 2007-04-03 12:08:46.000000000 +0200
++++ nautilus-2.20.0/libnautilus-private/nautilus-file.h 2007-09-24 11:38:54.314474123 +0200
@@ -155,6 +155,7 @@
char * nautilus_file_get_symbolic_link_target_uri (NautilusFile *file);
gboolean nautilus_file_is_broken_symbolic_link (NautilusFile *file);
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=12823&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/patches/10_location_titlebar.patch (original)
+++ desktop/unstable/nautilus/debian/patches/10_location_titlebar.patch Mon Sep 24 10:53:03 2007
@@ -1,8 +1,8 @@
-Index: nautilus-2.18.1/libnautilus-private/apps_nautilus_preferences.schemas.in
-===================================================================
---- nautilus-2.18.1.orig/libnautilus-private/apps_nautilus_preferences.schemas.in 2007-04-10 14:06:07.000000000 +0200
-+++ nautilus-2.18.1/libnautilus-private/apps_nautilus_preferences.schemas.in 2007-04-26 00:31:10.438081500 +0200
-@@ -705,6 +705,21 @@
+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
++++ nautilus-2.20.0/libnautilus-private/apps_nautilus_preferences.schemas.in 2007-09-24 11:39:14.871645609 +0200
+@@ -720,6 +720,21 @@
</locale>
</schema>
@@ -24,11 +24,11 @@
<schema>
<key>/schemas/apps/nautilus/preferences/start_with_sidebar</key>
<applyto>/apps/nautilus/preferences/start_with_sidebar</applyto>
-Index: nautilus-2.18.1/libnautilus-private/nautilus-global-preferences.c
-===================================================================
---- nautilus-2.18.1.orig/libnautilus-private/nautilus-global-preferences.c 2007-04-10 14:06:07.000000000 +0200
-+++ nautilus-2.18.1/libnautilus-private/nautilus-global-preferences.c 2007-04-26 00:31:10.438081500 +0200
-@@ -376,6 +376,10 @@
+Index: nautilus-2.20.0/libnautilus-private/nautilus-global-preferences.c
+===================================================================
+--- nautilus-2.20.0.orig/libnautilus-private/nautilus-global-preferences.c 2007-06-27 09:12:34.000000000 +0200
++++ nautilus-2.20.0/libnautilus-private/nautilus-global-preferences.c 2007-09-24 11:39:14.875645837 +0200
+@@ -378,6 +378,10 @@
PREFERENCE_BOOLEAN,
GINT_TO_POINTER (TRUE)
},
@@ -39,10 +39,10 @@
{ NAUTILUS_PREFERENCES_START_WITH_SIDEBAR,
PREFERENCE_BOOLEAN,
GINT_TO_POINTER (TRUE)
-Index: nautilus-2.18.1/libnautilus-private/nautilus-global-preferences.h
-===================================================================
---- nautilus-2.18.1.orig/libnautilus-private/nautilus-global-preferences.h 2007-04-10 14:06:07.000000000 +0200
-+++ nautilus-2.18.1/libnautilus-private/nautilus-global-preferences.h 2007-04-26 00:31:10.438081500 +0200
+Index: nautilus-2.20.0/libnautilus-private/nautilus-global-preferences.h
+===================================================================
+--- nautilus-2.20.0.orig/libnautilus-private/nautilus-global-preferences.h 2007-06-27 09:12:34.000000000 +0200
++++ nautilus-2.20.0/libnautilus-private/nautilus-global-preferences.h 2007-09-24 11:39:14.875645837 +0200
@@ -84,6 +84,7 @@
#define NAUTILUS_PREFERENCES_START_WITH_LOCATION_BAR "preferences/start_with_location_bar"
#define NAUTILUS_PREFERENCES_ALWAYS_USE_LOCATION_ENTRY "preferences/always_use_location_entry"
@@ -51,11 +51,11 @@
#define NAUTILUS_PREFERENCES_START_WITH_SIDEBAR "preferences/start_with_sidebar"
#define NAUTILUS_PREFERENCES_START_WITH_TOOLBAR "preferences/start_with_toolbar"
#define NAUTILUS_PREFERENCES_SIDE_PANE_VIEW "preferences/side_pane_view"
-Index: nautilus-2.18.1/src/nautilus-navigation-window.c
-===================================================================
---- nautilus-2.18.1.orig/src/nautilus-navigation-window.c 2007-04-10 14:05:31.000000000 +0200
-+++ nautilus-2.18.1/src/nautilus-navigation-window.c 2007-04-26 00:31:10.438081500 +0200
-@@ -921,20 +921,25 @@
+Index: nautilus-2.20.0/src/nautilus-navigation-window.c
+===================================================================
+--- nautilus-2.20.0.orig/src/nautilus-navigation-window.c 2007-09-03 16:49:27.000000000 +0200
++++ nautilus-2.20.0/src/nautilus-navigation-window.c 2007-09-24 11:39:14.875645837 +0200
+@@ -914,20 +914,25 @@
static gboolean
real_set_title (NautilusWindow *window, const char *title)
{
@@ -84,11 +84,11 @@
}
return changed;
-Index: nautilus-2.18.1/src/nautilus-spatial-window.c
-===================================================================
---- nautilus-2.18.1.orig/src/nautilus-spatial-window.c 2007-04-10 14:05:31.000000000 +0200
-+++ nautilus-2.18.1/src/nautilus-spatial-window.c 2007-04-26 00:31:10.442081750 +0200
-@@ -414,10 +414,14 @@
+Index: nautilus-2.20.0/src/nautilus-spatial-window.c
+===================================================================
+--- nautilus-2.20.0.orig/src/nautilus-spatial-window.c 2007-09-10 08:56:43.000000000 +0200
++++ nautilus-2.20.0/src/nautilus-spatial-window.c 2007-09-24 11:39:14.875645837 +0200
+@@ -430,10 +430,14 @@
gtk_window_set_title (GTK_WINDOW (window), _("Nautilus"));
} else if (changed) {
char *window_title;
@@ -104,10 +104,10 @@
}
return changed;
-Index: nautilus-2.18.1/src/nautilus-window.c
-===================================================================
---- nautilus-2.18.1.orig/src/nautilus-window.c 2007-04-10 14:05:31.000000000 +0200
-+++ nautilus-2.18.1/src/nautilus-window.c 2007-04-26 00:31:47.692409750 +0200
+Index: nautilus-2.20.0/src/nautilus-window.c
+===================================================================
+--- nautilus-2.20.0.orig/src/nautilus-window.c 2007-08-21 11:37:49.000000000 +0200
++++ nautilus-2.20.0/src/nautilus-window.c 2007-09-24 11:39:14.875645837 +0200
@@ -57,6 +57,7 @@
#include <X11/XF86keysym.h>
#endif
@@ -116,7 +116,7 @@
#include <libnautilus-private/nautilus-file-utilities.h>
#include <libnautilus-private/nautilus-file-attributes.h>
#include <libnautilus-private/nautilus-global-preferences.h>
-@@ -1705,3 +1706,90 @@
+@@ -1701,3 +1702,90 @@
{
return (nautilus_window_get_window_type (window) != NAUTILUS_WINDOW_DESKTOP);
}
@@ -207,10 +207,10 @@
+
+ return (location_title);
+}
-Index: nautilus-2.18.1/src/nautilus-window.h
-===================================================================
---- nautilus-2.18.1.orig/src/nautilus-window.h 2007-04-10 14:05:31.000000000 +0200
-+++ nautilus-2.18.1/src/nautilus-window.h 2007-04-26 00:31:10.442081750 +0200
+Index: nautilus-2.20.0/src/nautilus-window.h
+===================================================================
+--- nautilus-2.20.0.orig/src/nautilus-window.h 2007-04-03 12:08:06.000000000 +0200
++++ nautilus-2.20.0/src/nautilus-window.h 2007-09-24 11:39:14.875645837 +0200
@@ -151,5 +151,7 @@
void nautilus_window_add_extra_location_widget (NautilusWindow *window,
GtkWidget *widget);
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=12823&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/patches/11_gnomevfs_query_eject.patch (original)
+++ desktop/unstable/nautilus/debian/patches/11_gnomevfs_query_eject.patch Mon Sep 24 10:53:03 2007
@@ -1,7 +1,7 @@
-Index: nautilus-2.18.3/libnautilus-private/nautilus-desktop-link-monitor.c
+Index: nautilus-2.20.0/libnautilus-private/nautilus-desktop-link-monitor.c
===================================================================
---- nautilus-2.18.3.orig/libnautilus-private/nautilus-desktop-link-monitor.c 2006-03-18 08:13:55.000000000 +0100
-+++ nautilus-2.18.3/libnautilus-private/nautilus-desktop-link-monitor.c 2007-07-18 23:35:33.964732922 +0200
+--- nautilus-2.20.0.orig/libnautilus-private/nautilus-desktop-link-monitor.c 2007-04-03 12:08:46.000000000 +0200
++++ nautilus-2.20.0/libnautilus-private/nautilus-desktop-link-monitor.c 2007-09-24 11:39:27.208348638 +0200
@@ -107,6 +107,8 @@
GnomeVFSVolume *volume;
char *dialog_str;
@@ -26,11 +26,11 @@
eel_run_simple_dialog
(parent_view,
FALSE,
-Index: nautilus-2.18.3/src/file-manager/fm-directory-view.c
+Index: nautilus-2.20.0/src/file-manager/fm-directory-view.c
===================================================================
---- nautilus-2.18.3.orig/src/file-manager/fm-directory-view.c 2007-07-18 23:35:20.903988633 +0200
-+++ nautilus-2.18.3/src/file-manager/fm-directory-view.c 2007-07-18 23:35:33.972733378 +0200
-@@ -7268,10 +7268,14 @@
+--- nautilus-2.20.0.orig/src/file-manager/fm-directory-view.c 2007-09-24 11:38:54.310473895 +0200
++++ nautilus-2.20.0/src/file-manager/fm-directory-view.c 2007-09-24 11:39:27.212348866 +0200
+@@ -7342,10 +7342,14 @@
*show_unmount = TRUE;
volume = nautilus_file_get_volume (file);
@@ -47,10 +47,10 @@
if (gnome_vfs_drive_is_mounted (drive)) {
*show_unmount = TRUE;
} else {
-Index: nautilus-2.18.3/src/file-manager/fm-tree-view.c
+Index: nautilus-2.20.0/src/file-manager/fm-tree-view.c
===================================================================
---- nautilus-2.18.3.orig/src/file-manager/fm-tree-view.c 2007-02-06 11:26:33.000000000 +0100
-+++ nautilus-2.18.3/src/file-manager/fm-tree-view.c 2007-07-18 23:35:33.972733378 +0200
+--- nautilus-2.20.0.orig/src/file-manager/fm-tree-view.c 2007-04-03 12:08:04.000000000 +0200
++++ nautilus-2.20.0/src/file-manager/fm-tree-view.c 2007-09-24 11:39:27.216349094 +0200
@@ -804,8 +804,12 @@
volume = fm_tree_model_get_volume_for_root_node_file (view->details->child_model, view->details->popup_file);
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=12823&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/patches/12_list-view_expand.patch (original)
+++ desktop/unstable/nautilus/debian/patches/12_list-view_expand.patch Mon Sep 24 10:53:03 2007
@@ -1,8 +1,16 @@
-Index: nautilus-2.18.1/src/file-manager/fm-list-view.c
+Index: nautilus-2.20.0/src/file-manager/fm-list-view.c
===================================================================
---- nautilus-2.18.1.orig/src/file-manager/fm-list-view.c 2007-04-10 14:05:29.000000000 +0200
-+++ nautilus-2.18.1/src/file-manager/fm-list-view.c 2007-05-16 00:46:09.805874250 +0200
-@@ -1337,7 +1337,7 @@
+--- nautilus-2.20.0.orig/src/file-manager/fm-list-view.c 2007-08-21 11:37:48.000000000 +0200
++++ nautilus-2.20.0/src/file-manager/fm-list-view.c 2007-09-24 11:55:24.918925454 +0200
+@@ -69,7 +69,6 @@
+ #include <libnautilus-private/nautilus-view-factory.h>
+ #include <libnautilus-private/nautilus-clipboard.h>
+ #include <libnautilus-private/nautilus-cell-renderer-pixbuf-emblem.h>
+-#include <libnautilus-private/nautilus-cell-renderer-text-ellipsized.h>
+
+ struct FMListViewDetails {
+ GtkTreeView *tree_view;
+@@ -1338,7 +1337,7 @@
for (l = nautilus_columns; l != NULL; l = l->next) {
NautilusColumn *nautilus_column;
@@ -11,7 +19,7 @@
char *name;
char *label;
float xalign;
-@@ -1360,6 +1360,9 @@
+@@ -1361,6 +1360,9 @@
view->details->pixbuf_cell = (GtkCellRendererPixbuf *)cell;
view->details->file_name_column = gtk_tree_view_column_new ();
@@ -21,12 +29,16 @@
g_object_ref (view->details->file_name_column);
gtk_object_sink (GTK_OBJECT (view->details->file_name_column));
view->details->file_name_column_num = column_num;
-@@ -1384,7 +1387,7 @@
- cell = gtk_cell_renderer_text_new ();
- g_object_set (cell,
- "ellipsize", PANGO_ELLIPSIZE_END,
-- "width-chars", 32,
-+ "ellipsize-set", TRUE,
- NULL);
+@@ -1382,7 +1384,11 @@
+ "pixbuf_emblem", FM_LIST_MODEL_SMALLEST_EMBLEM_COLUMN,
+ NULL);
+
+- cell = nautilus_cell_renderer_text_ellipsized_new ();
++ cell = gtk_cell_renderer_text_new ();
++ g_object_set (cell,
++ "ellipsize", PANGO_ELLIPSIZE_END,
++ "ellipsize-set", TRUE,
++ NULL);
view->details->file_name_cell = (GtkCellRendererText *)cell;
g_signal_connect (cell, "edited", G_CALLBACK (cell_renderer_edited), view);
+ g_signal_connect (cell, "editing-canceled", G_CALLBACK (cell_renderer_editing_canceled), view);
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=12823&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/patches/14_sidebar_network-protocol.patch (original)
+++ desktop/unstable/nautilus/debian/patches/14_sidebar_network-protocol.patch Mon Sep 24 10:53:03 2007
@@ -1,8 +1,8 @@
-Index: nautilus-2.18.3/src/nautilus-places-sidebar.c
+Index: nautilus-2.20.0/src/nautilus-places-sidebar.c
===================================================================
---- nautilus-2.18.3.orig/src/nautilus-places-sidebar.c 2007-07-22 15:02:02.701996181 +0200
-+++ nautilus-2.18.3/src/nautilus-places-sidebar.c 2007-07-22 15:15:47.224983069 +0200
-@@ -315,6 +315,14 @@
+--- nautilus-2.20.0.orig/src/nautilus-places-sidebar.c 2007-09-24 11:36:56.503760473 +0200
++++ nautilus-2.20.0/src/nautilus-places-sidebar.c 2007-09-24 11:58:27.629337527 +0200
+@@ -324,6 +324,14 @@
}
g_list_free (drives);
Modified: desktop/unstable/nautilus/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/series?rev=12823&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/patches/series (original)
+++ desktop/unstable/nautilus/debian/patches/series Mon Sep 24 10:53:03 2007
@@ -8,9 +8,7 @@
10_location_titlebar.patch
11_gnomevfs_query_eject.patch
12_list-view_expand.patch
-13_thumbnail_size_pref.patch
14_sidebar_network-protocol.patch
15_tracker_check.patch
20_upstream_nautilus-dnd-user-owned.patch -p0
-60_combobox-changed-signal.patch
99_ltmain_as-needed.patch
Modified: desktop/unstable/nautilus/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/rules?rev=12823&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/rules (original)
+++ desktop/unstable/nautilus/debian/rules Mon Sep 24 10:53:03 2007
@@ -12,6 +12,9 @@
# debug lib
DEB_DH_STRIP_ARGS += --dbg-package=nautilus-dbg
-DEB_CONFIGURE_EXTRA_FLAGS += --libexecdir=/usr/lib/nautilus
+DEB_CONFIGURE_EXTRA_FLAGS += --libexecdir=/usr/lib/nautilus --disable-update-mimedb
LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
DEB_DH_MAKESHLIBS_ARGS_libnautilus-extension1 += -V 'libnautilus-extension1 (>= 2.17.90)'
+
+binary-post-install/nautilus-data::
+ dh_installmime -p$(cdbs_curpkg)
More information about the pkg-gnome-commits
mailing list