[Pkg-xfce-commits] r4180 - in goodies/branches/experimental: . thunar-volman thunar-volman/debian thunar-volman/debian/patches
Lionel Le Folgoc
mrpouit-guest at alioth.debian.org
Mon Jul 26 06:09:10 UTC 2010
Author: mrpouit-guest
Date: 2010-07-26 06:09:08 +0000 (Mon, 26 Jul 2010)
New Revision: 4180
Added:
goodies/branches/experimental/thunar-volman/
goodies/branches/experimental/thunar-volman/debian/
goodies/branches/experimental/thunar-volman/debian/changelog
goodies/branches/experimental/thunar-volman/debian/compat
goodies/branches/experimental/thunar-volman/debian/control
goodies/branches/experimental/thunar-volman/debian/copyright
goodies/branches/experimental/thunar-volman/debian/patches/
goodies/branches/experimental/thunar-volman/debian/patches/01_display-volume-info-for-crypto-layer.patch
goodies/branches/experimental/thunar-volman/debian/patches/02_fix-race-asking-passphrase-twice.patch
goodies/branches/experimental/thunar-volman/debian/rules
goodies/branches/experimental/thunar-volman/debian/shlibs.local
goodies/branches/experimental/thunar-volman/debian/thunar-volman.1
goodies/branches/experimental/thunar-volman/debian/watch
Log:
copy trunk/thunar-volman; work in progress
Added: goodies/branches/experimental/thunar-volman/debian/changelog
===================================================================
--- goodies/branches/experimental/thunar-volman/debian/changelog (rev 0)
+++ goodies/branches/experimental/thunar-volman/debian/changelog 2010-07-26 06:09:08 UTC (rev 4180)
@@ -0,0 +1,112 @@
+thunar-volman (0.5.0-1) UNRELEASED; urgency=low
+
+ * debian/control: add myself to uploaders.
+ * debian/copyright: refreshed.
+
+ -- Lionel Le Folgoc <mrpouit at gmail.com> Mon, 26 Jul 2010 08:07:01 +0200
+
+thunar-volman (0.3.80-4) unstable; urgency=low
+
+ [ Stefan Ott ]
+ * Fix debian/watch
+
+ [ Yves-Alexis Perez ]
+ * debian/patches
+ - 02_fix-race-asking-passphrase-twice added, don't ask twice for
+ passphrase on encrypted volumes (Xfce #5416).
+ * debian/control:
+ - update standards version to 3.8.4.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Sat, 13 Mar 2010 12:13:22 +0100
+
+thunar-volman (0.3.80-3) unstable; urgency=low
+
+ [ Evgeni Golov ]
+ * Fix Vcs-* fields, they were missing 'trunk' in the path.
+
+ [ Yves-Alexis Perez ]
+ * debian/control:
+ - add dependency on hal. closes: #525222
+ - update standards version to 3.8.3.
+ * debian/watch edited to track Xfce archive reorganisation.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Sat, 10 Oct 2009 17:42:24 +0200
+
+thunar-volman (0.3.80-2) unstable; urgency=low
+
+ * Upload to unstable.
+ * debian/control:
+ - update debhelper build-dep to 7.
+ - update standards version to 3.8.1.
+ - move to xfce section.
+ * debian/compat bumped to 7.
+ * debian/rules:
+ - add -Wl,-z,-defs -Wl,--as-needed to LDFLAGS.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Sat, 04 Apr 2009 16:23:28 +0200
+
+thunar-volman (0.3.80-1) experimental; urgency=low
+
+ * New upstream release.
+ * debian/patches:
+ - 01_autoipod_command_only_for_music_players dropped, included upstream.
+ - 02_encrypted-volumes dropped, included upstream.
+ - 01_display-volume-info-for-crypto-layer added, display device
+ name when asking the passphrase of a crypto-container. (Xfce #4656)
+ * debian/copyright:
+ - updated dates.
+ - added copyright for Colin Leroy patch.
+ * debian/control:
+ - removed Rudy Godoy and Martin Loschwitz from Uploaders:.
+ - updated build-dep on exo and Thunar for Xfce 4.6.
+ - add explicit build-dep on gtk.
+ * debian/rules:
+ - fails if file are missing in installed package.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Sun, 01 Mar 2009 00:30:58 +0100
+
+thunar-volman (0.2.0-3) experimental; urgency=low
+
+ * debian/patches:
+ - 02_encrypted-volumes added, add support for mounting encrypted volumes.
+ Patch from Colin Leroy (Xfce #3349).
+ * debian/copyright:
+ - use © sign.
+ * debian/control:
+ - update standards version to 3.8.0, no change needed.
+ - update build deps on exo with luks support.
+ * debian/shlibs.local: request a libexo with luks support.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Wed, 13 Aug 2008 23:13:00 +0200
+
+thunar-volman (0.2.0-2) unstable; urgency=low
+
+ [ Yves-Alexis Perez ]
+ * debian/patches:
+ - 01_autoipod_command_only_for_music_players added: only run “music
+ player” command when a music player is plugged. closes: #455870
+
+ [ Simon Huggins ]
+ * Add dependency on new exo-utils for exo-mount
+
+ -- Simon Huggins <huggie at earth.li> Mon, 28 Jan 2008 11:24:24 +0000
+
+thunar-volman (0.2.0-1) unstable; urgency=low
+
+ [ Simon Huggins ]
+ * Add Vcs-* headers to debian/control
+
+ [ Yves-Alexis Perez ]
+ * The “first upload” release.
+ * New upstream release.
+ * debian/control:
+ - updated Standards-Version to 3.7.3.
+ - changed email to my debian.org.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Wed, 05 Dec 2007 22:37:50 +0100
+
+thunar-volman (0.1.2-1) unstable; urgency=low
+
+ * Initial release closes: #407874
+
+ -- Yves-Alexis Perez <corsac at corsac.net> Wed, 02 May 2007 17:01:16 +0100
Added: goodies/branches/experimental/thunar-volman/debian/compat
===================================================================
--- goodies/branches/experimental/thunar-volman/debian/compat (rev 0)
+++ goodies/branches/experimental/thunar-volman/debian/compat 2010-07-26 06:09:08 UTC (rev 4180)
@@ -0,0 +1 @@
+7
Added: goodies/branches/experimental/thunar-volman/debian/control
===================================================================
--- goodies/branches/experimental/thunar-volman/debian/control (rev 0)
+++ goodies/branches/experimental/thunar-volman/debian/control 2010-07-26 06:09:08 UTC (rev 4180)
@@ -0,0 +1,20 @@
+Source: thunar-volman
+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>, Lionel Le Folgoc <mrpouit at gmail.com>
+Build-Depends: debhelper (>= 7), cdbs, libthunar-vfs-1-dev (>= 1.0.0),
+ libdbus-glib-1-dev, libexo-0.3-dev (>= 0.3.100), chrpath, libxml-parser-perl,
+ libgtk2.0-dev
+Standards-Version: 3.8.4
+Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/thunar-volman/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/thunar-volman/
+
+Package: thunar-volman
+Section: xfce
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, thunar, exo-utils, hal
+Description: Thunar extension for volumes management
+ The Thunar Volume Manager is an extension for the Thunar file manager, which
+ enables automatic management of removable drives and media.
Added: goodies/branches/experimental/thunar-volman/debian/copyright
===================================================================
--- goodies/branches/experimental/thunar-volman/debian/copyright (rev 0)
+++ goodies/branches/experimental/thunar-volman/debian/copyright 2010-07-26 06:09:08 UTC (rev 4180)
@@ -0,0 +1,31 @@
+This package was debianized by Yves-Alexis Perez <corsac at corsac.net> on
+Sat, 20 Jan 2007 13:20:15 +0100
+
+It was downloaded from
+http://foo-projects.org/~benny/projects/thunar-volman/index.html
+
+Copyright Holders:
+© 2004-2007 The Thunar development team.
+© 2005-2008 Benedikt Meurer <benny at xfce.org>
+© 2010 Jannis Pohlmann <jannis at xfce.org>
+
+Portions of the code are based on code from gnome-volume-manager, written by
+Robert Love <rml at novell.com> and Jeffrey Stedfast <fejj at novell.com> for GNOME.
+
+License: GPL-2+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+On Debian systems, the complete text of the GNU General Public License
+can be found in `/usr/share/common-licenses/GPL'.
Added: goodies/branches/experimental/thunar-volman/debian/patches/01_display-volume-info-for-crypto-layer.patch
===================================================================
--- goodies/branches/experimental/thunar-volman/debian/patches/01_display-volume-info-for-crypto-layer.patch (rev 0)
+++ goodies/branches/experimental/thunar-volman/debian/patches/01_display-volume-info-for-crypto-layer.patch 2010-07-26 06:09:08 UTC (rev 4180)
@@ -0,0 +1,76 @@
+Index: thunar-volman/tvm-device.c
+===================================================================
+--- thunar-volman/tvm-device.c (revision 6216)
++++ thunar-volman/tvm-device.c (working copy)
+@@ -112,7 +112,7 @@
+ if (G_UNLIKELY (context == NULL))
+ {
+ /* out of memory */
+- g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_NOMEM, g_strerror (ENOMEM));
++ g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_NOMEM, "%s", g_strerror (ENOMEM));
+ return FALSE;
+ }
+
+Index: thunar-volman/tvm-crypto-volume.c
+===================================================================
+--- thunar-volman/tvm-crypto-volume.c (revision 6216)
++++ thunar-volman/tvm-crypto-volume.c (working copy)
+@@ -278,6 +278,9 @@
+ GtkWidget *wait_progress;
+ GtkWidget *image;
+ guint animator_id;
++ const gchar *device_file = libhal_volume_get_device_file(volume);
++ gchar *text;
++
+ g_clear_error(error);
+
+ window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+@@ -294,7 +297,9 @@
+ gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
+ gtk_widget_show (image);
+
+- label = gtk_label_new(_("<span weight=\"bold\" size=\"larger\">Mounting encrypted volume...</span>"));
++ text = g_strdup_printf(_("<span weight=\"bold\" size=\"larger\">Mounting %s...</span>"), device_file);
++ label = gtk_label_new(text);
++ g_free(text);
+ gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
+ gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
+ gtk_box_pack_start(GTK_BOX(vbox), label, TRUE, FALSE, 0);
+@@ -321,7 +326,7 @@
+ if (G_UNLIKELY (message == NULL))
+ {
+ /* out of memory */
+-oom: g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_NOMEM, g_strerror (ENOMEM));
++oom: g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_NOMEM, "%s", g_strerror (ENOMEM));
+ goto out;
+ }
+
+@@ -440,14 +445,21 @@
+
+ for (num_tries = 0; num_tries < 3; num_tries++) {
+ gint response,len;
++ gchar *title, *text;
++ const gchar *device_file = libhal_volume_get_device_file(volume);
++ title = pass_error? g_strdup_printf(_("<span weight=\"bold\" size=\"larger\">"
++ "Wrong password.</span>"))
++ : g_strdup_printf(_("<span weight=\"bold\" size=\"larger\">"
++ "Volume %s is encrypted.</span>"), device_file);
++ text = g_strdup_printf(_("Please enter your password to decrypt and mount the volume %s."), device_file);
++
+ response = tvm_crypto_volume_ask_password (context, udi, "gtk-dialog-authentication", _("Encrypted volume"),
+- &password, FALSE, GTK_RESPONSE_OK,
+- pass_error? _("<span weight=\"bold\" size=\"larger\">Wrong password.</span>")
+- :_("<span weight=\"bold\" size=\"larger\">This volume is encrypted.</span>"),
+- _("Please enter your password to decrypt and mount the volume."),
+- _("Ig_nore"), GTK_RESPONSE_CANCEL,
+- _("_Mount"), GTK_RESPONSE_OK,
+- NULL);
++ &password, FALSE, GTK_RESPONSE_OK, title, text,
++ _("Ig_nore"), GTK_RESPONSE_CANCEL,
++ _("_Mount"), GTK_RESPONSE_OK,
++ NULL);
++ g_free(title);
++ g_free(text);
+ if (response == GTK_RESPONSE_CANCEL || response == GTK_RESPONSE_DELETE_EVENT) {
+ g_clear_error(error);
+ num_tries = 3;
Added: goodies/branches/experimental/thunar-volman/debian/patches/02_fix-race-asking-passphrase-twice.patch
===================================================================
--- goodies/branches/experimental/thunar-volman/debian/patches/02_fix-race-asking-passphrase-twice.patch (rev 0)
+++ goodies/branches/experimental/thunar-volman/debian/patches/02_fix-race-asking-passphrase-twice.patch 2010-07-26 06:09:08 UTC (rev 4180)
@@ -0,0 +1,39 @@
+diff --git a/thunar-volman/tvm-crypto-volume.c b/thunar-volman/tvm-crypto-volume.c
+index 550089e..2f595d3 100644
+--- a/thunar-volman/tvm-crypto-volume.c
++++ b/thunar-volman/tvm-crypto-volume.c
+@@ -257,6 +257,13 @@ tvm_crypto_volume_dbus_call_done (DBusPendingCall *call,
+ gtk_main_quit();
+ }
+
++static gboolean
++get_udi_again (gpointer user_data)
++{
++ gtk_main_quit();
++ return FALSE;
++}
++
+ static gchar *
+ tvm_crypto_volume_mount_install_crypto_volume (LibHalContext *context,
+ const gchar *udi,
+@@ -388,8 +395,19 @@ oom: g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_NOMEM, g_strerror (ENOMEM))
+ }
+ else
+ {
++ gint num_tries = 0;
+ dbus_message_unref (result);
+- plain_udi = libhal_volume_crypto_get_clear_volume_udi (context, volume);
++ while (plain_udi == NULL && num_tries < 3) {
++ plain_udi = libhal_volume_crypto_get_clear_volume_udi (context, volume);
++ if (plain_udi == NULL) {
++ /* asking for the plain UDI too quickly may get a NULL one. Let's try
++ * again after one second. */
++ g_timeout_add_seconds(1, get_udi_again, NULL);
++ gtk_main();
++ }
++ num_tries++;
++ g_debug("try %d, plain udi %s", num_tries, plain_udi);
++ }
+ }
+
+ out:
Added: goodies/branches/experimental/thunar-volman/debian/rules
===================================================================
--- goodies/branches/experimental/thunar-volman/debian/rules (rev 0)
+++ goodies/branches/experimental/thunar-volman/debian/rules 2010-07-26 06:09:08 UTC (rev 4180)
@@ -0,0 +1,13 @@
+#!/usr/bin/make -f
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+
+LDFLAGS +=-Wl,-z,-defs -Wl,--as-needed
+DEB_CONFIGURE_EXTRA_FLAGS := --disable-rpath
+DEB_DH_INSTALL_ARGS := --fail-missing
+
+install/thunar-volman::
+ chrpath -d -k $(CURDIR)/debian/thunar-volman/usr/bin/thunar-volman
+
+DEB_INSTALL_MANPAGES_thunar-volman := debian/thunar-volman.1
Property changes on: goodies/branches/experimental/thunar-volman/debian/rules
___________________________________________________________________
Added: svn:executable
+ *
Added: goodies/branches/experimental/thunar-volman/debian/shlibs.local
===================================================================
--- goodies/branches/experimental/thunar-volman/debian/shlibs.local (rev 0)
+++ goodies/branches/experimental/thunar-volman/debian/shlibs.local 2010-07-26 06:09:08 UTC (rev 4180)
@@ -0,0 +1,2 @@
+libexo-0.3 0 libexo-0.3-0 (>=0.3.4-8)
+libexo-hal-0.3 0 libexo-0.3-0 (>= 0.3.4-8)
Added: goodies/branches/experimental/thunar-volman/debian/thunar-volman.1
===================================================================
--- goodies/branches/experimental/thunar-volman/debian/thunar-volman.1 (rev 0)
+++ goodies/branches/experimental/thunar-volman/debian/thunar-volman.1 2010-07-26 06:09:08 UTC (rev 4180)
@@ -0,0 +1,38 @@
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36.
+.TH THUNAR-VOLMAN "1" "May 2007" "thunar-volman" "User Commands"
+.SH NAME
+thunar-volman \- controls configuration of thunar's removable media
+.SH NOTE
+Note that usually this command is invoked by thunar itself and you should
+only use this if you are having problems adding the device as per the
+documentation cited at the end of this manpage.
+.SH DESCRIPTION
+.IP
+thunar\-volman [OPTION...]
+.TP
+\fB\-a\fR, \fB\-\-device\-added\fR <udi-of-your-device>
+Manually tell thunar about a device
+.TP
+\fB\-c\fR, \fB\-\-configure\fR
+Configure management of removable drives and media
+.TP
+\fB\-v\fR, \fB\-\-version\fR
+Print version information and exit
+.TP
+\fB\-\-display\fR=\fIDISPLAY\fR
+X display to use
+.SH AUTHOR
+Written by Benedikt Meurer <benny at xfce.org>.
+.PP
+This manual page was written by Simon Huggins <huggie at earth.li> (with
+help from help2man) for the Debian project but may be used by others.
+.PP
+Please report bugs to Debian's bug tracking system. Details can be found at
+http://bugs.debian.org/
+.SH COPYRIGHT
+Copyright \(co 2004-2007
+ The Thunar development team. All rights reserved.
+.SH "SEE ALSO"
+The full documentation for
+.B thunar-volman
+is maintained in /usr/share/doc/thunar/html/C/using-removable-media.html
Added: goodies/branches/experimental/thunar-volman/debian/watch
===================================================================
--- goodies/branches/experimental/thunar-volman/debian/watch (rev 0)
+++ goodies/branches/experimental/thunar-volman/debian/watch 2010-07-26 06:09:08 UTC (rev 4180)
@@ -0,0 +1,3 @@
+version=3
+http://archive.xfce.org/src/apps/thunar-volman/([\d\.]+)/ \
+ thunar-volman-([\d\.]+)\.tar\.(?:gz|bz2)
More information about the Pkg-xfce-commits
mailing list