summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTails developers <amnesia@boum.org>2012-10-02 22:22:49 +0200
committerTails developers <amnesia@boum.org>2012-10-02 22:22:49 +0200
commitdbd977a33be187d9b62f64e16546d5b6f30ca3cf (patch)
treec45dc7091ab67256e801ae53966cb2f8cf0927be
parent610dec83fc9d6844813fd66e9513e4e269bda2d1 (diff)
Update version to 1.6.11.6.1
-rw-r--r--ChangeLog15
-rw-r--r--data/whisperback.desktop2
-rw-r--r--debian/changelog6
-rw-r--r--doc/whisperback.t2t2
-rwxr-xr-xsetup.py2
-rw-r--r--whisperBack/gui.py2
6 files changed, 25 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index b61370e..91f55b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -323,3 +323,18 @@ Minor imporvements
------------------
* I18n: import Czech translation
+
+1.6.1
+=====
+
+Minor improvements
+------------------
+
+ * Raise the socket library timeout to 120 seconds
+ * Use smtplib's timeout parameter
+
+Bugfixes
+--------
+
+ * Fix error output when calling send a 2nd time
+
diff --git a/data/whisperback.desktop b/data/whisperback.desktop
index b2bab43..60cfb5b 100644
--- a/data/whisperback.desktop
+++ b/data/whisperback.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-Version=1.6
+Version=1.6.1
Name=WhisperBack
Comment=Send feedback via encrypted e-mail
Type=Application
diff --git a/debian/changelog b/debian/changelog
index 1a8f7c5..697df67 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+whisperback (1.6.1) unstable; urgency=low
+
+ * new upstream release
+
+ -- Tails developpers <tails@boum.org> Tue, 02 Oct 2012 19:43:45 +0200
+
whisperback (1.6) unstable; urgency=low
* new upstream release
diff --git a/doc/whisperback.t2t b/doc/whisperback.t2t
index a3fef67..ae160f6 100644
--- a/doc/whisperback.t2t
+++ b/doc/whisperback.t2t
@@ -1,6 +1,6 @@
WhisperBack
Send feedback via encrypted e-mail
-1.6
+1.6.1
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% WhisperBack - Send feedback in an encrypted mail
diff --git a/setup.py b/setup.py
index ec243cd..ada201c 100755
--- a/setup.py
+++ b/setup.py
@@ -58,7 +58,7 @@ build_extra.build_extra.sub_commands.insert(0, ("build_gtkbuilderi18n", None))
build_extra.build_extra.sub_commands.append(("build_man", None))
setup(name='whisperback',
- version='1.6',
+ version='1.6.1',
description='Send feedback in an encrypted mail',
author='Tails developers',
author_email='tails@boum.org',
diff --git a/whisperBack/gui.py b/whisperBack/gui.py
index fc4baa7..aa7da5d 100644
--- a/whisperBack/gui.py
+++ b/whisperBack/gui.py
@@ -27,7 +27,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
"""
########################################################################
-__version__ = '1.6'
+__version__ = '1.6.1'
LOCALEDIR = "locale/"
PACKAGE = "whisperback"