r17034 - in /desktop/experimental/nautilus/debian: changelog control control.in

[kov at users.alioth.debian.org]

Author: kov
Date: Tue Sep 23 03:05:41 2008
New Revision: 17034

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=17034
Log:
merge changes done to the unstable branch up to rev 17032

Modified:
    desktop/experimental/nautilus/debian/changelog
    desktop/experimental/nautilus/debian/control
    desktop/experimental/nautilus/debian/control.in

Modified: desktop/experimental/nautilus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/nautilus/debian/changelog?rev=17034&op=diff
==============================================================================
--- desktop/experimental/nautilus/debian/changelog (original)
+++ desktop/experimental/nautilus/debian/changelog Tue Sep 23 03:05:41 2008
@@ -91,15 +91,6 @@
  -- Sebastian Dröge <slomo at debian.org>  Wed, 19 Mar 2008 11:10:42 +0100
 
 nautilus (2.22.0-1) experimental; urgency=low
-
-  [ Loic Minier ]
-  * Add a nautilus-extensions-1.0 Provide to nautilus to express the fact that
-    nautilus will search for extensions in /usr/lib/nautilus/extensions-1.0;
-    this might avoid a long list of Conflicts in nautilus when updating to
-    extensions-2.0 (nautilus >= 2.21.2).
-
-  [ Josselin Mouette ]
-  * Demote fam to a Suggests; only g-d-e really needs to recommend it.
 
   [ Sebastian Dröge ]
   * New upstream stable release:
@@ -135,6 +126,51 @@
 
  -- Sebastian Dröge <slomo at debian.org>  Sun, 16 Mar 2008 20:30:48 +0100
 
+nautilus (2.20.0-7) unstable; urgency=low
+
+  * 25_disable_sighandler.patch: patch from upstream SVN. Disable the 
+    horrible signal handler that makes nautilus go wild while filling 
+    its debug log. Closes: #454764, #494788.
+  * Don’t require libselinux on non-linux OSes. Closes: #494645.
+
+ -- Josselin Mouette <joss at debian.org>  Tue, 16 Sep 2008 08:15:05 +0200
+
+nautilus (2.20.0-6) unstable; urgency=low
+
+  * 24_smb_crash.patch: patch from upstream to handle NULL MIME types 
+    set by the SMB module gracefully, avoiding a lot of crashes.
+
+ -- Josselin Mouette <joss at debian.org>  Mon, 21 Jul 2008 17:09:01 +0200
+
+nautilus (2.20.0-5) unstable; urgency=low
+
+  * 05_places-sidebar_single-click.patch: replaced by upstream version 
+    of the patch, that does not activate items while right-clicking 
+    them. Closes: #414960.
+  * 06_dont_create_Desktop.patch, 
+    20_upstream_nautilus-dnd-user-owned.patch: make patches apply with 
+    -p1. Closes: #484953.
+  * Recommend app-install-data and synaptic now that libeel doesn’t 
+    anymore.
+
+ -- Josselin Mouette <joss at debian.org>  Fri, 18 Jul 2008 13:27:27 +0200
+
+nautilus (2.20.0-4) unstable; urgency=low
+
+  [ Loic Minier ]
+  * Add a nautilus-extensions-1.0 Provide to nautilus to express the fact that
+    nautilus will search for extensions in /usr/lib/nautilus/extensions-1.0;
+    this might avoid a long list of Conflicts in nautilus when updating to
+    extensions-2.0 (nautilus >= 2.21.2).
+
+  [ Josselin Mouette ]
+  * Demote fam to a Suggests; only g-d-e really needs to recommend it.
+  * 02_trash_location.patch: new patch. When unmounting a volume with a 
+    non-empty trash, take into account that with the new location, the 
+    directory to remove is the parent of the one returned by gnome-vfs.
+
+ -- Josselin Mouette <joss at debian.org>  Wed, 28 May 2008 01:47:28 +0200
+
 nautilus (2.20.0-3) unstable; urgency=low
 
   [ Diego Escalante Urrelo ]

Modified: desktop/experimental/nautilus/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/nautilus/debian/control?rev=17034&op=diff
==============================================================================
--- desktop/experimental/nautilus/debian/control (original)
+++ desktop/experimental/nautilus/debian/control Tue Sep 23 03:05:41 2008
@@ -25,7 +25,7 @@
                libxml2-dev (>= 2.4.7),
                libstartup-notification0-dev (>= 0.8),
                docbook-utils,
-               libselinux1-dev,
+               libselinux1-dev | not+linux-gnu,
                libglib2.0-dev (>= 2.15.6),
                libgnome2-dev (>= 2.14.0),
                libpango1.0-dev (>= 1.1.2),

Modified: desktop/experimental/nautilus/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/nautilus/debian/control.in?rev=17034&op=diff
==============================================================================
--- desktop/experimental/nautilus/debian/control.in (original)
+++ desktop/experimental/nautilus/debian/control.in Tue Sep 23 03:05:41 2008
@@ -25,7 +25,7 @@
                libxml2-dev (>= 2.4.7),
                libstartup-notification0-dev (>= 0.8),
                docbook-utils,
-               libselinux1-dev,
+               libselinux1-dev | not+linux-gnu,
                libglib2.0-dev (>= 2.15.6),
                libgnome2-dev (>= 2.14.0),
                libpango1.0-dev (>= 1.1.2),