[Pkg-xfce-commits] r5246 - in goodies/trunk/thunar-volman: . debian debian/patches

Yves-Alexis Perez corsac at alioth.debian.org
Sat Apr 2 02:44:36 UTC 2011


Author: corsac
Date: 2011-04-02 14:44:32 +0000 (Sat, 02 Apr 2011)
New Revision: 5246

Added:
   goodies/trunk/thunar-volman/debian/manpages
   goodies/trunk/thunar-volman/debian/source/
   goodies/trunk/thunar-volman/debian/thunar-volman.xml
Removed:
   goodies/trunk/thunar-volman/debian/patches/01_display-volume-info-for-crypto-layer.patch
   goodies/trunk/thunar-volman/debian/patches/02_fix-race-asking-passphrase-twice.patch
   goodies/trunk/thunar-volman/debian/shlibs.local
   goodies/trunk/thunar-volman/debian/volmanrc
Modified:
   goodies/trunk/thunar-volman/
   goodies/trunk/thunar-volman/debian/
   goodies/trunk/thunar-volman/debian/changelog
   goodies/trunk/thunar-volman/debian/control
   goodies/trunk/thunar-volman/debian/copyright
   goodies/trunk/thunar-volman/debian/rules
Log:
merge experimental branch to trunk



Property changes on: goodies/trunk/thunar-volman
___________________________________________________________________
Added: svn:mergeinfo
   + /goodies/branches/experimental/thunar-volman:4181-5245


Property changes on: goodies/trunk/thunar-volman/debian
___________________________________________________________________
Added: mergeWithUpstream
   + 1

Modified: goodies/trunk/thunar-volman/debian/changelog
===================================================================
--- goodies/trunk/thunar-volman/debian/changelog	2011-04-02 14:33:13 UTC (rev 5245)
+++ goodies/trunk/thunar-volman/debian/changelog	2011-04-02 14:44:32 UTC (rev 5246)
@@ -1,14 +1,43 @@
-thunar-volman (0.3.80-5) unstable; urgency=low
+thunar-volman (0.6.0-2) experimental; urgency=low
 
-  * debian/volmanrc:
-    - disable autorun/automount/autobrowse by default.
-  * debian/rules:
-    - install volmanrc to /etc/xdg/Thunar.
   * debian/control:
-    - update standards version to 3.9.1.
+    - add build-dep on libxfce4util 4.8.0.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Sat, 19 Feb 2011 19:20:01 +0100
+ -- Yves-Alexis Perez <corsac at debian.org>  Mon, 07 Mar 2011 08:07:58 +0100
 
+thunar-volman (0.6.0-1) experimental; urgency=low
+
+  [ Lionel Le Folgoc ]
+  * New upstream release.
+    - don't use hal anymore.                                    closes: #615195
+  * 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.1
+    - add myself to uploaders
+    - set minimal thunar dependency to 1.1.1
+    - add home page.
+  * 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).
+
+  [ Yves-Alexis Perez ]
+  * debian/control:
+    - add build-dep on intltool.
+  * debian/rules:
+    - install a thunar-volman.xml config file to disabled automount, autorun
+      and autobrowse by default.
+    - pick {C,LD}FLAGS from dpkg-buildflags.
+    - add -W1, z,defs and --as-needed to LDFLAGS.
+    - add hardening flags to {C,LD}FLAGS.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 27 Feb 2011 01:25:10 +0100
+
 thunar-volman (0.3.80-4) unstable; urgency=low
 
   [ Stefan Ott ]

Modified: goodies/trunk/thunar-volman/debian/control
===================================================================
--- goodies/trunk/thunar-volman/debian/control	2011-04-02 14:33:13 UTC (rev 5245)
+++ goodies/trunk/thunar-volman/debian/control	2011-04-02 14:44:32 UTC (rev 5246)
@@ -2,18 +2,21 @@
 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>
-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 
+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.0.50~), libexo-1-dev (>= 0.6.0),
+ libgudev-1.0-dev (>= 145), libxfce4util-dev (>= 4.8.0), 
+ libxfce4ui-1-dev (>= 4.8.0), libxfconf-0-dev (>= 4.8.0), libnotify-dev, 
+ chrpath, libxml-parser-perl, intltool, hardening-includes
 Standards-Version: 3.9.1
 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/
+Homepage: http://goodies.xfce.org/projects/thunar-plugins/thunar-volman
 
 Package: thunar-volman
 Section: xfce
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, thunar, exo-utils, hal
+Depends: ${shlibs:Depends}, ${misc:Depends}, thunar (>= 1.1.1), exo-utils
 Description: Thunar extension for volumes management
- The Thunar Volume Manager is an extension for the Thunar file manager, which 
+ The Thunar Volume Manager is an extension for the Thunar file manager, which
  enables automatic management of removable drives and media.

Modified: goodies/trunk/thunar-volman/debian/copyright
===================================================================
--- goodies/trunk/thunar-volman/debian/copyright	2011-04-02 14:33:13 UTC (rev 5245)
+++ goodies/trunk/thunar-volman/debian/copyright	2011-04-02 14:44:32 UTC (rev 5246)
@@ -4,44 +4,28 @@
 It was downloaded from
 http://foo-projects.org/~benny/projects/thunar-volman/index.html
 
-Copyright Holders: 
+Copyright Holders:
 © 2004-2007 The Thunar development team.
 © 2005-2008 Benedikt Meurer <benny at xfce.org>
+© 2010 Jannis Pohlmann <jannis at xfce.org>
 
-thunar-volman/tvm-crypto-volume.{c,h}:
-  © 2008 Colin Leroy <colin at colinot.net>
-  © 2008 Benedikt Meurer <benny 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.
 
