[Pkg-xfce-commits] r2238 - in desktop/branches/svn-snapshots: . thunar thunar/debian thunar/debian/patches
corsac at alioth.debian.org
corsac at alioth.debian.org
Sat Aug 23 22:50:27 UTC 2008
Author: corsac
Date: 2008-08-23 22:50:26 +0000 (Sat, 23 Aug 2008)
New Revision: 2238
Added:
desktop/branches/svn-snapshots/thunar/
Removed:
desktop/branches/svn-snapshots/thunar/debian/patches/02_thunar-vfs-volume-hal_missing-audio-cds-for-volman.patch
desktop/branches/svn-snapshots/thunar/debian/patches/03_use-eject-where-necessary.patch
desktop/branches/svn-snapshots/thunar/debian/patches/04_es-l10n-typo.patch
desktop/branches/svn-snapshots/thunar/debian/patches/05_thunar-vfs-nozombies.patch
Modified:
desktop/branches/svn-snapshots/thunar/debian/changelog
desktop/branches/svn-snapshots/thunar/debian/control
Log:
new 4.6 alpha release
Copied: desktop/branches/svn-snapshots/thunar (from rev 2217, desktop/trunk/thunar)
Property changes on: desktop/branches/svn-snapshots/thunar
___________________________________________________________________
Name: mergewithupstream
+ +1
Name: svn:mergeinfo
+
Modified: desktop/branches/svn-snapshots/thunar/debian/changelog
===================================================================
--- desktop/trunk/thunar/debian/changelog 2008-08-13 21:30:11 UTC (rev 2217)
+++ desktop/branches/svn-snapshots/thunar/debian/changelog 2008-08-23 22:50:26 UTC (rev 2238)
@@ -1,9 +1,18 @@
-thunar (0.9.0-11) UNRELEASED; urgency=low
+thunar (0.9.80-1) UNRELEASED; urgency=low
+ * new upstream alpha release.
* debian/control:
- - updated standards version to 3.8.0. No change needed.
+ - update standards version to 3.8.0. No change needed.
+ - updade build-deps for Xfce 4.6 Alpha.
+ - move thunar-volman from suggests to recommends.
+ * debian/patches:
+ - 02_thunar-vfs-volume-hal_missing-audio-cds-for-volman dropped, merged
+ upstream.
+ - 03_use-eject-where-necessary as well.
+ - 04_es-l10n-typo.patch too.
+ - 05_thunar-vfs-nozombies finally.
- -- Yves-Alexis Perez <corsac at debian.org> Tue, 12 Aug 2008 22:02:38 +0200
+ -- Yves-Alexis Perez <corsac at debian.org> Sat, 23 Aug 2008 23:16:33 +0200
thunar (0.9.0-10) unstable; urgency=low
Modified: desktop/branches/svn-snapshots/thunar/debian/control
===================================================================
--- desktop/trunk/thunar/debian/control 2008-08-13 21:30:11 UTC (rev 2217)
+++ desktop/branches/svn-snapshots/thunar/debian/control 2008-08-23 22:50:26 UTC (rev 2238)
@@ -3,7 +3,7 @@
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>
-Build-Depends: debhelper (>= 5.0.0), autotools-dev, libcairo2-dev, libexo-0.3-dev (>= 0.3.4-8), 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.4.2), chrpath, libpcre3-dev, libjpeg62-dev
+Build-Depends: debhelper (>= 5.0.0), libcairo2-dev, libexo-0.3-dev (>= 0.3.80), 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.4.2), chrpath, libpcre3-dev, libjpeg62-dev
Build-Conflicts: libgamin-dev [!hurd-i386]
Standards-Version: 3.8.0
Homepage: http://thunar.xfce.org
@@ -30,9 +30,9 @@
Package: thunar
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, desktop-file-utils, shared-mime-info, thunar-data (= ${source:Version}), exo-utils
-Recommends: hal, dbus-x11, gamin, ${shlibs:Recommends}
+Recommends: hal, dbus-x11, gamin, ${shlibs:Recommends}, thunar-volman
Conflicts: thunar-data (<= 0.9.0-5)
-Suggests: thunar-archive-plugin, thunar-media-tags-plugin, thunar-volman
+Suggests: thunar-archive-plugin, thunar-media-tags-plugin
Description: File Manager for Xfce
Thunar is the file manager designed to be the default file manager of Xfce 4.4
It has been designed to be fast and easy to use.
Deleted: desktop/branches/svn-snapshots/thunar/debian/patches/02_thunar-vfs-volume-hal_missing-audio-cds-for-volman.patch
===================================================================
--- desktop/trunk/thunar/debian/patches/02_thunar-vfs-volume-hal_missing-audio-cds-for-volman.patch 2008-08-13 21:30:11 UTC (rev 2217)
+++ desktop/branches/svn-snapshots/thunar/debian/patches/02_thunar-vfs-volume-hal_missing-audio-cds-for-volman.patch 2008-08-23 22:50:26 UTC (rev 2238)
@@ -1,83 +0,0 @@
-Index: thunar-vfs/thunar-vfs-volume-hal.c
-===================================================================
---- thunar-vfs/thunar-vfs-volume-hal.c (revision 26428)
-+++ thunar-vfs/thunar-vfs-volume-hal.c (working copy)
-@@ -1007,9 +1007,7 @@
- hv = libhal_volume_from_udi (context, udi);
-
- /* HAL might want us to ignore this volume for some reason */
-- if (G_UNLIKELY (hv != NULL
-- && (libhal_volume_should_ignore (hv)
-- || libhal_volume_get_fsusage (hv) != LIBHAL_VOLUME_USAGE_MOUNTABLE_FILESYSTEM)))
-+ if (G_UNLIKELY (hv != NULL && libhal_volume_should_ignore (hv)))
- {
- libhal_volume_free (hv);
- return;
-@@ -1020,38 +1018,42 @@
-
- if (G_LIKELY (hv != NULL))
- {
-- /* determine the UDI of the drive to which this volume belongs */
-- drive_udi = libhal_volume_get_storage_device_udi (hv);
-- if (G_LIKELY (drive_udi != NULL))
-+ /* check if we have a mountable file system here */
-+ if (libhal_volume_get_fsusage (hv) == LIBHAL_VOLUME_USAGE_MOUNTABLE_FILESYSTEM)
- {
-- /* determine the drive for the volume */
-- hd = libhal_drive_from_udi (context, drive_udi);
-- if (G_LIKELY (hd != NULL))
-+ /* determine the UDI of the drive to which this volume belongs */
-+ drive_udi = libhal_volume_get_storage_device_udi (hv);
-+ if (G_LIKELY (drive_udi != NULL))
- {
-- /* check if we already have a volume object for the UDI */
-- volume_hal = thunar_vfs_volume_manager_hal_get_volume_by_udi (manager_hal, udi);
-- if (G_LIKELY (volume_hal == NULL))
-+ /* determine the drive for the volume */
-+ hd = libhal_drive_from_udi (context, drive_udi);
-+ if (G_LIKELY (hd != NULL))
- {
-- /* otherwise, we allocate a new volume object */
-- volume_hal = g_object_new (THUNAR_VFS_TYPE_VOLUME_HAL, NULL);
-- volume_hal->udi = g_strdup (udi);
-- }
-+ /* check if we already have a volume object for the UDI */
-+ volume_hal = thunar_vfs_volume_manager_hal_get_volume_by_udi (manager_hal, udi);
-+ if (G_LIKELY (volume_hal == NULL))
-+ {
-+ /* otherwise, we allocate a new volume object */
-+ volume_hal = g_object_new (THUNAR_VFS_TYPE_VOLUME_HAL, NULL);
-+ volume_hal->udi = g_strdup (udi);
-+ }
-
-- /* update the volume object with the new data from the HAL volume/drive */
-- thunar_vfs_volume_hal_update (volume_hal, context, hv, hd);
-+ /* update the volume object with the new data from the HAL volume/drive */
-+ thunar_vfs_volume_hal_update (volume_hal, context, hv, hd);
-
-- /* add the volume object to our list if we allocated a new one */
-- if (g_list_find (THUNAR_VFS_VOLUME_MANAGER (manager_hal)->volumes, volume_hal) == NULL)
-- {
-- /* add the volume to the volume manager */
-- thunar_vfs_volume_manager_add (THUNAR_VFS_VOLUME_MANAGER (manager_hal), THUNAR_VFS_VOLUME (volume_hal));
-+ /* add the volume object to our list if we allocated a new one */
-+ if (g_list_find (THUNAR_VFS_VOLUME_MANAGER (manager_hal)->volumes, volume_hal) == NULL)
-+ {
-+ /* add the volume to the volume manager */
-+ thunar_vfs_volume_manager_add (THUNAR_VFS_VOLUME_MANAGER (manager_hal), THUNAR_VFS_VOLUME (volume_hal));
-
-- /* release the reference on the volume */
-- g_object_unref (G_OBJECT (volume_hal));
-+ /* release the reference on the volume */
-+ g_object_unref (G_OBJECT (volume_hal));
-+ }
-+
-+ /* release the HAL drive */
-+ libhal_drive_free (hd);
- }
--
-- /* release the HAL drive */
-- libhal_drive_free (hd);
- }
- }
-
Deleted: desktop/branches/svn-snapshots/thunar/debian/patches/03_use-eject-where-necessary.patch
===================================================================
--- desktop/trunk/thunar/debian/patches/03_use-eject-where-necessary.patch 2008-08-13 21:30:11 UTC (rev 2217)
+++ desktop/branches/svn-snapshots/thunar/debian/patches/03_use-eject-where-necessary.patch 2008-08-23 22:50:26 UTC (rev 2238)
@@ -1,44 +0,0 @@
-Thunar 0.9.0 displays the "Eject" menu item only for disc volumes. Apply
-this patch to fix that issue and have Thunar display "Eject" also for
-iPods and other volumes that require eject.
-
-Index: thunar/thunar-shortcuts-view.c
-===================================================================
---- thunar/thunar-shortcuts-view.c (revision 26456)
-+++ thunar/thunar-shortcuts-view.c (revision 26459)
-@@ -834,13 +834,12 @@
- gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
- gtk_widget_show (item);
-
-- /* check if the volume is a disc */
-- if (thunar_vfs_volume_is_disc (volume))
-+ /* check if the volume is ejectable */
-+ if (thunar_vfs_volume_is_ejectable (volume))
- {
- /* append the "Eject Volume" menu action */
- item = gtk_image_menu_item_new_with_mnemonic (_("E_ject Volume"));
- g_signal_connect_swapped (G_OBJECT (item), "activate", G_CALLBACK (thunar_shortcuts_view_eject), view);
-- gtk_widget_set_sensitive (item, thunar_vfs_volume_is_ejectable (volume));
- gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
- gtk_widget_show (item);
- }
-Index: thunar/thunar-tree-view.c
-===================================================================
---- thunar/thunar-tree-view.c (revision 26456)
-+++ thunar/thunar-tree-view.c (revision 26459)
-@@ -1041,13 +1041,12 @@
- gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
- gtk_widget_show (item);
-
-- /* check if the volume is a disc */
-- if (thunar_vfs_volume_is_disc (volume))
-+ /* check if the volume is ejectable */
-+ if (thunar_vfs_volume_is_ejectable (volume))
- {
- /* append the "Eject Volume" menu action */
- item = gtk_image_menu_item_new_with_mnemonic (_("E_ject Volume"));
- g_signal_connect_swapped (G_OBJECT (item), "activate", G_CALLBACK (thunar_tree_view_action_eject), view);
-- gtk_widget_set_sensitive (item, thunar_vfs_volume_is_ejectable (volume));
- gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
- gtk_widget_show (item);
- }
Deleted: desktop/branches/svn-snapshots/thunar/debian/patches/04_es-l10n-typo.patch
===================================================================
--- desktop/trunk/thunar/debian/patches/04_es-l10n-typo.patch 2008-08-13 21:30:11 UTC (rev 2217)
+++ desktop/branches/svn-snapshots/thunar/debian/patches/04_es-l10n-typo.patch 2008-08-23 22:50:26 UTC (rev 2238)
@@ -1,11 +0,0 @@
---- Thunar-0.9.0/po/es.po.orig 2008-02-27 15:07:41.000000000 +0100
-+++ Thunar-0.9.0/po/es.po 2008-02-27 15:07:46.000000000 +0100
-@@ -649,7 +649,7 @@
- #. create the "Custom command" expand
- #: ../thunar/thunar-chooser-dialog.c:294
- msgid "Use a _custom command:"
--msgstr "Uar una orden _personalizada:"
-+msgstr "Usar una orden _personalizada:"
-
- #: ../thunar/thunar-chooser-dialog.c:295
- msgid ""
Deleted: desktop/branches/svn-snapshots/thunar/debian/patches/05_thunar-vfs-nozombies.patch
===================================================================
--- desktop/trunk/thunar/debian/patches/05_thunar-vfs-nozombies.patch 2008-08-13 21:30:11 UTC (rev 2217)
+++ desktop/branches/svn-snapshots/thunar/debian/patches/05_thunar-vfs-nozombies.patch 2008-08-23 22:50:26 UTC (rev 2238)
@@ -1,31 +0,0 @@
-Index: thunar-vfs/thunar-vfs-exec.c
-===================================================================
---- thunar-vfs/thunar-vfs-exec.c (revision 26428)
-+++ thunar-vfs/thunar-vfs-exec.c (working copy)
-@@ -324,8 +324,10 @@
- if (startup_data->watch_id != 0)
- g_source_remove (startup_data->watch_id);
-
-- /* close the PID */
-- g_spawn_close_pid (startup_data->pid);
-+ /* make sure we don't leave zombies (see bug #2983 for details) */
-+ g_child_watch_add_full (G_PRIORITY_LOW, startup_data->pid,
-+ (GChildWatchFunc) g_spawn_close_pid,
-+ NULL, NULL);
-
- /* release the startup data */
- _thunar_vfs_slice_free (TvsnStartupData, startup_data);
-@@ -513,7 +515,13 @@
- startup_data->pid = pid;
- }
- }
-+ else if (G_LIKELY (succeed))
-+ {
-+ /* make sure we don't leave zombies (see bug #2983 for details) */
-+ g_child_watch_add_full (G_PRIORITY_LOW, pid, (GChildWatchFunc) g_spawn_close_pid, NULL, NULL);
-
-+ }
-+
- /* release the sn display */
- if (G_LIKELY (sn_display != NULL))
- sn_display_unref (sn_display);
More information about the Pkg-xfce-commits
mailing list