[Pkg-xfce-commits] r4178 - in desktop/branches/experimental/thunar/debian: . patches source
Lionel Le Folgoc
mrpouit-guest at alioth.debian.org
Sun Jul 25 10:46:00 UTC 2010
Author: mrpouit-guest
Date: 2010-07-25 22:46:00 +0000 (Sun, 25 Jul 2010)
New Revision: 4178
Added:
desktop/branches/experimental/thunar/debian/patches/series
desktop/branches/experimental/thunar/debian/source/
desktop/branches/experimental/thunar/debian/source/format
Modified:
desktop/branches/experimental/thunar/debian/changelog
desktop/branches/experimental/thunar/debian/control
desktop/branches/experimental/thunar/debian/copyright
desktop/branches/experimental/thunar/debian/patches/02_thunar-icon-naming-spec-compliance.patch
desktop/branches/experimental/thunar/debian/rules
Log:
* debian/control:
- update libthunarx-2-dev dep on libexo-0.3-dev to libexo-1-dev
- drop obsolete hal build and binary deps (this version uses GIO now)
- libthunarx-2-dev: drop dep on libexo-1-dev
- build-depends on libnotify-dev and libgudev-1.0-dev
- bump xfce4-panel-dev build-dep to >= 4.7.0
- bump Standards-Version to 3.9.0, no change required.
* debian/copyright: refreshed.
* debian/source/format: switch to 3.0 (quilt).
* debian/rules: drop simple-patchsys.mk include.
* debian/patches:
- 02_thunar-icon-naming-spec-compliance.patch: refreshed to apply cleanly
- series: added, include the patch above.
Modified: desktop/branches/experimental/thunar/debian/changelog
===================================================================
--- desktop/branches/experimental/thunar/debian/changelog 2010-07-25 21:40:45 UTC (rev 4177)
+++ desktop/branches/experimental/thunar/debian/changelog 2010-07-25 22:46:00 UTC (rev 4178)
@@ -1,4 +1,4 @@
-thunar (1.1.0-1) UNRELEASED; urgency=low
+thunar (1.1.1-1) UNRELEASED; urgency=low
[ Yves-Alexis Perez ]
* New upstream release.
@@ -29,10 +29,19 @@
* debian/watch updated.
[ Lionel Le Folgoc ]
- * debian/control: update libthunarx-2-dev dep on libexo-0.3-dev to
- libexo-1-dev.
- * debian/control: Drop obsolete hal build and binary dependencies.
- This version uses GIO now.
+ * debian/control:
+ - update libthunarx-2-dev dep on libexo-0.3-dev to libexo-1-dev
+ - drop obsolete hal build and binary deps (this version uses GIO now)
+ - libthunarx-2-dev: drop dep on libexo-1-dev
+ - build-depends on libnotify-dev and libgudev-1.0-dev
+ - bump xfce4-panel-dev build-dep to >= 4.7.0
+ - bump Standards-Version to 3.9.0, no change required.
+ * debian/copyright: refreshed.
+ * debian/source/format: switch to 3.0 (quilt).
+ * debian/rules: drop simple-patchsys.mk include.
+ * debian/patches:
+ - 02_thunar-icon-naming-spec-compliance.patch: refreshed to apply cleanly
+ - series: added, include the patch above.
-- Yves-Alexis Perez <corsac at debian.org> Sun, 21 Feb 2010 15:37:20 +0100
Modified: desktop/branches/experimental/thunar/debian/control
===================================================================
--- desktop/branches/experimental/thunar/debian/control 2010-07-25 21:40:45 UTC (rev 4177)
+++ desktop/branches/experimental/thunar/debian/control 2010-07-25 22:46:00 UTC (rev 4178)
@@ -4,13 +4,14 @@
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>, Lionel Le Folgoc <mrpouit at gmail.com>
-Build-Depends: debhelper (>= 7), libcairo2-dev,
- libexo-1-dev (>= 0.5.1), cdbs, libxml-parser-perl, libfam-dev,
- libdbus-glib-1-dev, libexif-dev, libgtk2.0-dev (>= 2.10.1),
- xfce4-panel-dev (>= 4.6.0), chrpath, libpcre3-dev, libjpeg-dev,
- libstartup-notification0-dev (>= 0.4), intltool, libxfce4ui-1-dev (>= 4.7.1)
+Build-Depends: debhelper (>= 7), libcairo2-dev,
+ libexo-1-dev (>= 0.5.1), cdbs, libxml-parser-perl, libfam-dev,
+ libdbus-glib-1-dev, libexif-dev, libgtk2.0-dev (>= 2.10.1),
+ xfce4-panel-dev (>= 4.7.0), chrpath, libpcre3-dev, libjpeg-dev,
+ libstartup-notification0-dev (>= 0.4), intltool, libxfce4ui-1-dev (>= 4.7.1),
+ libnotify-dev, libgudev-1.0-dev
Build-Conflicts: libgamin-dev [!hurd-i386]
-Standards-Version: 3.8.4
+Standards-Version: 3.9.0
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,10 +20,9 @@
Section: libdevel
Architecture: any
Depends: libthunarx-2-0 (= ${binary:Version}), ${misc:Depends},
- libexo-1-dev (>= 0.5.1), thunar-data (=${source:Version}),
- libglib2.0-dev, libgtk2.0-dev
+ thunar-data (=${source:Version}), libglib2.0-dev, libgtk2.0-dev
Description: Development files for libthunarx
- This package contains the headers and the static library for libthunarx,
+ This package contains the headers and the static library for libthunarx,
the extension library used by thunar
Package: libthunarx-2-0
Modified: desktop/branches/experimental/thunar/debian/copyright
===================================================================
--- desktop/branches/experimental/thunar/debian/copyright 2010-07-25 21:40:45 UTC (rev 4177)
+++ desktop/branches/experimental/thunar/debian/copyright 2010-07-25 22:46:00 UTC (rev 4178)
@@ -3,32 +3,39 @@
It was downloaded from http://thunar.xfce.org/
-Copyright Holders:
+Copyright Holders:
==================
-2004-2007 Benedikt Meurer <benny at xfce.org>
-2005 Jeffs Franks <jcfranks at xfce.org>
+© 2004-2007 Benedikt Meurer <benny at xfce.org>
+© 2005 Jeffs Franks <jcfranks at xfce.org>
+© 2005-2006 Christian Hammond
+© 2006 Matt McClinch <mattmcclinch at gmail.com>
+© 2009-2010 Jannis Pohlmann <jannis at xfce.org>
-thunarx is copyrighted:
+Plugins are copyrighted:
-Copyright (c) 2004 The GLib Development Team.
-Copyright (c) 2005 Benedikt Meurer <benny at xfce.org>
+© 2005-2007 Benedikt Meurer <benny at xfce.org>
+© 2008 Stephan Arts <stephan at xfce.org>
+© 2008-2009 Mike Massonnet <mmassonnet at xfce.org>
+© 2009 Jannis Pohlmann <jannis at xfce.org>
+© 2007-2010 Nick Schermer <nick at xfce.org>
-thunar-vfs is copyrighted:
+thunarx is copyrighted:
-Copyright (c) 2004 The GLib Development Team.
-Copyright (c) 2004-2005 Benedikt Meurer <benny at xfce.org>.
+© 2004 The GLib Development Team.
+© 2005-2006 Benedikt Meurer <benny at xfce.org>
+© 2009 Jannis Pohlmann <jannis at xfce.org>
tdb (trivial database system) is copyrighted:
-Copyright (c) 2001 Anton Blanchard <anton at samba.org>
-Copyright (c) 2005 Benedikt Meurer <benny at xfce.org>
-Copyright (c) 1999-2004 Andrew Tridgell <tridge at linuxcare.com>
-Copyright (c) 2000 Paul `Rusty' Russel <rusty at linuxcare.com>
-Copyright (c) 2000-2003 Jeremy Allison <jeremy at valinux.com>
-Copyright (c) 2001 Andrew Esh
+© 2001 Anton Blanchard <anton at samba.org>
+© 2005 Benedikt Meurer <benny at xfce.org>
+© 1999-2004 Andrew Tridgell <tridge at linuxcare.com>
+© 2000 Paul `Rusty' Russel <rusty at linuxcare.com>
+© 2000-2003 Jeremy Allison <jeremy at valinux.com>
+© 2001 Andrew Esh
-Licenses:
+Licenses:
=========
GNU/LGPL for files under thunarx, thunar-vfs , tdb folders
Modified: desktop/branches/experimental/thunar/debian/patches/02_thunar-icon-naming-spec-compliance.patch
===================================================================
--- desktop/branches/experimental/thunar/debian/patches/02_thunar-icon-naming-spec-compliance.patch 2010-07-25 21:40:45 UTC (rev 4177)
+++ desktop/branches/experimental/thunar/debian/patches/02_thunar-icon-naming-spec-compliance.patch 2010-07-25 22:46:00 UTC (rev 4178)
@@ -1,37 +1,3 @@
-diff --git a/plugins/thunar-tpa/thunar-tpa-icon.c b/plugins/thunar-tpa/thunar-tpa-icon.c
-index d6b22b9..c2268c4 100644
---- a/plugins/thunar-tpa/thunar-tpa-icon.c
-+++ b/plugins/thunar-tpa/thunar-tpa-icon.c
-@@ -167,7 +167,7 @@ thunar_tpa_icon_init (ThunarTpaIcon *icon)
- gtk_widget_show (icon->button);
-
- /* setup the image for the trash icon */
-- icon->image = gtk_image_new_from_icon_name ("gnome-fs-trash-empty", GTK_ICON_SIZE_BUTTON);
-+ icon->image = gtk_image_new_from_icon_name ("user-trash", GTK_ICON_SIZE_BUTTON);
- gtk_container_add (GTK_CONTAINER (icon->button), icon->image);
- gtk_widget_show (icon->image);
-
-@@ -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);
-+ gtk_image_set_from_icon_name (GTK_IMAGE (icon->image), full ? "user-trash-full" : "user-trash", GTK_ICON_SIZE_BUTTON);
-
- /* apply the new state */
- icon->full = full;
-diff --git a/plugins/thunar-tpa/thunar-tpa.desktop.in.in b/plugins/thunar-tpa/thunar-tpa.desktop.in.in
-index 6d848f6..f647521 100644
---- a/plugins/thunar-tpa/thunar-tpa.desktop.in.in
-+++ b/plugins/thunar-tpa/thunar-tpa.desktop.in.in
-@@ -3,6 +3,6 @@ Type=X-XFCE-PanelPlugin
- Encoding=UTF-8
- _Name=Trash Applet
- _Comment=Display the trash can
--Icon=gnome-fs-trash-empty
-+Icon=user-trash
- X-XFCE-Exec=@libexecdir@/xfce4/panel-plugins/thunar-tpa
-
diff --git a/thunar/thunar-application.c b/thunar/thunar-application.c
index dc12c08..ec1b178 100644
--- a/thunar/thunar-application.c
@@ -54,15 +20,6 @@
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 files and launch the job */
-- thunar_application_collect_and_launch (application, parent, "stock_link",
-+ thunar_application_collect_and_launch (application, parent, "insert-link",
- title, thunar_io_jobs_link_files,
- source_file_list, target_file,
- new_files_closure);
@@ -1423,7 +1423,7 @@ thunar_application_move_into (ThunarApplication *application,
/* collect the target files and launch the job */
@@ -72,51 +29,6 @@
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);
- }
-@@ -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,
- file_list, file_list, new_files_closure);
- }
-@@ -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,
- file_list, file_list, new_files_closure);
- }
-@@ -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, &file_list, NULL, NULL);
-
@@ -1785,7 +1785,7 @@ thunar_application_restore_files (ThunarApplication *application,
else
{
@@ -139,54 +51,3 @@
gtk_misc_set_alignment (GTK_MISC (image), 0.5f, 0.0f);
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 6d60501..ef17d1b 100644
---- a/thunar/thunar-dnd.c
-+++ b/thunar/thunar-dnd.c
-@@ -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") };
-- static const gchar *dnd_action_icons[] = { "stock_folder-copy", "stock_folder-move", NULL };
-+ static const gchar *dnd_action_icons[] = { "gtk-copy", "folder-move", NULL };
-
- ThunarxProviderFactory *factory;
- GdkDragAction dnd_action = 0;
-diff --git a/thunar/thunar-stock.c b/thunar/thunar-stock.c
-index 9586ed1..c777b5f 100644
---- a/thunar/thunar-stock.c
-+++ b/thunar/thunar-stock.c
-@@ -45,12 +45,12 @@ typedef struct
- /* keep in sync with thunar-stock.h */
- static const ThunarStockIcon thunar_stock_icons[] =
- {
-- { THUNAR_STOCK_DESKTOP, "gnome-fs-desktop", },
-- { THUNAR_STOCK_HOME, "gnome-fs-home", },
-+ { THUNAR_STOCK_DESKTOP, "user-desktop", },
-+ { THUNAR_STOCK_HOME, "user-home", },
- { THUNAR_STOCK_SHORTCUTS, "stock_thunar-shortcuts", },
-- { THUNAR_STOCK_TEMPLATES, "stock_thunar-templates", },
-- { THUNAR_STOCK_TRASH_EMPTY, "gnome-fs-trash-empty", },
-- { THUNAR_STOCK_TRASH_FULL, "gnome-fs-trash-full", },
-+ { THUNAR_STOCK_TEMPLATES, "text-x-generic-template", },
-+ { THUNAR_STOCK_TRASH_EMPTY, "user-trash", },
-+ { THUNAR_STOCK_TRASH_FULL, "user-trash-full", },
- { THUNAR_STOCK_DOWNLOADS, "emblem-downloads", },
- { THUNAR_STOCK_DOCUMENTS, "emblem-documents", },
- { THUNAR_STOCK_MUSIC, "audio-x-generic", },
-diff --git a/thunar/thunar-stock.h b/thunar/thunar-stock.h
-index 9fa3b6e..b2682d8 100644
---- a/thunar/thunar-stock.h
-+++ b/thunar/thunar-stock.h
-@@ -26,9 +26,9 @@ G_BEGIN_DECLS;
- #define THUNAR_STOCK_HOME "thunar-home" /* see ThunarWindow */
- #define THUNAR_STOCK_SHORTCUTS "thunar-shortcuts" /* see ThunarShortcutsPane */
- #define THUNAR_STOCK_TEMPLATES "thunar-templates" /* see ThunarWindow */
--#define THUNAR_STOCK_TRASH_EMPTY "thunar-trash-empty" /* see ThunarTrashAction */
-+#define THUNAR_STOCK_TRASH_EMPTY "thunar-trash" /* see ThunarTrashAction */
- #define THUNAR_STOCK_TRASH_FULL "thunar-trash-full" /* see ThunarTrashAction */
--#define THUNAR_STOCK_DIRECTORY "gnome-fs-directory"
-+#define THUNAR_STOCK_DIRECTORY "gtk-directory"
- #define THUNAR_STOCK_DOWNLOADS "thunar-downloads"
- #define THUNAR_STOCK_DOCUMENTS "thunar-documents"
- #define THUNAR_STOCK_MUSIC "thunar-music"
Added: desktop/branches/experimental/thunar/debian/patches/series
===================================================================
--- desktop/branches/experimental/thunar/debian/patches/series (rev 0)
+++ desktop/branches/experimental/thunar/debian/patches/series 2010-07-25 22:46:00 UTC (rev 4178)
@@ -0,0 +1 @@
+02_thunar-icon-naming-spec-compliance.patch
Modified: desktop/branches/experimental/thunar/debian/rules
===================================================================
--- desktop/branches/experimental/thunar/debian/rules 2010-07-25 21:40:45 UTC (rev 4177)
+++ desktop/branches/experimental/thunar/debian/rules 2010-07-25 22:46:00 UTC (rev 4178)
@@ -1,6 +1,5 @@
#!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/class/autotools.mk
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
Added: desktop/branches/experimental/thunar/debian/source/format
===================================================================
--- desktop/branches/experimental/thunar/debian/source/format (rev 0)
+++ desktop/branches/experimental/thunar/debian/source/format 2010-07-25 22:46:00 UTC (rev 4178)
@@ -0,0 +1 @@
+3.0 (quilt)
More information about the Pkg-xfce-commits
mailing list