-Licenses:
+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
 
-xfce-heading.{c,h}
-xfce-titled-dialog.{c,h}
-are licensed under the GNU Library General Public License
-
-main.c
-tvm-block-device.{c,h}
-tvm-camera-device.{c,h}
-tvm-command-entry.{c,h}
-tvm-device.{c,h}
-tvm-input-device.{c,h}
-tvm-pango-extensions.{c,h}
-tvm-pda-device.{c,h}
-tvm-preferences.{c,h}
-tvm-preferences-dialog.{c,h}
-tvm-printer-device.{c,h}
-tvm-prompt.{c,h}
-tvm-run.{c,h}
-tvm-crypto-volume.{c,h}
-
-are licensed under the GNU General Public License version 2 or later.
-
-The build system is  licensed under the GNU General Public License (version 2 or later).
-
-On Debian systems, the complete text of the GNU General Public License 
-can be found in `/usr/share/common-licenses/GPL' and the complete text of the
-GNU Library General Public license can be found in 
-`/usr/share/common-licenses/LGPL'.
-
+On Debian systems, the complete text of the GNU General Public License
+can be found in `/usr/share/common-licenses/GPL-2'.

Copied: goodies/trunk/thunar-volman/debian/manpages (from rev 5245, goodies/branches/experimental/thunar-volman/debian/manpages)
===================================================================
--- goodies/trunk/thunar-volman/debian/manpages	                        (rev 0)
+++ goodies/trunk/thunar-volman/debian/manpages	2011-04-02 14:44:32 UTC (rev 5246)
@@ -0,0 +1 @@
+debian/thunar-volman.1

Deleted: goodies/trunk/thunar-volman/debian/patches/01_display-volume-info-for-crypto-layer.patch
===================================================================
--- goodies/trunk/thunar-volman/debian/patches/01_display-volume-info-for-crypto-layer.patch	2011-04-02 14:33:13 UTC (rev 5245)
+++ goodies/trunk/thunar-volman/debian/patches/01_display-volume-info-for-crypto-layer.patch	2011-04-02 14:44:32 UTC (rev 5246)
@@ -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/trunk/thunar-volman/debian/patches/02_fix-race-asking-passphrase-twice.patch
===================================================================
--- goodies/trunk/thunar-volman/debian/patches/02_fix-race-asking-passphrase-twice.patch	2011-04-02 14:33:13 UTC (rev 5245)
+++ goodies/trunk/thunar-volman/debian/patches/02_fix-race-asking-passphrase-twice.patch	2011-04-02 14:44:32 UTC (rev 5246)
@@ -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/trunk/thunar-volman/debian/rules
===================================================================
--- goodies/trunk/thunar-volman/debian/rules	2011-04-02 14:33:13 UTC (rev 5245)
+++ goodies/trunk/thunar-volman/debian/rules	2011-04-02 14:44:32 UTC (rev 5246)
@@ -1,14 +1,21 @@
 #!/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
+include /usr/share/hardening-includes/hardening.make
 
-install/thunar-volman::
+LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
+CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
+LDFLAGS+=$(HARDENING_LDFLAGS) -Wl,-z,defs -Wl,--as-needed -Wl,-O1
+CFLAGS+=$(HARDENING_CFLAGS)
+
+export CFLAGS LDFLAGS
+
+%:
+	dh $@
+
+override_dh_auto_configure:
+	dh_auto_configure -- --disable-rpath
+
+override_dh_install:
 	chrpath -d -k $(CURDIR)/debian/thunar-volman/usr/bin/thunar-volman
-	dh_install debian/volmanrc /etc/xdg/Thunar/
-
-DEB_INSTALL_MANPAGES_thunar-volman := debian/thunar-volman.1
+	dh_install --fail-missing
+	dh_install debian/thunar-volman.xml /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/

Deleted: goodies/trunk/thunar-volman/debian/shlibs.local
===================================================================
--- goodies/trunk/thunar-volman/debian/shlibs.local	2011-04-02 14:33:13 UTC (rev 5245)
+++ goodies/trunk/thunar-volman/debian/shlibs.local	2011-04-02 14:44:32 UTC (rev 5246)
@@ -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)

Copied: goodies/trunk/thunar-volman/debian/thunar-volman.xml (from rev 5245, goodies/branches/experimental/thunar-volman/debian/thunar-volman.xml)
===================================================================
--- goodies/trunk/thunar-volman/debian/thunar-volman.xml	                        (rev 0)
+++ goodies/trunk/thunar-volman/debian/thunar-volman.xml	2011-04-02 14:44:32 UTC (rev 5246)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<channel name="thunar-volman" version="1.0">
+  <property name="automount-media" type="empty">
+    <property name="enabled" type="bool" value="false"/>
+  </property>
+  <property name="automount-drives" type="empty">
+    <property name="enabled" type="bool" value="false"/>
+  </property>
+  <property name="autobrowse" type="empty">
+    <property name="enabled" type="bool" value="false"/>
+  </property>
+  <property name="autoopen" type="empty">
+    <property name="enabled" type="bool" value="false"/>
+  </property>
+</channel>

Deleted: goodies/trunk/thunar-volman/debian/volmanrc
===================================================================
--- goodies/trunk/thunar-volman/debian/volmanrc	2011-04-02 14:33:13 UTC (rev 5245)
+++ goodies/trunk/thunar-volman/debian/volmanrc	2011-04-02 14:44:32 UTC (rev 5246)
@@ -1,5 +0,0 @@
-[Configuration]
-AutomountDrives=FALSE
-AutomountMedia=FALSE
-Autorun=FALSE
-Autoopen=FALSE




More information about the Pkg-xfce-commits mailing list