r15201 - in /desktop/experimental/nautilus/debian: ./ patches/
slomo at users.alioth.debian.org
slomo at users.alioth.debian.org
Sun Mar 16 20:48:33 UTC 2008
Author: slomo
Date: Sun Mar 16 20:48:33 2008
New Revision: 15201
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=15201
Log:
* New upstream stable release:
+ TODO: patches 07, 10, 11, 14 don't apply anymore!
+ Upload to experimental first because of intrusive changes.
+ debian/control.in:
- Update build dependencies and dependencies.
+ debian/rules:
- Bump shlibs.
+ debian/patches/01_prompt_same_file.patch,
debian/patches/16_missing_thumbnails.patch,
debian/patches/20_upstream_nautilus-dnd-user-owned.patch,
debian/patches/21_nautilus_xmp.patch,
debian/patches/23_thumbnails_add-border.patch:
- Dropped, merged upstream.
+ debian/patches/06_dont_create_Desktop.patch:
- Updated to apply cleanly again.
+ debian/patches/99_ltmain_as-needed.patch:
- Updated to apply cleanly again.
Removed:
desktop/experimental/nautilus/debian/patches/01_prompt_same_file.patch
desktop/experimental/nautilus/debian/patches/16_missing_thumbnails.patch
desktop/experimental/nautilus/debian/patches/20_upstream_nautilus-dnd-user-owned.patch
desktop/experimental/nautilus/debian/patches/21_nautilus_xmp.patch
desktop/experimental/nautilus/debian/patches/23_thumbnails_add-border.patch
Modified:
desktop/experimental/nautilus/debian/changelog
desktop/experimental/nautilus/debian/control
desktop/experimental/nautilus/debian/control.in
desktop/experimental/nautilus/debian/patches/06_dont_create_Desktop.patch
desktop/experimental/nautilus/debian/patches/99_ltmain_as-needed.patch
desktop/experimental/nautilus/debian/patches/series
desktop/experimental/nautilus/debian/rules
Modified: desktop/experimental/nautilus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/nautilus/debian/changelog?rev=15201&op=diff
==============================================================================
--- desktop/experimental/nautilus/debian/changelog (original)
+++ desktop/experimental/nautilus/debian/changelog Sun Mar 16 20:48:33 2008
@@ -1,4 +1,4 @@
-nautilus (2.20.0-4) UNRELEASED; urgency=low
+nautilus (2.22.0-1) experimental; urgency=low
[ Loic Minier ]
* Add a nautilus-extensions-1.0 Provide to nautilus to express the fact that
@@ -9,7 +9,26 @@
[ Josselin Mouette ]
* Demote fam to a Suggests; only g-d-e really needs to recommend it.
- -- Josselin Mouette <joss at debian.org> Thu, 31 Jan 2008 15:45:04 +0100
+ [ Sebastian Dröge ]
+ * New upstream stable release:
+ + TODO: patches 07, 10, 11, 14 don't apply anymore!
+ + Upload to experimental first because of intrusive changes.
+ + debian/control.in:
+ - Update build dependencies and dependencies.
+ + debian/rules:
+ - Bump shlibs.
+ + debian/patches/01_prompt_same_file.patch,
+ debian/patches/16_missing_thumbnails.patch,
+ debian/patches/20_upstream_nautilus-dnd-user-owned.patch,
+ debian/patches/21_nautilus_xmp.patch,
+ debian/patches/23_thumbnails_add-border.patch:
+ - Dropped, merged upstream.
+ + debian/patches/06_dont_create_Desktop.patch:
+ - Updated to apply cleanly again.
+ + debian/patches/99_ltmain_as-needed.patch:
+ - Updated to apply cleanly again.
+
+ -- Sebastian Dröge <slomo at debian.org> Sun, 16 Mar 2008 20:30:48 +0100
nautilus (2.20.0-3) unstable; urgency=low
Modified: desktop/experimental/nautilus/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/nautilus/debian/control?rev=15201&op=diff
==============================================================================
--- desktop/experimental/nautilus/debian/control (original)
+++ desktop/experimental/nautilus/debian/control Sun Mar 16 20:48:33 2008
@@ -10,8 +10,7 @@
libgtk2.0-dev (>= 2.11.6),
libgnomeui-dev (>= 2.16.0-2),
libbonobo2-dev (>= 2.15),
- libgnomevfs2-dev (>= 1:2.19.3),
- libeel2-dev (>= 2.20.0),
+ libeel2-dev (>= 2.21.90),
librsvg2-dev (>= 2.16.0-2),
libgnome-desktop-dev (>= 2.9.91),
libesd0-dev (>= 0.2.27),
@@ -23,17 +22,17 @@
dpkg-dev (>= 1.13.19),
libxt-dev,
libexif-dev (>= 0.6.12),
- libart-2.0-dev (>= 2.3.10),
liborbit2-dev (>= 2.4.0),
libxml2-dev (>= 2.4.7),
libstartup-notification0-dev (>= 0.8),
docbook-utils,
libselinux1-dev,
- libglib2.0-dev (>= 2.14.0),
+ libglib2.0-dev (>= 2.15.6),
libgnome2-dev (>= 2.14.0),
libpango1.0-dev (>= 1.1.2),
x11proto-core-dev,
libtrackerclient-dev (>= 0.0.1),
+ libbeagle-dev,
libexempi-dev (>= 1.99.5),
intltool (>= 0.35.0)
Homepage: http://www.gnome.org/projects/nautilus/
@@ -49,13 +48,14 @@
nautilus-data (<< ${gnome:NextVersion}),
shared-mime-info,
gnome-control-center (>= 2.6),
- desktop-file-utils (>= 0.7)
-Provides: nautilus-extensions-1.0
+ desktop-file-utils (>= 0.7),
+ gvfs-backends
+Provides: nautilus-extensions-2.0
Recommends: desktop-base (>= 0.2),
eject,
nautilus-cd-burner (>= 2.6),
librsvg2-common,
- libgnomevfs2-extra
+ xdg-user-dirs
Suggests: eog,
evince | pdf-viewer,
totem | mp3-decoder,
@@ -107,8 +107,8 @@
Architecture: any
Section: libdevel
Depends: libnautilus-extension1 (= ${binary:Version}),
+ libglib2.0-dev (>= 2.15.6),
libgtk2.0-dev (>= 2.10.0),
- libgnomevfs2-dev (>= 1:2.16.0-1),
${shlibs:Depends}
Conflicts: libnautilus2-dev
Replaces: libnautilus2-dev
Modified: desktop/experimental/nautilus/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/nautilus/debian/control.in?rev=15201&op=diff
==============================================================================
--- desktop/experimental/nautilus/debian/control.in (original)
+++ desktop/experimental/nautilus/debian/control.in Sun Mar 16 20:48:33 2008
@@ -10,8 +10,7 @@
libgtk2.0-dev (>= 2.11.6),
libgnomeui-dev (>= 2.16.0-2),
libbonobo2-dev (>= 2.15),
- libgnomevfs2-dev (>= 1:2.19.3),
- libeel2-dev (>= 2.20.0),
+ libeel2-dev (>= 2.21.90),
librsvg2-dev (>= 2.16.0-2),
libgnome-desktop-dev (>= 2.9.91),
libesd0-dev (>= 0.2.27),
@@ -23,17 +22,17 @@
dpkg-dev (>= 1.13.19),
libxt-dev,
libexif-dev (>= 0.6.12),
- libart-2.0-dev (>= 2.3.10),
liborbit2-dev (>= 2.4.0),
libxml2-dev (>= 2.4.7),
libstartup-notification0-dev (>= 0.8),
docbook-utils,
libselinux1-dev,
- libglib2.0-dev (>= 2.14.0),
+ libglib2.0-dev (>= 2.15.6),
libgnome2-dev (>= 2.14.0),
libpango1.0-dev (>= 1.1.2),
x11proto-core-dev,
libtrackerclient-dev (>= 0.0.1),
+ libbeagle-dev,
libexempi-dev (>= 1.99.5),
intltool (>= 0.35.0)
Homepage: http://www.gnome.org/projects/nautilus/
@@ -49,13 +48,14 @@
nautilus-data (<< ${gnome:NextVersion}),
shared-mime-info,
gnome-control-center (>= 2.6),
- desktop-file-utils (>= 0.7)
-Provides: nautilus-extensions-1.0
+ desktop-file-utils (>= 0.7),
+ gvfs-backends
+Provides: nautilus-extensions-2.0
Recommends: desktop-base (>= 0.2),
eject,
nautilus-cd-burner (>= 2.6),
librsvg2-common,
- libgnomevfs2-extra
+ xdg-user-dirs
Suggests: eog,
evince | pdf-viewer,
totem | mp3-decoder,
@@ -107,8 +107,8 @@
Architecture: any
Section: libdevel
Depends: libnautilus-extension1 (= ${binary:Version}),
+ libglib2.0-dev (>= 2.15.6),
libgtk2.0-dev (>= 2.10.0),
- libgnomevfs2-dev (>= 1:2.16.0-1),
${shlibs:Depends}
Conflicts: libnautilus2-dev
Replaces: libnautilus2-dev
Modified: desktop/experimental/nautilus/debian/patches/06_dont_create_Desktop.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/nautilus/debian/patches/06_dont_create_Desktop.patch?rev=15201&op=diff
==============================================================================
--- desktop/experimental/nautilus/debian/patches/06_dont_create_Desktop.patch (original)
+++ desktop/experimental/nautilus/debian/patches/06_dont_create_Desktop.patch Sun Mar 16 20:48:33 2008
@@ -1,74 +1,9 @@
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
-+++ libnautilus-private/nautilus-monitor.c 2007-09-24 11:38:42.713813039 +0200
-@@ -38,6 +38,13 @@
- GnomeVFSMonitorHandle *handle;
- };
-
-+static gboolean has_desktop = TRUE;
-+
-+void nautilus_monitor_set_desktop(gboolean use_desktop)
-+{
-+ has_desktop = use_desktop;
-+}
-+
- gboolean
- nautilus_monitor_active (void)
- {
-@@ -47,19 +54,22 @@
- NautilusMonitor *monitor;
-
- if (tried_monitor == FALSE) {
-- desktop_directory = nautilus_get_desktop_directory ();
-- uri = gnome_vfs_get_uri_from_local_path (desktop_directory);
--
-- monitor = nautilus_monitor_directory (uri);
-- monitor_success = (monitor != NULL);
-+ if (has_desktop)
-+ {
-+ desktop_directory = nautilus_get_desktop_directory ();
-+ uri = gnome_vfs_get_uri_from_local_path (desktop_directory);
-+
-+ monitor = nautilus_monitor_directory (uri);
-+ monitor_success = (monitor != NULL);
-+
-+ if (monitor != NULL) {
-+ nautilus_monitor_cancel (monitor);
-+ }
-
-- if (monitor != NULL) {
-- nautilus_monitor_cancel (monitor);
-+ g_free (desktop_directory);
-+ g_free (uri);
- }
-
-- g_free (desktop_directory);
-- g_free (uri);
--
- tried_monitor = TRUE;
- }
-
-Index: libnautilus-private/nautilus-monitor.h
-===================================================================
---- 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;
-
-+void nautilus_monitor_set_desktop (gboolean use_desktop);
- gboolean nautilus_monitor_active (void);
- NautilusMonitor *nautilus_monitor_file (const char *uri);
- NautilusMonitor *nautilus_monitor_directory (const char *uri);
-Index: src/nautilus-application.c
-===================================================================
---- 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 @@
+--- src/nautilus-application.c.old 2008-03-16 20:50:22.000000000 +0100
++++ src/nautilus-application.c 2008-03-16 21:00:40.000000000 +0100
+@@ -283,7 +283,7 @@
}
static gboolean
@@ -77,61 +12,62 @@
{
char *user_directory;
char *desktop_directory;
-@@ -258,20 +258,24 @@
-
- g_assert (NAUTILUS_IS_APPLICATION (application));
+@@ -295,7 +295,6 @@
+ ret = TRUE;
-- user_directory = nautilus_get_user_directory ();
+ user_directory = nautilus_get_user_directory ();
- desktop_directory = nautilus_get_desktop_directory ();
--
- directories = eel_string_list_new (TRUE);
--
-+
-+ user_directory = nautilus_get_user_directory ();
- if (!g_file_test (user_directory, G_FILE_TEST_IS_DIR)) {
- eel_string_list_insert (directories, user_directory);
+
+ directories = NULL;
+
+@@ -303,8 +302,13 @@
+ directories = g_slist_prepend (directories, user_directory);
}
- g_free (user_directory);
--
+
- if (!g_file_test (desktop_directory, G_FILE_TEST_IS_DIR)) {
-- eel_string_list_insert (directories, desktop_directory);
+- directories = g_slist_prepend (directories, desktop_directory);
+ if (!no_desktop)
+ {
+ desktop_directory = nautilus_get_desktop_directory ();
-+
+ if (!g_file_test (desktop_directory, G_FILE_TEST_IS_DIR)) {
-+ eel_string_list_insert (directories, desktop_directory);
++ directories = g_slist_prepend (directories, desktop_directory);
+ }
+ g_free (desktop_directory);
}
+
+ if (directories != NULL) {
+@@ -346,7 +350,6 @@
+
+ g_slist_free (directories);
+ g_free (user_directory);
- g_free (desktop_directory);
-+ else
-+ nautilus_monitor_set_desktop(!no_desktop);
- failed_count = eel_string_list_get_length (directories);
-
-@@ -400,7 +404,7 @@
+ return ret;
+ }
+@@ -408,7 +411,7 @@
}
static void
-finish_startup (NautilusApplication *application)
+finish_startup (NautilusApplication *application, gboolean no_desktop)
{
- /* initialize nautilus modules */
- nautilus_module_init ();
-@@ -416,8 +420,9 @@
- /* Make the desktop work with old Nautilus. */
- migrate_old_nautilus_files ();
+ GList *drives;
+@@ -420,8 +423,11 @@
+ /* attach menu-provider module callback */
+ menu_provider_init_callback ();
+
- /* Initialize the desktop link monitor singleton */
- nautilus_desktop_link_monitor_get ();
+ if (!no_desktop)
++ {
+ /* Initialize the desktop link monitor singleton */
+ nautilus_desktop_link_monitor_get ();
- }
++ }
- static void
-@@ -520,7 +525,7 @@
+ /* Watch for mounts so we can restore open windows This used
+ * to be for showing new window on mount, but is not used
+@@ -550,7 +556,7 @@
/* Check the user's ~/.nautilus directories and post warnings
* if there are problems.
*/
@@ -140,7 +76,7 @@
return;
}
-@@ -538,7 +543,7 @@
+@@ -568,7 +574,7 @@
case Bonobo_ACTIVATION_REG_SUCCESS:
/* We are registered and all is right with the world. */
application->shell_registered = TRUE;
Modified: desktop/experimental/nautilus/debian/patches/99_ltmain_as-needed.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/nautilus/debian/patches/99_ltmain_as-needed.patch?rev=15201&op=diff
==============================================================================
--- desktop/experimental/nautilus/debian/patches/99_ltmain_as-needed.patch (original)
+++ desktop/experimental/nautilus/debian/patches/99_ltmain_as-needed.patch Sun Mar 16 20:48:33 2008
@@ -1,8 +1,6 @@
-Index: nautilus-2.18.1/ltmain.sh
-===================================================================
---- nautilus-2.18.1.orig/ltmain.sh 2006-07-13 09:12:13.000000000 +0200
-+++ nautilus-2.18.1/ltmain.sh 2007-06-06 23:36:38.899175453 +0200
-@@ -1784,6 +1784,11 @@
+--- ltmain.sh.old 2007-10-09 07:38:25.000000000 +0200
++++ ltmain.sh 2007-10-09 07:39:25.000000000 +0200
+@@ -1794,6 +1794,11 @@
arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
;;
@@ -10,11 +8,11 @@
+ deplibs="$deplibs $arg"
+ continue
+ ;;
-+
++
-Wl,*)
args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
arg=
-@@ -2124,6 +2129,15 @@
+@@ -2137,6 +2142,15 @@
lib=
found=no
case $deplib in
@@ -27,6 +25,6 @@
+ fi
+ continue
+ ;;
- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
if test "$linkmode,$pass" = "prog,link"; then
compile_deplibs="$deplib $compile_deplibs"
Modified: desktop/experimental/nautilus/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/nautilus/debian/patches/series?rev=15201&op=diff
==============================================================================
--- desktop/experimental/nautilus/debian/patches/series (original)
+++ desktop/experimental/nautilus/debian/patches/series Sun Mar 16 20:48:33 2008
@@ -1,17 +1,12 @@
-01_prompt_same_file.patch
03_sftp_connect.patch
04_show_backup_files.patch
05_places-sidebar_single-click.patch
06_dont_create_Desktop.patch -p0
-07_desktop_file_activation.patch
+#07_desktop_file_activation.patch
08_folder_handler.patch
-10_location_titlebar.patch
-11_gnomevfs_query_eject.patch
+#10_location_titlebar.patch
+#11_gnomevfs_query_eject.patch
12_list-view_expand.patch
-14_sidebar_network-protocol.patch
+#14_sidebar_network-protocol.patch
15_tracker_check.patch
-16_missing_thumbnails.patch
-20_upstream_nautilus-dnd-user-owned.patch -p0
-21_nautilus_xmp.patch
-23_thumbnails_add-border.patch
-99_ltmain_as-needed.patch
+99_ltmain_as-needed.patch -p0
Modified: desktop/experimental/nautilus/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/nautilus/debian/rules?rev=15201&op=diff
==============================================================================
--- desktop/experimental/nautilus/debian/rules (original)
+++ desktop/experimental/nautilus/debian/rules Sun Mar 16 20:48:33 2008
@@ -14,7 +14,7 @@
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)'
+DEB_DH_MAKESHLIBS_ARGS_libnautilus-extension1 += -V 'libnautilus-extension1 (>= 2.21.6)'
binary-post-install/nautilus-data::
dh_installmime -p$(cdbs_curpkg)
More information about the pkg-gnome-commits
mailing list