[Pkg-xfce-commits] r4231 - in desktop/branches/lenny-backports/thunar/debian: . patches
Yves-Alexis Perez
corsac at alioth.debian.org
Tue Aug 17 08:17:02 UTC 2010
Author: corsac
Date: 2010-08-17 20:16:57 +0000 (Tue, 17 Aug 2010)
New Revision: 4231
Added:
desktop/branches/lenny-backports/thunar/debian/patches/05_fix-crash-drag-gdk-none.patch
desktop/branches/lenny-backports/thunar/debian/patches/06_fix-sidepane-width.patch
desktop/branches/lenny-backports/thunar/debian/patches/07_update-cursor-on-delete.patch
desktop/branches/lenny-backports/thunar/debian/patches/08_refilter-tree-hidden-dir.patch
Modified:
desktop/branches/lenny-backports/thunar/debian/changelog
desktop/branches/lenny-backports/thunar/debian/control
desktop/branches/lenny-backports/thunar/debian/rules
desktop/branches/lenny-backports/thunar/debian/watch
Log:
merge changes from latest version in squeeze to backports
Modified: desktop/branches/lenny-backports/thunar/debian/changelog
===================================================================
--- desktop/branches/lenny-backports/thunar/debian/changelog 2010-08-17 19:42:22 UTC (rev 4230)
+++ desktop/branches/lenny-backports/thunar/debian/changelog 2010-08-17 20:16:57 UTC (rev 4231)
@@ -1,9 +1,60 @@
-thunar (1.0.1-1~bpo50+1) lenny-backports; urgency=low
+thunar (1.0.2-1~bpo50+1) lenny-backports; urgency=low
* Rebuild for lenny-backports.
- -- Yves-Alexis Perez <corsac at debian.org> Sat, 11 Jul 2009 11:32:50 +0200
+ -- Yves-Alexis Perez <corsac at debian.org> Tue, 17 Aug 2010 22:03:39 +0200
+thunar (1.0.2-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/patches/04_fix-umask-handling.patch: dropped, included upstream.
+ * debian/control: build-dep on libstartup-notification0-dev (>= 0.4) as
+ startup notification support is enabled in debian/rules.
+
+ -- Lionel Le Folgoc <mrpouit at gmail.com> Sat, 22 May 2010 17:11:38 +0200
+
+thunar (1.0.1-4) unstable; urgency=low
+
+ * debian/patches/05_fix-crash-drag-gdk-none.patch: backport patch from
+ upstream git to fix crash when dragging non-file data over a window
+ (thanks Daniel Gibson for the hint). closes: #575665
+ * debian/patches: import some patches from lucid to fix several minor
+ issues (also fixed in upstream git master):
+ - 06_fix-sidepane-width.patch: use g_utf8_strlen to calculate the
+ sidepane width, prevents it from being too large with chinese or
+ cyrillic locales. lp: #501211
+ - 07_update-cursor-on-delete.patch: properly update the cursor when
+ a row is deleted in, fixes weird cursor behaviors (Xfce #5361).
+ - 08_refilter-tree-hidden-dir.patch: refilter tree model view when
+ entering/leaving an hidden directory, prevents hidden dir/files
+ from being wrongly displayed. lp: #484220
+ * debian/control: add myself to uploaders.
+
+ -- Lionel Le Folgoc <mrpouit at gmail.com> Sat, 24 Apr 2010 14:00:31 +0200
+
+thunar (1.0.1-3) unstable; urgency=low
+
+ * debian/control:
+ - drop strict versioned dependency on thunar-data for libthunarvfs
+ packages, only Thunar really needs it.
+ - switch libjpeg62-dev build-dep to libjpeg-dev.
+ - update standards version to 3.8.4.
+ * debian/watch updated. closes: #570793
+
+ -- Yves-Alexis Perez <corsac at debian.org> Sun, 21 Feb 2010 16:24:34 +0100
+
+thunar (1.0.1-2) unstable; urgency=low
+
+ * debian/control:
+ - correct typo. closes: #531448
+ - update standards version to 3.8.3
+ * debian/patches:
+ - 04_fix-umask-handling.patch added. closes: #549282
+ * debian/rules:
+ - dh_desktop is deprecated, remove it.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Tue, 06 Oct 2009 07:55:50 +0200
+
thunar (1.0.1-1) unstable; urgency=low
* New upstream release.
Modified: desktop/branches/lenny-backports/thunar/debian/control
===================================================================
--- desktop/branches/lenny-backports/thunar/debian/control 2010-08-17 19:42:22 UTC (rev 4230)
+++ desktop/branches/lenny-backports/thunar/debian/control 2010-08-17 20:16:57 UTC (rev 4231)
@@ -2,15 +2,16 @@
Section: xfce
Priority: optional
Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
-Uploaders: Yves-Alexis Perez <corsac at debian.org>, Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>
+Uploaders: Yves-Alexis Perez <corsac at debian.org>, Emanuele Rocca <ema at debian.org>,
+ Simon Huggins <huggie at earth.li>, Lionel Le Folgoc <mrpouit at gmail.com>
Build-Depends: debhelper (>= 7), libcairo2-dev,
libexo-0.3-dev (>= 0.3.100), cdbs, libxml-parser-perl, libfam-dev,
libhal-storage-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
libdbus-glib-1-dev, libexif-dev, libgtk2.0-dev (>= 2.10.1),
- xfce4-panel-dev (>= 4.6.0), chrpath, libpcre3-dev, libjpeg62-dev,
- intltool
+ xfce4-panel-dev (>= 4.6.0), chrpath, libpcre3-dev, libjpeg-dev,
+ libstartup-notification0-dev (>= 0.4), intltool
Build-Conflicts: libgamin-dev [!hurd-i386]
-Standards-Version: 3.8.1
+Standards-Version: 3.8.4
Homepage: http://thunar.xfce.org
Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/thunar/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/thunar/
@@ -19,8 +20,7 @@
Section: libdevel
Architecture: any
Depends: libthunar-vfs-1-2 (= ${binary:Version}), ${misc:Depends},
- libexo-0.3-dev (>= 0.3.100), thunar-data (=${source:Version}),
- libglib2.0-dev, libgtk2.0-dev
+ libexo-0.3-dev (>= 0.3.100), thunar-data, libglib2.0-dev, libgtk2.0-dev
Description: Development files for libthunar-vfs
This package contains the headers and the static library for libthunar-vfs,
the virtual file system abstraction used by thunar
@@ -28,7 +28,7 @@
Package: libthunar-vfs-1-2
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}, thunar-data (= ${source:Version}), ${misc:Depends}
+Depends: ${shlibs:Depends}, thunar-data, ${misc:Depends}
Description: VFS abstraction used in thunar
This package contains a library for virtual file system abstraction. It's
used by thunar, the file manager of Xfce 4.6
@@ -36,7 +36,8 @@
Package: thunar
Section: xfce
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, desktop-file-utils, shared-mime-info, thunar-data (= ${source:Version}), exo-utils
+Depends: ${shlibs:Depends}, ${misc:Depends}, desktop-file-utils,
+ shared-mime-info, thunar-data (= ${source:Version}), exo-utils
Recommends: hal, dbus-x11, gamin, ${shlibs:Recommends}, thunar-volman,
xdg-user-dirs
Suggests: thunar-archive-plugin, thunar-media-tags-plugin
Copied: desktop/branches/lenny-backports/thunar/debian/patches/05_fix-crash-drag-gdk-none.patch (from rev 4077, desktop/trunk/thunar/debian/patches/05_fix-crash-drag-gdk-none.patch)
===================================================================
--- desktop/branches/lenny-backports/thunar/debian/patches/05_fix-crash-drag-gdk-none.patch (rev 0)
+++ desktop/branches/lenny-backports/thunar/debian/patches/05_fix-crash-drag-gdk-none.patch 2010-08-17 20:16:57 UTC (rev 4231)
@@ -0,0 +1,25 @@
+From 58568697a90844d98c7602902df8084297f19c1b Mon Sep 17 00:00:00 2001
+From: Jannis Pohlmann <jannis at xfce.org>
+Date: Sun, 20 Dec 2009 13:42:21 +0000
+Subject: Avoid requesting drag data if target is GDK_NONE (bug #5771).
+
+Patch provided by k.blammo at gmail.com.
+
+Ported to thunar 1.0.1 for Xubuntu/Debian.
+---
+diff --git a/thunar/thunar-standard-view.c b/thunar/thunar-standard-view.c
+index 83139fc..8661861 100644
+--- a/thunar/thunar-standard-view.c
++++ b/thunar/thunar-standard-view.c
+@@ -2857,7 +2858,8 @@ thunar_standard_view_drag_motion (GtkWidget *view,
+ else
+ {
+ /* request the drag data from the source */
+- gtk_drag_get_data (view, context, target, time);
++ if (target != GDK_NONE)
++ gtk_drag_get_data (view, context, target, time);
+ }
+
+ /* tell Gdk whether we can drop here */
+--
+cgit v0.8.2.1
Copied: desktop/branches/lenny-backports/thunar/debian/patches/06_fix-sidepane-width.patch (from rev 4077, desktop/trunk/thunar/debian/patches/06_fix-sidepane-width.patch)
===================================================================
--- desktop/branches/lenny-backports/thunar/debian/patches/06_fix-sidepane-width.patch (rev 0)
+++ desktop/branches/lenny-backports/thunar/debian/patches/06_fix-sidepane-width.patch 2010-08-17 20:16:57 UTC (rev 4231)
@@ -0,0 +1,23 @@
+From 79bc169e0c90c74d21d21d3d73730001a72a2dcc Mon Sep 17 00:00:00 2001
+From: Jannis Pohlmann <jannis at xfce.org>
+Date: Fri, 18 Sep 2009 21:41:06 +0000
+Subject: Use g_utf8_strlen to calculate the sidepane width. Bugs #5390 and #3965.
+
+Using strlen() for the number of characters is unrealistic when dealing
+with multibyte strings.
+---
+diff --git a/thunar/thunar-shortcuts-view.c b/thunar/thunar-shortcuts-view.c
+index 2ba4b61..c7df182 100644
+--- a/thunar/thunar-shortcuts-view.c
++++ b/thunar/thunar-shortcuts-view.c
+@@ -274,7 +274,7 @@ thunar_shortcuts_view_init (ThunarShortcutsView *view)
+ renderer = g_object_new (GTK_TYPE_CELL_RENDERER_TEXT,
+ "ellipsize-set", TRUE,
+ "ellipsize", PANGO_ELLIPSIZE_END,
+- "width-chars", strlen (_("File System")),
++ "width-chars", g_utf8_strlen (_("File System"), -1),
+ NULL);
+ g_signal_connect (G_OBJECT (renderer), "edited", G_CALLBACK (thunar_shortcuts_view_renamed), view);
+ gtk_tree_view_column_pack_start (column, renderer, TRUE);
+--
+cgit v0.8.2.1
Copied: desktop/branches/lenny-backports/thunar/debian/patches/07_update-cursor-on-delete.patch (from rev 4077, desktop/trunk/thunar/debian/patches/07_update-cursor-on-delete.patch)
===================================================================
--- desktop/branches/lenny-backports/thunar/debian/patches/07_update-cursor-on-delete.patch (rev 0)
+++ desktop/branches/lenny-backports/thunar/debian/patches/07_update-cursor-on-delete.patch 2010-08-17 20:16:57 UTC (rev 4231)
@@ -0,0 +1,37 @@
+From e49759d5b54c4f44c039648148c47d444ffded0f Mon Sep 17 00:00:00 2001
+From: Jannis Pohlmann <jannis at xfce.org>
+Date: Sat, 9 Jan 2010 22:36:15 +0100
+Subject: [PATCH 3/8] Properly update the cursor when a row is deleted in (bug #5361).
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf-8
+Content-Transfer-Encoding: 8bit
+
+When cursor and selection are out of sync weird things happen, as
+described by Jérôme in the bug comment on
+http://bugzilla.xfce.org/show_bug.cgi?id=5361.
+---
+ thunar/thunar-standard-view.c | 6 ++++--
+ 1 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/thunar/thunar-standard-view.c b/thunar/thunar-standard-view.c
+index 8661861..e6fb490 100644
+--- a/thunar/thunar-standard-view.c
++++ b/thunar/thunar-standard-view.c
+@@ -3019,10 +3019,12 @@ thunar_standard_view_restore_selection (ThunarListModel *model,
+ * path is set by thunar_standard_view_row_deleted() if this is the case */
+ if (G_LIKELY (standard_view->priv->selection_before_delete != NULL))
+ {
+- /* Restore the selection by selecting either the row before or the new
+- * first row */
++ /* Restore the selection by selecting either the row before or the new first row */
+ (*THUNAR_STANDARD_VIEW_GET_CLASS (standard_view)->select_path) (standard_view, standard_view->priv->selection_before_delete);
+
++ /* place the cursor on the selected path */
++ (*THUNAR_STANDARD_VIEW_GET_CLASS (standard_view)->set_cursor) (standard_view, standard_view->priv->selection_before_delete, FALSE);
++
+ /* Free the tree path */
+ gtk_tree_path_free (standard_view->priv->selection_before_delete);
+ standard_view->priv->selection_before_delete = NULL;
+--
+1.6.3.3
+
Copied: desktop/branches/lenny-backports/thunar/debian/patches/08_refilter-tree-hidden-dir.patch (from rev 4077, desktop/trunk/thunar/debian/patches/08_refilter-tree-hidden-dir.patch)
===================================================================
--- desktop/branches/lenny-backports/thunar/debian/patches/08_refilter-tree-hidden-dir.patch (rev 0)
+++ desktop/branches/lenny-backports/thunar/debian/patches/08_refilter-tree-hidden-dir.patch 2010-08-17 20:16:57 UTC (rev 4231)
@@ -0,0 +1,95 @@
+From 49ca1071a69776bcbff3ae987dca79e99bbca15e Mon Sep 17 00:00:00 2001
+From: Jannis Pohlmann <jannis at xfce.org>
+Date: Sun, 10 Jan 2010 14:36:11 +0100
+Subject: [PATCH 4/8] Refilter the tree model when a hidden dir is entered/left (bug #6142).
+
+What's new is that instead of only refiltering when entering a directory
+that is within a hidden hierarchy, we now do the same when leaving a
+hidden directory or directory with hidden ancestor. This makes sure
+hidden directories are properly removed from the tree view side pane
+when hidden directories are turned off, unless you're browsing them.
+---
+ thunar/thunar-tree-view.c | 47 ++++++++++++++++++++++++++++++++++++++++----
+ 1 files changed, 42 insertions(+), 5 deletions(-)
+
+diff --git a/thunar/thunar-tree-view.c b/thunar/thunar-tree-view.c
+index 3836a32..cfe1100 100644
+--- a/thunar/thunar-tree-view.c
++++ b/thunar/thunar-tree-view.c
+@@ -535,15 +535,46 @@ thunar_tree_view_set_current_directory (ThunarNavigator *navigator,
+ ThunarFile *current_directory)
+ {
+ ThunarTreeView *view = THUNAR_TREE_VIEW (navigator);
+- ThunarFile *file, *file_parent;
++ ThunarFile *file;
++ ThunarFile *file_parent;
++ gboolean needs_refiltering = FALSE;
+
+ /* check if we already use that directory */
+ if (G_UNLIKELY (view->current_directory == current_directory))
+ return;
+
+- /* disconnect from the previous current directory */
++ /* check if we have an active directory */
+ if (G_LIKELY (view->current_directory != NULL))
+- g_object_unref (G_OBJECT (view->current_directory));
++ {
++ /* update the filter if the old current directory, or one of it's parents, is hidden */
++ if (!view->show_hidden)
++ {
++ /* look if the file or one of it's parents is hidden */
++ for (file = g_object_ref (G_OBJECT (view->current_directory)); file != NULL; file = file_parent)
++ {
++ /* check if this file is hidden */
++ if (thunar_file_is_hidden (file))
++ {
++ /* schedule an update of the filter after the current directory has been changed */
++ needs_refiltering = TRUE;
++
++ /* release the file */
++ g_object_unref (G_OBJECT (file));
++
++ break;
++ }
++
++ /* get the file parent */
++ file_parent = thunar_file_get_parent (file, NULL);
++
++ /* release the file */
++ g_object_unref (G_OBJECT (file));
++ }
++ }
++
++ /* disconnect from the previous current directory */
++ g_object_unref (G_OBJECT (view->current_directory));
++ }
+
+ /* activate the new current directory */
+ view->current_directory = current_directory;
+@@ -554,8 +585,10 @@ thunar_tree_view_set_current_directory (ThunarNavigator *navigator,
+ /* take a reference on the directory */
+ g_object_ref (G_OBJECT (current_directory));
+
+- /* update the filter if the new current directory, or one of it's parents, is hidden */
+- if (!view->show_hidden)
++ /* update the filter if the new current directory, or one of it's parents, is
++ * hidden. we don't have to check this unless refiltering needs to be done
++ * anyway */
++ if (!needs_refiltering && !view->show_hidden)
+ {
+ /* look if the file or one of it's parents is hidden */
+ for (file = g_object_ref (G_OBJECT (current_directory)); file != NULL; file = file_parent)
+@@ -593,6 +626,10 @@ thunar_tree_view_set_current_directory (ThunarNavigator *navigator,
+ }
+ }
+
++ /* refilter the model if necessary */
++ if (needs_refiltering)
++ thunar_tree_model_refilter (view->model);
++
+ /* notify listeners */
+ g_object_notify (G_OBJECT (view), "current-directory");
+ }
+--
+1.6.3.3
+
Modified: desktop/branches/lenny-backports/thunar/debian/rules
===================================================================
--- desktop/branches/lenny-backports/thunar/debian/rules 2010-08-17 19:42:22 UTC (rev 4230)
+++ desktop/branches/lenny-backports/thunar/debian/rules 2010-08-17 20:16:57 UTC (rev 4231)
@@ -31,9 +31,6 @@
install -m 0644 $(CURDIR)/debian/gnome-obex-send.desktop $(CURDIR)/debian/tmp/usr/share/Thunar/sendto/
install -m 0644 $(CURDIR)/debian/xfprint.desktop $(CURDIR)/debian/tmp/usr/share/Thunar/sendto/
-binary-install/thunar::
- dh_desktop
-
binary-post-install/thunar-data::
rm -rf $(CURDIR)/debian/thunar-data/usr/share/applications
rm -rf $(CURDIR)/debian/thunar-data/usr/share/xfce4/
Modified: desktop/branches/lenny-backports/thunar/debian/watch
===================================================================
--- desktop/branches/lenny-backports/thunar/debian/watch 2010-08-17 19:42:22 UTC (rev 4230)
+++ desktop/branches/lenny-backports/thunar/debian/watch 2010-08-17 20:16:57 UTC (rev 4231)
@@ -1,3 +1,3 @@
version=3
-http://www.xfce.org/archive/xfce-(.*)/src/ \
- Thunar-(.*)\.tar\.bz2
+http://www.xfce.org/archive/src/xfce/thunar/([\d\.]+)/ \
+ Thunar-([\d\.]+)\.tar\.(?:gz|bz2)
More information about the Pkg-xfce-commits
mailing list