[Pkg-xfce-commits] r4181 - in goodies/branches/experimental/thunar-volman/debian: . patches source
Lionel Le Folgoc
mrpouit-guest at alioth.debian.org
Mon Jul 26 05:21:51 UTC 2010
Author: mrpouit-guest
Date: 2010-07-26 17:21:41 +0000 (Mon, 26 Jul 2010)
New Revision: 4181
Added:
goodies/branches/experimental/thunar-volman/debian/manpages
goodies/branches/experimental/thunar-volman/debian/source/
goodies/branches/experimental/thunar-volman/debian/source/format
Removed:
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/shlibs.local
Modified:
goodies/branches/experimental/thunar-volman/debian/changelog
goodies/branches/experimental/thunar-volman/debian/control
goodies/branches/experimental/thunar-volman/debian/rules
Log:
* New upstream development release.
* debian/control:
- switch to dh 7, >= 7.0.50~ to support overrides
- refreshed (build-)deps for this new hal-less version
- bump Standards-Version to 3.9.0
- add myself to uploaders.
* debian/manpages: install debian/thunar-volman.1.
* debian/patches:
- 01_display-volume-info-for-crypto-layer.patch,
02_fix-race-asking-passphrase-twice.patch: dropped, obsolete.
* debian/rules: switch to dh + overrides.
* debian/shlibs.local: dropped, not needed.
* debian/source/format: switch to 3.0 (quilt).
Modified: goodies/branches/experimental/thunar-volman/debian/changelog
===================================================================
--- goodies/branches/experimental/thunar-volman/debian/changelog 2010-07-26 06:09:08 UTC (rev 4180)
+++ goodies/branches/experimental/thunar-volman/debian/changelog 2010-07-26 17:21:41 UTC (rev 4181)
@@ -1,7 +1,19 @@
-thunar-volman (0.5.0-1) UNRELEASED; urgency=low
+thunar-volman (0.5.1-1) UNRELEASED; urgency=low
- * debian/control: add myself to uploaders.
+ * New upstream development release.
+ * debian/control:
+ - switch to dh 7, >= 7.0.50~ to support overrides
+ - refreshed (build-)deps for this new hal-less version
+ - bump Standards-Version to 3.9.0
+ - add myself to uploaders.
* debian/copyright: refreshed.
+ * debian/manpages: install debian/thunar-volman.1.
+ * debian/patches:
+ - 01_display-volume-info-for-crypto-layer.patch,
+ 02_fix-race-asking-passphrase-twice.patch: dropped, obsolete.
+ * debian/rules: switch to dh + overrides.
+ * debian/shlibs.local: dropped, not needed.
+ * debian/source/format: switch to 3.0 (quilt).
-- Lionel Le Folgoc <mrpouit at gmail.com> Mon, 26 Jul 2010 08:07:01 +0200
Modified: goodies/branches/experimental/thunar-volman/debian/control
===================================================================
--- goodies/branches/experimental/thunar-volman/debian/control 2010-07-26 06:09:08 UTC (rev 4180)
+++ goodies/branches/experimental/thunar-volman/debian/control 2010-07-26 17:21:41 UTC (rev 4181)
@@ -4,17 +4,17 @@
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
+Build-Depends: debhelper (>= 7.0.50~), libexo-1-dev (>= 0.5.0),
+ libgudev-1.0-dev (>= 145), libxfce4ui-1-dev (>= 4.7.0), libxfconf-0-dev (>= 4.7.0),
+ libnotify-dev, chrpath, libxml-parser-perl
+Standards-Version: 3.9.0
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
+Depends: ${shlibs:Depends}, ${misc:Depends}, thunar, exo-utils
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/manpages
===================================================================
--- goodies/branches/experimental/thunar-volman/debian/manpages (rev 0)
+++ goodies/branches/experimental/thunar-volman/debian/manpages 2010-07-26 17:21:41 UTC (rev 4181)
@@ -0,0 +1 @@
+debian/thunar-volman.1
Deleted: 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 2010-07-26 06:09:08 UTC (rev 4180)
+++ goodies/branches/experimental/thunar-volman/debian/patches/01_display-volume-info-for-crypto-layer.patch 2010-07-26 17:21:41 UTC (rev 4181)
@@ -1,76 +0,0 @@
-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;
Deleted: 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 2010-07-26 06:09:08 UTC (rev 4180)
+++ goodies/branches/experimental/thunar-volman/debian/patches/02_fix-race-asking-passphrase-twice.patch 2010-07-26 17:21:41 UTC (rev 4181)
@@ -1,39 +0,0 @@
-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:
Modified: goodies/branches/experimental/thunar-volman/debian/rules
===================================================================
--- goodies/branches/experimental/thunar-volman/debian/rules 2010-07-26 06:09:08 UTC (rev 4180)
+++ goodies/branches/experimental/thunar-volman/debian/rules 2010-07-26 17:21:41 UTC (rev 4181)
@@ -1,13 +1,18 @@
#!/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
+LDFLAGS+=-Wl,-z,defs -Wl,--as-needed
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -O0
+else
+ CFLAGS += -O2
+endif
-install/thunar-volman::
+%:
+ dh $@
+
+override_dh_auto_configure:
+ dh_auto_configure -- --disable-rpath
+
+override_dh_install:
chrpath -d -k $(CURDIR)/debian/thunar-volman/usr/bin/thunar-volman
-
-DEB_INSTALL_MANPAGES_thunar-volman := debian/thunar-volman.1
+ dh_install --fail-missing
Deleted: goodies/branches/experimental/thunar-volman/debian/shlibs.local
===================================================================
--- goodies/branches/experimental/thunar-volman/debian/shlibs.local 2010-07-26 06:09:08 UTC (rev 4180)
+++ goodies/branches/experimental/thunar-volman/debian/shlibs.local 2010-07-26 17:21:41 UTC (rev 4181)
@@ -1,2 +0,0 @@
-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/source/format
===================================================================
--- goodies/branches/experimental/thunar-volman/debian/source/format (rev 0)
+++ goodies/branches/experimental/thunar-volman/debian/source/format 2010-07-26 17:21:41 UTC (rev 4181)
@@ -0,0 +1 @@
+3.0 (quilt)
More information about the Pkg-xfce-commits
mailing list