--- thunar-volman-0.3.80.orig/debian/control +++ thunar-volman-0.3.80/debian/control @@ -0,0 +1,23 @@ +Source: thunar-volman +Section: xfce +Priority: optional +Maintainer: Xubuntu Developers +XSBC-Original-Maintainer: Debian Xfce Maintainers +Uploaders: Yves-Alexis Perez , Emanuele Rocca , Simon Huggins +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.1 +Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/thunar-volman/ +Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/goodies/thunar-volman/ + +Package: thunar-volman +Section: xfce +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, thunar, exo-utils +Conflicts: thunar-volman-plugin +Replaces: thunar-volman-plugin +Provides: thunar-volman-plugin +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. --- thunar-volman-0.3.80.orig/debian/shlibs.local +++ thunar-volman-0.3.80/debian/shlibs.local @@ -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) --- thunar-volman-0.3.80.orig/debian/compat +++ thunar-volman-0.3.80/debian/compat @@ -0,0 +1 @@ +7 --- thunar-volman-0.3.80.orig/debian/rules +++ thunar-volman-0.3.80/debian/rules @@ -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 --- thunar-volman-0.3.80.orig/debian/thunar-volman.1 +++ thunar-volman-0.3.80/debian/thunar-volman.1 @@ -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 +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 . +.PP +This manual page was written by Simon Huggins (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 --- thunar-volman-0.3.80.orig/debian/changelog +++ thunar-volman-0.3.80/debian/changelog @@ -0,0 +1,170 @@ +thunar-volman (0.3.80-2ubuntu1) karmic; urgency=low + + * Merge from Debian unstable, remaining Ubuntu changes: + - debian/control: conflicts, replaces and provides thunar-volman-plugin. + + -- Lionel Le Folgoc Sun, 17 May 2009 21:51:13 +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 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 Sun, 01 Mar 2009 00:30:58 +0100 + +thunar-volman (0.3.80-0ubuntu1) jaunty; urgency=low + + * Merge from Debian pkg-xfce UNRELEASED (r2564). Remaining Ubuntu changes: + - debian/control: conflicts, replaces and provides thunar-volman-plugin. + * Bugs fixed by this new release: + - "Add support for encrypted drives in thunar-volman by upgrading to 0.3.80" + (LP: #275328) + + -- Lionel Le Folgoc Fri, 30 Jan 2009 20:30:03 +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 Wed, 13 Aug 2008 23:13:00 +0200 + +thunar-volman (0.2.0-2ubuntu2) hardy; urgency=low + + * debian/rules: + - drop xfce.mk and keep debian's rules file instead + - do not install the .desktop file which only creates dups of the settings + manager items + - delete empty usr/share/applications to make lintian happy. + + -- Lionel Le Folgoc Wed, 27 Feb 2008 23:27:52 +0100 + +thunar-volman (0.2.0-2ubuntu1) hardy; urgency=low + + * Merge from Debian unstable, remaining Ubuntu changes: + - switch to our xfce.mk class + - modify Maintainer value to match the DebianMaintainerField specification + - drop chrpath build-dependency and rule + - conflicts, replaces and provides thunar-volman-plugin + - debian/compat: bump to 5 + - debian/control: bump debhelper b-d to (>= 5) and add autotools-dev. + * debian/control: do not depend on exo-utils. + + -- Lionel Le Folgoc Thu, 07 Feb 2008 20:04:51 +0100 + +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 Mon, 28 Jan 2008 11:24:24 +0000 + +thunar-volman (0.2.0-1ubuntu1) hardy; urgency=low + + * Merge from Debian unstable, remaining Ubuntu changes: + - switch to our xfce.mk class + - modify Maintainer value to match the DebianMaintainerField specification + - drop chrpath build-dependency and rule + - conflicts, replaces and provides thunar-volman-plugin + * debian/patches: + - 01_thunar-volman-mount-only-mountable.patch, 03_fix-dvd-autoplay.patch: + dropped, included upstream + - 02_use_gnome_mount.patch: dropped. + * debian/compat: bump to 5. + * debian/control: bump debhelper b-d to (>= 5) and add autotools-dev. + + -- Lionel Le Folgoc Sat, 08 Dec 2007 17:10:53 +0100 + +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 Wed, 05 Dec 2007 22:37:50 +0100 + +thunar-volman (0.1.2-1ubuntu4) hardy; urgency=low + + * debian/patches/03_fix-dvd-autoplay.patch: Properly ignore case looking + for VCD, VIDEO_TS and DCIM folders (patch from upstream svn, r3318). + (LP: #151028 and Xfce #3038) + + -- Lionel Le Folgoc Tue, 23 Oct 2007 23:56:07 +0200 + +thunar-volman (0.1.2-1ubuntu3) gutsy; urgency=low + + * debian/patches/02_use_gnome_mount.patch: use gnome-mount instead of + exo-mount (patch taken from thunar-volman-plugin which is going to be + removed from the archive). + * debian/control: + - depends on gnome-mount + - conflicts, replaces and provides thunar-volman-plugin. + + -- Lionel Le Folgoc Fri, 14 Sep 2007 10:34:41 +0200 + +thunar-volman (0.1.2-1ubuntu2) gutsy; urgency=low + + * Rebuild against latest libthunar-vfs (fixes FTBFS). + + -- Lionel Le Folgoc Sat, 18 Aug 2007 15:32:46 +0200 + +thunar-volman (0.1.2-1ubuntu1) gutsy; urgency=low + + * debian/patches/01_thunar-volman-mount-only-mountable.patch: prevents some + removable devices from showing up as two devices instead of one + (Xfce #2789). (LP: #102893) + * Drop chrpath build-dependency and rule. + * Switch to our xfce.mk class. + * Modify Maintainer value to match the DebianMaintainerField specification. + + -- Lionel Le Folgoc Sat, 11 Aug 2007 12:01:15 +0200 + +thunar-volman (0.1.2-1) unstable; urgency=low + + * Initial release closes: #407874 + + -- Yves-Alexis Perez Wed, 02 May 2007 17:01:16 +0100 --- thunar-volman-0.3.80.orig/debian/copyright +++ thunar-volman-0.3.80/debian/copyright @@ -0,0 +1,47 @@ +This package was debianized by Yves-Alexis Perez 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 + +thunar-volman/tvm-crypto-volume.{c,h}: + © 2008 Colin Leroy + © 2008 Benedikt Meurer + +Portions of the code are based on code from gnome-volume-manager, written by +Robert Love and Jeffrey Stedfast for GNOME. + +Licenses: + +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'. + --- thunar-volman-0.3.80.orig/debian/patches/01_display-volume-info-for-crypto-layer.patch +++ thunar-volman-0.3.80/debian/patches/01_display-volume-info-for-crypto-layer.patch @@ -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(_("Mounting encrypted volume...")); ++ text = g_strdup_printf(_("Mounting %s..."), 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(_("" ++ "Wrong password.")) ++ : g_strdup_printf(_("" ++ "Volume %s is encrypted."), 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? _("Wrong password.") +- :_("This volume is encrypted."), +- _("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;