[Pkg-xfce-commits] r3765 - in desktop/branches/experimental: . thunar/debian thunar/debian/patches
Yves-Alexis Perez
corsac at alioth.debian.org
Sat Jan 9 02:09:10 UTC 2010
Author: corsac
Date: 2010-01-09 14:09:04 +0000 (Sat, 09 Jan 2010)
New Revision: 3765
Added:
desktop/branches/experimental/thunar/
desktop/branches/experimental/thunar/debian/libthunarx-2-0.install
desktop/branches/experimental/thunar/debian/libthunarx-2-0.shlib
desktop/branches/experimental/thunar/debian/libthunarx-2-dev.install
Removed:
desktop/branches/experimental/thunar/debian/libthunar-vfs-1-2.install
desktop/branches/experimental/thunar/debian/libthunar-vfs-1-2.lintian-overrides
desktop/branches/experimental/thunar/debian/libthunar-vfs-1-2.postinst
desktop/branches/experimental/thunar/debian/libthunar-vfs-1-2.shlibs
desktop/branches/experimental/thunar/debian/libthunar-vfs-1-dev.install
desktop/branches/experimental/thunar/debian/libthunar-vfs-1-dev.postinst
desktop/branches/experimental/thunar/debian/patches/01_thunar-help-directory.patch
desktop/branches/experimental/thunar/debian/patches/03_thunar-window-maximize.patch
desktop/branches/experimental/thunar/debian/patches/04_fix-umask-handling.patch
Modified:
desktop/branches/experimental/thunar/debian/changelog
desktop/branches/experimental/thunar/debian/control
desktop/branches/experimental/thunar/debian/patches/02_thunar-icon-naming-spec-compliance.patch
desktop/branches/experimental/thunar/debian/rules
Log:
* New upstream release.
* debian/rules:
- stop messing with POSIX_MADV since thunar-vfs is gone.
- drop enable-final and disable-gnome-thumbnailers from configure flags.
* debian/patches:
- 01_thunar-help-directory dropped, not useful anymore.
- 02_thunar-icon-naming-spec-compliance refreshed.
- 03_thunar-window-maximize dropped, useless as well.
- 04_fix-umask-handling dropped, included upstream.
* debian/control:
- bump build-dep on exo (0.5.1).
- add build-dep on libxfce4ui (4.7.1).
- rename libthunar-vfs package to libthunarx since thunar-vfs has been
dropped.
- add build-dep on libstartup-notification0-dev.
* debian/rules:
- change thunarx libname to 2 in chrpath call.
- ignore thunarx plugins in dh_makeshlibs.
* drop libthunar-vfs maintainer scripts and lintian overrides.
Modified: desktop/branches/experimental/thunar/debian/changelog
===================================================================
--- desktop/tags/thunar/1.0.1-2/debian/changelog 2009-12-10 19:48:40 UTC (rev 3720)
+++ desktop/branches/experimental/thunar/debian/changelog 2010-01-09 14:09:04 UTC (rev 3765)
@@ -1,3 +1,27 @@
+thunar (1.1.0-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+ * debian/rules:
+ - stop messing with POSIX_MADV since thunar-vfs is gone.
+ - drop enable-final and disable-gnome-thumbnailers from configure flags.
+ * debian/patches:
+ - 01_thunar-help-directory dropped, not useful anymore.
+ - 02_thunar-icon-naming-spec-compliance refreshed.
+ - 03_thunar-window-maximize dropped, useless as well.
+ - 04_fix-umask-handling dropped, included upstream.
+ * debian/control:
+ - bump build-dep on exo (0.5.1).
+ - add build-dep on libxfce4ui (4.7.1).
+ - rename libthunar-vfs package to libthunarx since thunar-vfs has been
+ dropped.
+ - add build-dep on libstartup-notification0-dev.
+ * debian/rules:
+ - change thunarx libname to 2 in chrpath call.
+ - ignore thunarx plugins in dh_makeshlibs.
+ * drop libthunar-vfs maintainer scripts and lintian overrides.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Sat, 09 Jan 2010 14:55:03 +0100
+
thunar (1.0.1-2) unstable; urgency=low
* debian/control:
Modified: desktop/branches/experimental/thunar/debian/control
===================================================================
--- desktop/tags/thunar/1.0.1-2/debian/control 2009-12-10 19:48:40 UTC (rev 3720)
+++ desktop/branches/experimental/thunar/debian/control 2010-01-09 14:09:04 UTC (rev 3765)
@@ -4,8 +4,9 @@
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 (>= 7), libcairo2-dev,
- libexo-0.3-dev (>= 0.3.100), cdbs, libxml-parser-perl, libfam-dev,
+ libexo-1-dev (>= 0.5.1), cdbs, libxml-parser-perl, libfam-dev,
libhal-storage-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
+ libxfce4ui-1-0-dev (>= 4.7.1), libstartup-notification0-dev,
libdbus-glib-1-dev, libexif-dev, libgtk2.0-dev (>= 2.10.1),
xfce4-panel-dev (>= 4.6.0), chrpath, libpcre3-dev, libjpeg62-dev,
intltool
@@ -15,23 +16,27 @@
Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/thunar/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/thunar/
-Package: libthunar-vfs-1-dev
+Package: libthunarx-2-dev
Section: libdevel
Architecture: any
-Depends: libthunar-vfs-1-2 (= ${binary:Version}), ${misc:Depends},
- libexo-0.3-dev (>= 0.3.100), thunar-data (=${source:Version}),
+Depends: libthunarx-2-0 (= ${binary:Version}), ${misc:Depends},
+ libexo-0.3-dev (>= 0.5.1), thunar-data (=${source:Version}),
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
+Conflicts: libthunar-vfs-1-dev (<= 1.1.0)
+Replaces: libthunar-vfs-1-dev (<= 1.1.0)
+Description: Development files for libthunarx
+ This package contains the headers and the static library for libthunarx,
+ the extension library used by thunar
-Package: libthunar-vfs-1-2
+Package: libthunarx-2-0
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, thunar-data (= ${source:Version}), ${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
+Conflicts: libthunar-vfs-1-2 (<= 1.1.0)
+Replaces: libthunar-vfs-1-2 (<= 1.1.0)
+Description: extension library for thunar
+ This package contains the Thunar extension library which permits adding new
+ features to the Thunar file manager.
Package: thunar
Section: xfce
@@ -60,6 +65,5 @@
Priority: extra
Depends: ${shlibs:Depends}, thunar (= ${binary:Version}), ${misc:Depends}
Description: debugging informations for thunar
- This package contains debugging symbols for thunar, libthunar-vfs and
- libthunar-x, the file manager and file management libraries for Xfce Desktop
- Environment.
+ This package contains debugging symbols for thunar and libthunarx, the file
+ manager and file management libraries for Xfce Desktop Environment.
Deleted: desktop/branches/experimental/thunar/debian/libthunar-vfs-1-2.install
===================================================================
--- desktop/tags/thunar/1.0.1-2/debian/libthunar-vfs-1-2.install 2009-12-10 19:48:40 UTC (rev 3720)
+++ desktop/branches/experimental/thunar/debian/libthunar-vfs-1-2.install 2010-01-09 14:09:04 UTC (rev 3765)
@@ -1,2 +0,0 @@
-debian/tmp/usr/lib/lib*.so.*
-debian/tmp/usr/lib/thunarx-1/*
Deleted: desktop/branches/experimental/thunar/debian/libthunar-vfs-1-2.lintian-overrides
===================================================================
--- desktop/tags/thunar/1.0.1-2/debian/libthunar-vfs-1-2.lintian-overrides 2009-12-10 19:48:40 UTC (rev 3720)
+++ desktop/branches/experimental/thunar/debian/libthunar-vfs-1-2.lintian-overrides 2010-01-09 14:09:04 UTC (rev 3765)
@@ -1,2 +0,0 @@
-#private
-libthunar-vfs-1-2: package-name-doesnt-match-sonames libthunar-vfs-1-2 libthunarx-1-0
Deleted: desktop/branches/experimental/thunar/debian/libthunar-vfs-1-2.postinst
===================================================================
--- desktop/tags/thunar/1.0.1-2/debian/libthunar-vfs-1-2.postinst 2009-12-10 19:48:40 UTC (rev 3720)
+++ desktop/branches/experimental/thunar/debian/libthunar-vfs-1-2.postinst 2010-01-09 14:09:04 UTC (rev 3765)
@@ -1,10 +0,0 @@
-#!/bin/sh -e
-
-if [ "$1" = "configure" ] && dpkg --compare-versions "$2" eq "1.0.0-2";
-then
- cd /usr/share/doc/libthunar-vfs-1-2 && rm -f thunar-data
-fi
-
-#DEBHELPER#
-
-exit 0
Deleted: desktop/branches/experimental/thunar/debian/libthunar-vfs-1-2.shlibs
===================================================================
--- desktop/tags/thunar/1.0.1-2/debian/libthunar-vfs-1-2.shlibs 2009-12-10 19:48:40 UTC (rev 3720)
+++ desktop/branches/experimental/thunar/debian/libthunar-vfs-1-2.shlibs 2010-01-09 14:09:04 UTC (rev 3765)
@@ -1,2 +0,0 @@
-libthunar-vfs-1 2 libthunar-vfs-1-2 (>= 1.0.0)
-libthunarx-1 2 libthunar-vfs-1-2 (>= 1.0.0)
Deleted: desktop/branches/experimental/thunar/debian/libthunar-vfs-1-dev.install
===================================================================
--- desktop/tags/thunar/1.0.1-2/debian/libthunar-vfs-1-dev.install 2009-12-10 19:48:40 UTC (rev 3720)
+++ desktop/branches/experimental/thunar/debian/libthunar-vfs-1-dev.install 2010-01-09 14:09:04 UTC (rev 3765)
@@ -1,3 +0,0 @@
-debian/tmp/usr/include/*
-debian/tmp/usr/lib/lib*.so
-debian/tmp/usr/lib/pkgconfig/*
Deleted: desktop/branches/experimental/thunar/debian/libthunar-vfs-1-dev.postinst
===================================================================
--- desktop/tags/thunar/1.0.1-2/debian/libthunar-vfs-1-dev.postinst 2009-12-10 19:48:40 UTC (rev 3720)
+++ desktop/branches/experimental/thunar/debian/libthunar-vfs-1-dev.postinst 2010-01-09 14:09:04 UTC (rev 3765)
@@ -1,10 +0,0 @@
-#!/bin/sh -e
-
-if [ "$1" = "configure" ] && dpkg --compare-versions "$2" eq "1.0.0-2";
-then
- cd /usr/share/doc/libthunar-vfs-1-dev && rm -f thunar-data
-fi
-
-#DEBHELPER#
-
-exit 0
Copied: desktop/branches/experimental/thunar/debian/libthunarx-2-0.install (from rev 3720, desktop/tags/thunar/1.0.1-2/debian/libthunar-vfs-1-2.install)
===================================================================
--- desktop/branches/experimental/thunar/debian/libthunarx-2-0.install (rev 0)
+++ desktop/branches/experimental/thunar/debian/libthunarx-2-0.install 2010-01-09 14:09:04 UTC (rev 3765)
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/lib*.so.*
+debian/tmp/usr/lib/thunarx-2/*
Copied: desktop/branches/experimental/thunar/debian/libthunarx-2-0.shlib (from rev 3720, desktop/tags/thunar/1.0.1-2/debian/libthunar-vfs-1-2.shlibs)
===================================================================
--- desktop/branches/experimental/thunar/debian/libthunarx-2-0.shlib (rev 0)
+++ desktop/branches/experimental/thunar/debian/libthunarx-2-0.shlib 2010-01-09 14:09:04 UTC (rev 3765)
@@ -0,0 +1 @@
+libthunarx-2 0 libthunarx-2-0 (>= 1.1.0)
Copied: desktop/branches/experimental/thunar/debian/libthunarx-2-dev.install (from rev 3720, desktop/tags/thunar/1.0.1-2/debian/libthunar-vfs-1-dev.install)
===================================================================
--- desktop/branches/experimental/thunar/debian/libthunarx-2-dev.install (rev 0)
+++ desktop/branches/experimental/thunar/debian/libthunarx-2-dev.install 2010-01-09 14:09:04 UTC (rev 3765)
@@ -0,0 +1,3 @@
+debian/tmp/usr/include/*
+debian/tmp/usr/lib/lib*.so
+debian/tmp/usr/lib/pkgconfig/*
Deleted: desktop/branches/experimental/thunar/debian/patches/01_thunar-help-directory.patch
===================================================================
--- desktop/tags/thunar/1.0.1-2/debian/patches/01_thunar-help-directory.patch 2009-12-10 19:48:40 UTC (rev 3720)
+++ desktop/branches/experimental/thunar/debian/patches/01_thunar-help-directory.patch 2010-01-09 14:09:04 UTC (rev 3765)
@@ -1,11 +0,0 @@
---- ThunarHelp.in 2006-04-13 23:57:36.000000000 +0200
-+++ ThunarHelp.in 2006-03-01 16:44:06.000000000 +0100
-@@ -19,7 +19,7 @@
- # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- #
-
--HELPDIR="@datadir@/doc/Thunar/html/"
-+HELPDIR="@datadir@/doc/thunar/html/"
-
- if test -n "$LC_ALL"; then
- LC=$LC_ALL
Modified: desktop/branches/experimental/thunar/debian/patches/02_thunar-icon-naming-spec-compliance.patch
===================================================================
--- desktop/tags/thunar/1.0.1-2/debian/patches/02_thunar-icon-naming-spec-compliance.patch 2009-12-10 19:48:40 UTC (rev 3720)
+++ desktop/branches/experimental/thunar/debian/patches/02_thunar-icon-naming-spec-compliance.patch 2010-01-09 14:09:04 UTC (rev 3765)
@@ -1,8 +1,8 @@
diff --git a/plugins/thunar-tpa/thunar-tpa-icon.c b/plugins/thunar-tpa/thunar-tpa-icon.c
-index da38304..740000a 100644
+index d6b22b9..c2268c4 100644
--- a/plugins/thunar-tpa/thunar-tpa-icon.c
+++ b/plugins/thunar-tpa/thunar-tpa-icon.c
-@@ -175,7 +175,7 @@ thunar_tpa_icon_init (ThunarTpaIcon *icon)
+@@ -167,7 +167,7 @@ thunar_tpa_icon_init (ThunarTpaIcon *icon)
gtk_widget_show (icon->button);
/* setup the image for the trash icon */
@@ -11,8 +11,8 @@
gtk_container_add (GTK_CONTAINER (icon->button), icon->image);
gtk_widget_show (icon->image);
-@@ -287,7 +287,7 @@ thunar_tpa_icon_state (ThunarTpaIcon *icon,
- gtk_tooltips_set_tip (icon->tooltips, icon->button, full ? _("Trash contains files") : _("Trash is empty"), NULL);
+@@ -276,7 +276,7 @@ thunar_tpa_icon_state (ThunarTpaIcon *icon,
+ gtk_widget_set_tooltip_text (icon->button, full ? _("Trash contains files") : _("Trash is empty"));
/* setup the appropriate icon */
- gtk_image_set_from_icon_name (GTK_IMAGE (icon->image), full ? "gnome-fs-trash-full" : "gnome-fs-trash-empty", GTK_ICON_SIZE_BUTTON);
@@ -32,302 +32,105 @@
+Icon=user-trash
X-XFCE-Exec=@libexecdir@/xfce4/panel-plugins/thunar-tpa
-diff --git a/thunar-vfs/thunar-vfs-io-local.c b/thunar-vfs/thunar-vfs-io-local.c
-index 615a36c..e2d75e7 100644
---- a/thunar-vfs/thunar-vfs-io-local.c
-+++ b/thunar-vfs/thunar-vfs-io-local.c
-@@ -390,7 +390,7 @@ _thunar_vfs_io_local_get_info (ThunarVfsPath *path,
- if (G_UNLIKELY (filename[0] == G_DIR_SEPARATOR && filename[1] == '\0'))
- {
- /* root folder gets a special custom icon... */
-- info->custom_icon = g_strdup ("gnome-dev-harddisk");
-+ info->custom_icon = g_strdup ("drive-harddisk");
-
- /* ...and a special display name */
- info->display_name = g_strdup (_("File System"));
-diff --git a/thunar-vfs/thunar-vfs-io-trash.c b/thunar-vfs/thunar-vfs-io-trash.c
-index 8ca0370..29f333d 100644
---- a/thunar-vfs/thunar-vfs-io-trash.c
-+++ b/thunar-vfs/thunar-vfs-io-trash.c
-@@ -1119,7 +1119,7 @@ _thunar_vfs_io_trash_get_info (ThunarVfsPath *path,
- info->ctime = mtime;
- info->mime_info = thunar_vfs_mime_info_ref (_thunar_vfs_mime_inode_directory);
- info->path = thunar_vfs_path_ref (_thunar_vfs_path_trash_root);
-- info->custom_icon = g_strdup (empty ? "gnome-fs-trash-empty" : "gnome-fs-trash-full");
-+ info->custom_icon = g_strdup (empty ? "user-trash" : "user-trash-full");
- info->display_name = g_strdup (_("Trash"));
- info->ref_count = 1;
- }
-diff --git a/thunar-vfs/thunar-vfs-mime-info.c b/thunar-vfs/thunar-vfs-mime-info.c
-index 7c8fe0c..c3c07e1 100644
---- a/thunar-vfs/thunar-vfs-mime-info.c
-+++ b/thunar-vfs/thunar-vfs-mime-info.c
-@@ -47,18 +47,18 @@ static const struct
- const gchar icon[19];
- } GNOME_INODE_ICONNAMES[] =
- {
-- { "blockdevice", "gnome-fs-blockdev" },
-- { "chardevice", "gnome-fs-chardev" },
-- { "directory", "gnome-fs-directory" },
-- { "fifo", "gnome-fs-fifo" },
-- { "socket", "gnome-fs-socket" },
-+ { "blockdevice", "inode-blockdev" },
-+ { "chardevice", "inode-chardev" },
-+ { "directory", "folder" },
-+ { "fifo", "inode-fifo" },
-+ { "socket", "inode-socket" },
- };
-
- /* first fallback gnome icon name */
- static const gchar GNOME_FS_REGULAR[] = "gnome-fs-regular";
-
- /* second fallback gnome icon name */
--static const gchar GNOME_MIME_APPLICATION_OCTET_STREAM[] = "gnome-mime-application-octet-stream";
-+static const gchar GNOME_MIME_APPLICATION_OCTET_STREAM[] = "application-x-executable";
-
- /* generic standard icon names (Icon Naming Spec 0.8) */
- static const gchar XDG_GENERIC_ICONNAMES[][18] =
-diff --git a/thunar-vfs/thunar-vfs-volume.c b/thunar-vfs/thunar-vfs-volume.c
-index 95bdc99..9d5661d 100644
---- a/thunar-vfs/thunar-vfs-volume.c
-+++ b/thunar-vfs/thunar-vfs-volume.c
-@@ -398,83 +398,76 @@ thunar_vfs_volume_lookup_icon_name (ThunarVfsVolume *volume,
- kind = thunar_vfs_volume_get_kind (volume);
- switch (kind)
- {
--cdrom:
-- case THUNAR_VFS_VOLUME_KIND_CDROM:
-- if (gtk_icon_theme_has_icon (icon_theme, "gnome-dev-cdrom"))
-- return "gnome-dev-cdrom";
-- break;
--
-- case THUNAR_VFS_VOLUME_KIND_CDR:
-- if (gtk_icon_theme_has_icon (icon_theme, "gnome-dev-disc-cdr"))
-- return "gnome-dev-disc-cdr";
-- goto cdrom;
--
-- case THUNAR_VFS_VOLUME_KIND_CDRW:
-- if (gtk_icon_theme_has_icon (icon_theme, "gnome-dev-disc-cdrw"))
-- return "gnome-dev-disc-cdrw";
-- goto cdrom;
--
--dvdrom:
-- case THUNAR_VFS_VOLUME_KIND_DVDROM:
-- if (gtk_icon_theme_has_icon (icon_theme, "gnome-dev-disc-dvdrom"))
-- return "gnome-dev-disc-dvdrom";
-- else if (gtk_icon_theme_has_icon (icon_theme, "gnome-dev-dvd"))
-- return "gnome-dev-dvd";
-- goto cdrom;
--
-- case THUNAR_VFS_VOLUME_KIND_DVDRAM:
-- if (gtk_icon_theme_has_icon (icon_theme, "gnome-dev-disc-dvdram"))
-- return "gnome-dev-disc-dvdram";
-+ case THUNAR_VFS_VOLUME_KIND_DVDPLUSRW:
-+ if (gtk_icon_theme_has_icon (icon_theme, "media-optical-dvd-rw-plus"))
-+ return "media-optical-dvd-rw-plus";
-+ case THUNAR_VFS_VOLUME_KIND_DVDRW:
-+ if (gtk_icon_theme_has_icon (icon_theme, "media-optical-dvd-rw"))
-+ return "media-optical-dvd-rw";
- goto dvdrom;
--
--dvdr:
-+ case THUNAR_VFS_VOLUME_KIND_DVDPLUSR:
-+ if (gtk_icon_theme_has_icon (icon_theme, "media-optical-dvd-r-plus"))
-+ return "media-optical-dvd-r-plus";
- case THUNAR_VFS_VOLUME_KIND_DVDR:
-- if (gtk_icon_theme_has_icon (icon_theme, "gnome-dev-disc-dvdr"))
-- return "gnome-dev-disc-dvdr";
-+ if (gtk_icon_theme_has_icon (icon_theme, "media-optical-dvd-r"))
-+ return "media-optical-dvd-r";
- goto dvdrom;
--
-- case THUNAR_VFS_VOLUME_KIND_DVDRW:
-- case THUNAR_VFS_VOLUME_KIND_DVDPLUSRW:
-- if (gtk_icon_theme_has_icon (icon_theme, "gnome-dev-disc-dvdrw"))
-- return "gnome-dev-disc-dvdrw";
-+ case THUNAR_VFS_VOLUME_KIND_DVDRAM:
-+ if (gtk_icon_theme_has_icon (icon_theme, "media-optical-dvd-ram"))
-+ return "media-optical-dvd-ram";
- goto dvdrom;
--
-- case THUNAR_VFS_VOLUME_KIND_DVDPLUSR:
-- if (gtk_icon_theme_has_icon (icon_theme, "gnome-dev-disc-dvdr-plus"))
-- return "gnome-dev-disc-dvdr-plus";
-- goto dvdr;
-+dvdrom:
-+ case THUNAR_VFS_VOLUME_KIND_DVDROM:
-+ if (gtk_icon_theme_has_icon (icon_theme, "media-optical-dvd"))
-+ return "media-optical-dvd";
-+ goto optical;
-+
-+ case THUNAR_VFS_VOLUME_KIND_CDRW:
-+ if (gtk_icon_theme_has_icon (icon_theme, "media-optical-cd-rw"))
-+ return "media-optical-cd-rw";
-+ goto cdrom;
-+ case THUNAR_VFS_VOLUME_KIND_CDR:
-+ if (gtk_icon_theme_has_icon (icon_theme, "media-optical-cd-r"))
-+ return "media-optical-cd-r";
-+ goto cdrom;
-+cdrom:
-+ case THUNAR_VFS_VOLUME_KIND_CDROM:
-+ if (gtk_icon_theme_has_icon (icon_theme, "media-optical-cd"))
-+ return "media-optical-cd";
-+ goto optical;
-+ case THUNAR_VFS_VOLUME_KIND_AUDIO_CD:
-+ if (gtk_icon_theme_has_icon (icon_theme, "media-optical-audio"))
-+ return "media-optical-audio";
-+ goto optical;
-+optical:
-+ if (gtk_icon_theme_has_icon (icon_theme, "media-optical"))
-+ return "media-optical";
-+ break;
-
- case THUNAR_VFS_VOLUME_KIND_FLOPPY:
-- if (gtk_icon_theme_has_icon (icon_theme, "gnome-dev-floppy"))
-- return "gnome-dev-floppy";
-+ if (gtk_icon_theme_has_icon (icon_theme, "media-floppy"))
-+ return "media-floppy";
- break;
--
- case THUNAR_VFS_VOLUME_KIND_HARDDISK:
-- if (gtk_icon_theme_has_icon (icon_theme, "gnome-dev-harddisk"))
-- return "gnome-dev-harddisk";
-+ if (gtk_icon_theme_has_icon (icon_theme, "drive-harddisk"))
-+ return "drive-harddisk";
- break;
-
- case THUNAR_VFS_VOLUME_KIND_USBSTICK:
-- if (gtk_icon_theme_has_icon (icon_theme, "gnome-dev-removable-usb"))
-- return "gnome-dev-removable-usb";
-- else if (gtk_icon_theme_has_icon (icon_theme, "gnome-dev-harddisk-usb"))
-- return "gnome-dev-harddisk-usb";
-- break;
--
-+ if (gtk_icon_theme_has_icon (icon_theme, "drive-removable-media-usb"))
-+ return "drive-removable-media-usb";
-+ goto removable_media;
- case THUNAR_VFS_VOLUME_KIND_AUDIO_PLAYER:
-- if (gtk_icon_theme_has_icon (icon_theme, "gnome-dev-ipod"))
-- return "gnome-dev-ipod";
-- break;
-+ if (gtk_icon_theme_has_icon (icon_theme, "drive-removable-media-ipod"))
-+ return "drive-removable-media-ipod";
-+ goto removable_media;
-
-- case THUNAR_VFS_VOLUME_KIND_AUDIO_CD:
-- if (gtk_icon_theme_has_icon (icon_theme, "gnome-dev-cdrom-audio"))
-- return "gnome-dev-cdrom-audio";
-- goto cdrom;
-
- case THUNAR_VFS_VOLUME_KIND_MEMORY_CARD:
- case THUNAR_VFS_VOLUME_KIND_REMOVABLE_DISK:
-- if (gtk_icon_theme_has_icon (icon_theme, "gnome-dev-removable"))
-- return "gnome-dev-removable";
-+removable_media:
-+ if (gtk_icon_theme_has_icon (icon_theme, "drive-removable-media"))
-+ return "drive-removable-media";
- break;
-
- default:
diff --git a/thunar/thunar-application.c b/thunar/thunar-application.c
-index c30d43a..80c9784 100644
+index dc12c08..ec1b178 100644
--- a/thunar/thunar-application.c
+++ b/thunar/thunar-application.c
-@@ -1166,7 +1166,7 @@ thunar_application_copy_to (ThunarApplication *application,
+@@ -1282,7 +1282,7 @@ thunar_application_copy_to (ThunarApplication *application,
_thunar_return_if_fail (THUNAR_IS_APPLICATION (application));
/* launch the operation */
- thunar_application_launch (application, parent, "stock_folder-copy",
+ thunar_application_launch (application, parent, "gtk-copy",
- _("Copying files..."), thunar_vfs_copy_files,
- source_path_list, target_path_list, new_files_closure);
+ _("Copying files..."), thunar_io_jobs_copy_files,
+ source_file_list, target_file_list, new_files_closure);
}
-@@ -1199,7 +1199,7 @@ thunar_application_copy_into (ThunarApplication *application,
- _thunar_return_if_fail (target_path != NULL);
+@@ -1323,7 +1323,7 @@ thunar_application_copy_into (ThunarApplication *application,
+ g_free (display_name);
- /* collect the target paths and launch the job */
+ /* collect the target files and launch the job */
- thunar_application_collect_and_launch (application, parent, "stock_folder-copy",
+ thunar_application_collect_and_launch (application, parent, "gtk-copy",
- _("Copying files..."), thunar_vfs_copy_files,
- source_path_list, target_path, new_files_closure);
- }
-@@ -1233,7 +1233,7 @@ thunar_application_link_into (ThunarApplication *application,
- _thunar_return_if_fail (target_path != NULL);
+ title, thunar_io_jobs_copy_files,
+ source_file_list, target_file,
+ new_files_closure);
+@@ -1369,7 +1369,7 @@ thunar_application_link_into (ThunarApplication *application,
+ g_free (display_name);
- /* collect the target paths and launch the job */
+ /* collect the target files and launch the job */
- thunar_application_collect_and_launch (application, parent, "stock_link",
+ thunar_application_collect_and_launch (application, parent, "insert-link",
- _("Creating symbolic links..."),
- thunar_vfs_link_files, source_path_list,
- target_path, new_files_closure);
-@@ -1273,12 +1273,15 @@ thunar_application_move_into (ThunarApplication *application,
- /* determine the appropriate message text and the icon based on the target_path */
- if (thunar_vfs_path_get_scheme (target_path) == THUNAR_VFS_PATH_SCHEME_TRASH)
- {
-- icon = "gnome-fs-trash-full";
-+ icon = "user-trash-full";
- text = _("Moving files into the trash...");
- }
- else
- {
-- icon = "stock_folder-move";
-+ /* What kind of icon-name should we use according to the
-+ * icon-naming-spec?
-+ */
-+ icon = "folder-move";
- text = _("Moving files...");
- }
+ title, thunar_io_jobs_link_files,
+ source_file_list, target_file,
+ new_files_closure);
+@@ -1423,7 +1423,7 @@ thunar_application_move_into (ThunarApplication *application,
-@@ -1393,7 +1396,7 @@ thunar_application_unlink_files (ThunarApplication *application,
+ /* collect the target files and launch the job */
+ thunar_application_collect_and_launch (application, parent,
+- "stock_folder-move", title,
++ "folder-move", title,
+ thunar_io_jobs_move_files,
+ source_file_list, target_file,
+ new_files_closure);
+@@ -1537,7 +1537,7 @@ thunar_application_unlink_files (ThunarApplication *application,
if (G_LIKELY (response == GTK_RESPONSE_YES))
{
/* launch the "Delete" operation */
- thunar_application_launch (application, parent, "stock_delete",
+ thunar_application_launch (application, parent, "edit-delete",
- _("Deleting files..."), unlink_stub,
- path_list, path_list, NULL);
+ _("Deleting files..."), unlink_stub,
+ path_list, path_list, NULL);
}
-@@ -1445,7 +1448,7 @@ thunar_application_creat (ThunarApplication *application,
+@@ -1572,7 +1572,7 @@ thunar_application_trash (ThunarApplication *application,
_thunar_return_if_fail (THUNAR_IS_APPLICATION (application));
+ _thunar_return_if_fail (file_list != NULL);
+- thunar_application_launch (application, parent, "gnome-fs-trash-full",
++ thunar_application_launch (application, parent, "user-trash-full",
+ _("Moving files into the trash..."), trash_stub,
+ file_list, NULL, NULL);
+ }
+@@ -1611,7 +1611,7 @@ thunar_application_creat (ThunarApplication *application,
+ _thunar_return_if_fail (THUNAR_IS_APPLICATION (application));
+
/* launch the operation */
- thunar_application_launch (application, parent, "stock_new",
+ thunar_application_launch (application, parent, "document-new",
_("Creating files..."), creat_stub,
- path_list, path_list, new_files_closure);
+ file_list, file_list, new_files_closure);
}
-@@ -1485,7 +1488,7 @@ thunar_application_mkdir (ThunarApplication *application,
+@@ -1650,7 +1650,7 @@ thunar_application_mkdir (ThunarApplication *application,
_thunar_return_if_fail (THUNAR_IS_APPLICATION (application));
/* launch the operation */
- thunar_application_launch (application, parent, "stock_folder",
+ thunar_application_launch (application, parent, "folder-new",
_("Creating directories..."), mkdir_stub,
- path_list, path_list, new_files_closure);
+ file_list, file_list, new_files_closure);
}
-@@ -1549,7 +1552,7 @@ thunar_application_empty_trash (ThunarApplication *application,
- path_list.prev = NULL;
+@@ -1714,7 +1714,7 @@ thunar_application_empty_trash (ThunarApplication *application,
+ file_list.prev = NULL;
/* launch the operation */
- thunar_application_launch (application, parent, "gnome-fs-trash-empty",
+ thunar_application_launch (application, parent, "user-trash",
- _("Emptying the Trash..."),
- unlink_stub, &path_list, NULL, NULL);
+ _("Emptying the Trash..."),
+ unlink_stub, &file_list, NULL, NULL);
-@@ -1685,7 +1688,7 @@ thunar_application_restore_files (ThunarApplication *application,
- else if (G_LIKELY (response == GTK_RESPONSE_YES))
+@@ -1785,7 +1785,7 @@ thunar_application_restore_files (ThunarApplication *application,
+ else
{
/* launch the operation */
- thunar_application_launch (application, parent, "stock_folder-move",
+ thunar_application_launch (application, parent, "folder-move",
- _("Restoring files..."), thunar_vfs_move_files,
+ _("Restoring files..."), thunar_io_jobs_restore_files,
source_path_list, target_path_list, new_files_closure);
}
diff --git a/thunar/thunar-dialogs.c b/thunar/thunar-dialogs.c
-index 0e36ee3..570efbe 100644
+index fecaac4..ae55dba 100644
--- a/thunar/thunar-dialogs.c
+++ b/thunar/thunar-dialogs.c
-@@ -602,7 +602,7 @@ thunar_dialogs_show_job_ask_replace (GtkWindow *parent,
+@@ -586,7 +586,7 @@ thunar_dialogs_show_job_ask_replace (GtkWindow *parent,
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), table, TRUE, TRUE, 0);
gtk_widget_show (table);
@@ -337,10 +140,10 @@
gtk_misc_set_padding (GTK_MISC (image), 6, 6);
gtk_table_attach (GTK_TABLE (table), image, 0, 1, 0, 1, GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
diff --git a/thunar/thunar-dnd.c b/thunar/thunar-dnd.c
-index 4fb278c..ddf0a64 100644
+index 6d60501..ef17d1b 100644
--- a/thunar/thunar-dnd.c
+++ b/thunar/thunar-dnd.c
-@@ -68,7 +68,7 @@ thunar_dnd_ask (GtkWidget *widget,
+@@ -69,7 +69,7 @@ thunar_dnd_ask (GtkWidget *widget,
{
static const GdkDragAction dnd_action_items[] = { GDK_ACTION_COPY, GDK_ACTION_MOVE, GDK_ACTION_LINK };
static const gchar *dnd_action_names[] = { N_ ("_Copy here"), N_ ("_Move here"), N_ ("_Link here") };
@@ -349,58 +152,6 @@
ThunarxProviderFactory *factory;
GdkDragAction dnd_action = 0;
-diff --git a/thunar/thunar-file.c b/thunar/thunar-file.c
-index c049213..45063fe 100644
---- a/thunar/thunar-file.c
-+++ b/thunar/thunar-file.c
-@@ -1619,16 +1619,16 @@ thunar_file_get_icon_name (const ThunarFile *file,
-
- /* special icon for the home node */
- if (G_UNLIKELY (thunar_file_is_home (file))
-- && gtk_icon_theme_has_icon (icon_theme, "gnome-fs-home"))
-+ && gtk_icon_theme_has_icon (icon_theme, "user-home"))
- {
-- return "gnome-fs-home";
-+ return "user-home";
- }
-
- /* special icon for the desktop node */
- if (G_UNLIKELY (thunar_file_is_desktop (file))
-- && gtk_icon_theme_has_icon (icon_theme, "gnome-fs-desktop"))
-+ && gtk_icon_theme_has_icon (icon_theme, "user-desktop"))
- {
-- return "gnome-fs-desktop";
-+ return "user-desktop";
- }
-
- /* try to be smart when determining icons for executable files
-@@ -1648,10 +1648,10 @@ thunar_file_get_icon_name (const ThunarFile *file,
-
- /* check if we have an accept icon for the icon we found */
- if ((icon_state == THUNAR_FILE_ICON_STATE_DROP || icon_state == THUNAR_FILE_ICON_STATE_OPEN)
-- && strcmp (icon_name, "gnome-fs-directory") == 0
-- && gtk_icon_theme_has_icon (icon_theme, "gnome-fs-directory-accept"))
-+ && strcmp (icon_name, "folder") == 0
-+ && gtk_icon_theme_has_icon (icon_theme, "folder-drag-accept"))
- {
-- return "gnome-fs-directory-accept";
-+ return "folder-drag-accept";
- }
-
- return icon_name;
-diff --git a/thunar/thunar-icon-factory.c b/thunar/thunar-icon-factory.c
-index 0cdbe03..22630cd 100644
---- a/thunar/thunar-icon-factory.c
-+++ b/thunar/thunar-icon-factory.c
-@@ -1036,7 +1036,7 @@ again:
- if (G_UNLIKELY (thumb_state == THUNAR_FILE_THUMB_STATE_LOADING))
- {
- /* check if the icon theme supports the loading icon */
-- icon = thunar_icon_factory_lookup_icon (factory, "gnome-fs-loading-icon", icon_size, FALSE);
-+ icon = thunar_icon_factory_lookup_icon (factory, "image-loading", icon_size, FALSE);
- if (G_LIKELY (icon != NULL))
- return icon;
- }
diff --git a/thunar/thunar-stock.c b/thunar/thunar-stock.c
index 9586ed1..c777b5f 100644
--- a/thunar/thunar-stock.c
@@ -424,7 +175,7 @@
{ THUNAR_STOCK_DOCUMENTS, "emblem-documents", },
{ THUNAR_STOCK_MUSIC, "audio-x-generic", },
diff --git a/thunar/thunar-stock.h b/thunar/thunar-stock.h
-index 775b3e0..3f0b937 100644
+index 9fa3b6e..b2682d8 100644
--- a/thunar/thunar-stock.h
+++ b/thunar/thunar-stock.h
@@ -26,9 +26,9 @@ G_BEGIN_DECLS;
Deleted: desktop/branches/experimental/thunar/debian/patches/03_thunar-window-maximize.patch
===================================================================
--- desktop/tags/thunar/1.0.1-2/debian/patches/03_thunar-window-maximize.patch 2009-12-10 19:48:40 UTC (rev 3720)
+++ desktop/branches/experimental/thunar/debian/patches/03_thunar-window-maximize.patch 2010-01-09 14:09:04 UTC (rev 3765)
@@ -1,75 +0,0 @@
-Index: thunar/thunar-preferences.c
-===================================================================
---- thunar/thunar-preferences.c (revision 28993)
-+++ thunar/thunar-preferences.c (working copy)
-@@ -68,6 +68,7 @@
- PROP_LAST_VIEW,
- PROP_LAST_WINDOW_HEIGHT,
- PROP_LAST_WINDOW_WIDTH,
-+ PROP_LAST_WINDOW_FULLSCREEN,
- PROP_MISC_VOLUME_MANAGEMENT,
- PROP_MISC_CASE_SENSITIVE,
- PROP_MISC_DATE_STYLE,
-@@ -436,6 +437,20 @@
- "last-window-width",
- 1, G_MAXINT, 640,
- EXO_PARAM_READWRITE));
-+
-+ /**
-+ * ThunarPreferences:last-window-maximized:
-+ *
-+ * The last known maximized state of a #ThunarWindow, which will be used as
-+ * default width for newly created windows.
-+ **/
-+ g_object_class_install_property (gobject_class,
-+ PROP_LAST_WINDOW_FULLSCREEN,
-+ g_param_spec_boolean ("last-window-maximized",
-+ "LastWindowMaximized",
-+ "last-window-maximized",
-+ FALSE,
-+ EXO_PARAM_READWRITE));
-
- /**
- * ThunarPreferences:misc-volume-management:
-Index: thunar/thunar-window.c
-===================================================================
---- thunar/thunar-window.c (revision 28993)
-+++ thunar/thunar-window.c (working copy)
-@@ -710,6 +710,7 @@
- gint position;
- gint width;
- gint height;
-+ gboolean maximized;
-
- /* grab a reference on the provider factory */
- window->provider_factory = thunarx_provider_factory_get_default ();
-@@ -805,8 +806,12 @@
- g_signal_connect_swapped (G_OBJECT (window->launcher), "change-directory", G_CALLBACK (thunar_window_set_current_directory), window);
-
- /* determine the default window size from the preferences */
-- g_object_get (G_OBJECT (window->preferences), "last-window-width", &width, "last-window-height", &height, NULL);
-+ g_object_get (G_OBJECT (window->preferences), "last-window-width", &width, "last-window-height", &height, "last-window-maximized", &maximized, NULL);
- gtk_window_set_default_size (GTK_WINDOW (window), width, height);
-+
-+ /* restore the maxized state of the window */
-+ if (G_UNLIKELY (maximized))
-+ gtk_window_maximize (GTK_WINDOW (window));
-
- window->table = gtk_table_new (6, 1, FALSE);
- gtk_container_add (GTK_CONTAINER (window), window->table);
-@@ -2491,8 +2496,14 @@
- gtk_window_get_size (GTK_WINDOW (window), &width, &height);
-
- /* ...and remember them as default for new windows */
-- g_object_set (G_OBJECT (window->preferences), "last-window-width", width, "last-window-height", height, NULL);
-+ g_object_set (G_OBJECT (window->preferences), "last-window-width", width, "last-window-height", height,
-+ "last-window-maximized", FALSE, NULL);
- }
-+ else
-+ {
-+ /* only store that the window is full screen */
-+ g_object_set (G_OBJECT (window->preferences), "last-window-maximized", TRUE, NULL);
-+ }
- }
- }
-
Deleted: desktop/branches/experimental/thunar/debian/patches/04_fix-umask-handling.patch
===================================================================
--- desktop/tags/thunar/1.0.1-2/debian/patches/04_fix-umask-handling.patch 2009-12-10 19:48:40 UTC (rev 3720)
+++ desktop/branches/experimental/thunar/debian/patches/04_fix-umask-handling.patch 2010-01-09 14:09:04 UTC (rev 3765)
@@ -1,52 +0,0 @@
-commit eb58c6a6ba7f77c2c16016db064524df598ef421
-Author: Jannis Pohlmann <jannis at xfce.org>
-Date: Sat Oct 3 11:49:41 2009 +0200
-
- Fix bugs #3532 (umask < 0022 not honoured) and #5813 properly (I hope).
-
- The previous patch applied in e53de71e6add9b28ba034111a1d19db7def8f7e7
- made things worse than before: it used DEFFILEMODE which seems to be
- BSD-specific for creating files. It also reset the umask to 0 when
- creating the first directory with _thunar_vfs_io_jobs_mkdir().
-
- What we really want is to use 0777 (dirs) and 0666 (files) and let the
- standard C system calls like open() apply the umask value. This should
- work on all POSIX-compliant systems.
-
- Patch provided by Craig Ringer <craig at postnewspapers.com.au>.
-
-diff --git a/thunar-vfs/thunar-vfs-io-jobs.c b/thunar-vfs/thunar-vfs-io-jobs.c
-index 8d70812..c94523a 100644
---- a/thunar-vfs/thunar-vfs-io-jobs.c
-+++ b/thunar-vfs/thunar-vfs-io-jobs.c
-@@ -432,8 +432,12 @@ _thunar_vfs_io_jobs_create (ThunarVfsJob *job,
- absolute_path = thunar_vfs_path_dup_string (lp->data);
-
- again:
-- /* try to create the file at the given path */
-- fd = g_open (absolute_path, O_CREAT | O_EXCL | O_WRONLY, DEFFILEMODE);
-+ /* Try to create the file at the given path.
-+ *
-+ * Note that despite the 0666 mask, we won't really create a world-writable
-+ * file unless the user's umask permits it (ie the umask is 0000).
-+ */
-+ fd = g_open (absolute_path, O_CREAT | O_EXCL | O_WRONLY, 0666);
- if (G_UNLIKELY (fd < 0))
- {
- /* check if the file already exists */
-@@ -707,8 +711,13 @@ _thunar_vfs_io_jobs_mkdir (ThunarVfsJob *job,
- /* update the progress information */
- _thunar_vfs_job_process_path (job, lp);
-
-- /* try to create the target directory */
-- if (!_thunar_vfs_io_ops_mkdir (lp->data, 0777 & ~umask(0), THUNAR_VFS_IO_OPS_NONE, error))
-+ /* try to create the target directory
-+ *
-+ * Note that the mode specified here is limited by the user's umask, so we will not
-+ * actually be creating a world writable directory unless the user's umask permits
-+ * it.
-+ */
-+ if (!_thunar_vfs_io_ops_mkdir (lp->data, 0777, THUNAR_VFS_IO_OPS_NONE, error))
- return FALSE;
- }
-
Modified: desktop/branches/experimental/thunar/debian/rules
===================================================================
--- desktop/tags/thunar/1.0.1-2/debian/rules 2009-12-10 19:48:40 UTC (rev 3720)
+++ desktop/branches/experimental/thunar/debian/rules 2010-01-09 14:09:04 UTC (rev 3765)
@@ -3,24 +3,19 @@
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/class/autotools.mk
-DEB_CONFIGURE_EXTRA_FLAGS := --enable-final --disable-gnome-thumbnailers --enable-dbus --enable-startup-notification --enable-apr-plugin --enable-exif --enable-pcre --enable-sbr-plugin --enable-tpa-plugin --enable-uca-plugin
+DEB_CONFIGURE_EXTRA_FLAGS := --enable-dbus --enable-startup-notification --enable-apr-plugin --enable-exif --enable-pcre --enable-sbr-plugin --enable-tpa-plugin --enable-uca-plugin
DEB_DH_SHLIBDEPS_ARGS_thunar = -X debian/thunar/usr/lib/thunar/xfce4/panel-plugins/thunar-tpa -- -dRecommends debian/thunar/usr/lib/thunar/xfce4/panel-plugins/thunar-tpa -dDepends
-makebuilddir/thunar:: debian/compat
- # Some systems don't have POSIX_MADV* but have MADV* defined with
- # the same values anyway.
- grep -q POSIX_MADV foo || sed -i -e 's/POSIX_MADV/MADV/' \
- $(CURDIR)/thunar-vfs/*.c
-
+DEB_DH_MAKESHLIBS_ARGS_libthunarx-2-0 = -X debian/libthunarx-2-0/usr/lib/thunarx-2
install/thunar::
rm -f $(CURDIR)/debian/tmp/usr/lib/*.la
rm -f $(CURDIR)/debian/tmp/usr/lib/*/*.la
chrpath -d -k $(CURDIR)/debian/tmp/usr/bin/Thunar \
$(CURDIR)/debian/tmp/usr/lib/thunar/thunar-* \
- $(CURDIR)/debian/tmp/usr/lib/libthunar*.so.*2 \
- $(CURDIR)/debian/tmp/usr/lib/thunarx-1/thunar-apr.so \
+ $(CURDIR)/debian/tmp/usr/lib/libthunar*.so.*0 \
+ $(CURDIR)/debian/tmp/usr/lib/thunarx-2/thunar-apr.so \
$(CURDIR)/debian/tmp/usr/lib/thunar/xfce4/panel-plugins/thunar-tpa
install/thunar-data::
@@ -43,12 +38,12 @@
cd $(CURDIR)/debian/thunar/usr/share/doc/ && \
rm -rf thunar && ln -sf thunar-data thunar
-binary-post-install/libthunar-vfs-1-2::
- cd $(CURDIR)/debian/libthunar-vfs-1-2/usr/share/doc/ && \
- rm -rf libthunar-vfs-1-2 && \
- ln -sf thunar-data libthunar-vfs-1-2
+binary-post-install/libthunarx-2-0::
+ cd $(CURDIR)/debian/libthunarx-2-0/usr/share/doc/ && \
+ rm -rf libthunarx-2-0 && \
+ ln -sf thunar-data libthunarx-2-0
-binary-post-install/libthunar-vfs-1-dev::
- cd $(CURDIR)/debian/libthunar-vfs-1-dev/usr/share/doc/ && \
- rm -rf libthunar-vfs-1-dev && \
- ln -sf thunar-data libthunar-vfs-1-dev
+binary-post-install/libthunarx-2-dev::
+ cd $(CURDIR)/debian/libthunarx-2-dev/usr/share/doc/ && \
+ rm -rf libthunarx-2-dev && \
+ ln -sf thunar-data libthunarx-2-dev
More information about the Pkg-xfce-commits
mailing list