[SCM] ktp-filetransfer-handler packaging branch, master, updated. debian/15.12.1-2-226-g825cd93

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-filetransfer-handler.git;a=commitdiff;h=9fbc3dc

The following commit has been merged in the master branch:
commit 9fbc3dc7758637d35bc1cac7e2e6b2d10366e4cb
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Wed Jun 8 17:41:16 2011 +0200

    Update docs
---
 AUTHORS | 3 +++
 NEWS    | 9 +++++++++
 README  | 7 +------
 TODO    | 6 +++++-
 4 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 5430f37..ab37ba0 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1 +1,4 @@
 Daniele E. Domenichelli (drdanz) <daniele.domenichelli at gmail.com>
+
+Contributors:
+George Kiagiadakis (gkiagia) <george.kiagiadakis at collabora.com>
diff --git a/NEWS b/NEWS
index 2c2c9e8..dc53df1 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,12 @@
+telepathy-kde file-transfer-handler (2011-06-08) UNRELEASED
+===========================================================
+
+ * Add --debug and --persist command line options (drdanz)
+ * Exit after 2 seconds if no channels are received (drdanz)
+ * Show an overwrite/rename dialog on incoming file transfers if the file
+   already exists. (drdanz)
+ * Don't stop the jobs before the file transfer has actually finished (gkiagia)
+
 telepathy-kde file-transfer-handler (2011-06-06) UNRELEASED
 ===========================================================
 
diff --git a/README b/README
index ad24a9a..22aa163 100644
--- a/README
+++ b/README
@@ -13,12 +13,7 @@ To compile it you will need at least Telepathy-Qt4 >= 0.7.1 or the latest
 git version.
 
 
-
-WARNING: At the moment it will overwrite any file in the $HOME/Download
-         directory which has the same name as the file that you are receiving,
-         so please ensure that you don't have any valuable file there.
-
-You can modify the download directory by adding in your
+You can modify the default download directory by adding in your
 .kde/share/config/ktelepathyrc file in the section [File Transfers] the
 variable downloadDirectory
 
diff --git a/TODO b/TODO
index 4aaab23..e119f5e 100644
--- a/TODO
+++ b/TODO
@@ -2,9 +2,13 @@ General:
  * Use Nepomuk describeResource and storeResource to send somehow an additional
    trig or rdf file.
  * Stop transfer button.
+ * Investigate why sometimes the job cannot be removed from the system tray
+ * Investigate why sometimes the file transfer handler exits when transfer ends
+ * Close channels when transfer ends
+ * Show advancement in the job ui
 
 Incoming file transfers
- * Show a dialog (overwrite/rename/resume) if file exists.
+ * save as file.part and rename at the end + resume support
  * Configuration of the download directory from some ui.
  * File transfer support in the approver.
 

-- 
ktp-filetransfer-handler packaging