[tryton-debian-vcs] tryton-client branch debian updated. debian/4.0.6-1-6-g6b380e4

[Mathias Behrle]

The following commit has been merged in the debian branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-client.git;a=commitdiff;h=debian/4.0.6-1-6-g6b380e4
  discards  324cb03478daaea48a8f5c654051fe9621769ffc (commit)
  discards  da4caac69b6f3051f984ba9a277722fa5ee9679b (commit)
  discards  c212ed606295870be47b4e0b07e3fe4a33b9198d (commit)
  discards  f206fb71ab068d3ca8cd7314e050ade94d14bc9c (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (324cb03478daaea48a8f5c654051fe9621769ffc)
            \
             N -- N -- N (6b380e42e80fcb699a5e4241cd15b9c3754ba1ee)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

commit 6b380e42e80fcb699a5e4241cd15b9c3754ba1ee
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Dec 7 11:03:04 2016 +0100

    Releasing debian version 4.2.0-1.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/debian/changelog b/debian/changelog
index 493cbaa..9f9c287 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+tryton-client (4.2.0-1) unstable; urgency=medium
+
+  * Merging upstream version 4.2.0.
+  * Updating the Depends for 4.2.
+  * Refreshing patches.
+  * Updating the man page for 4.2.
+  * Improve README.Debian for the fingerprint handling.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Mon, 05 Dec 2016 19:50:38 +0100
+
 tryton-client (4.0.6-1) unstable; urgency=medium
 
   * Merging upstream version 4.0.6.
commit a9a3b691a85f978774574a22d2de7c848094ffdc
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon Dec 5 10:46:53 2016 +0100

    Improve README.Debian for the fingerprint handling.

diff --git a/debian/tryton-client.README.Debian b/debian/tryton-client.README.Debian
index c20bb2b..5a69685 100644
--- a/debian/tryton-client.README.Debian
+++ b/debian/tryton-client.README.Debian
@@ -7,7 +7,8 @@ major version (e.g. the first two numbers of the version string).
 Note: The Tryton client checks and records the SSL fingerprint of each
 server. If the server changes from unsecure to secure or vice versa,
 or if the server certificate changes, the client will refuse to connect
-to the server. In this case the according line in the file
-~/.config/tryton/<version>/known_hosts must be deleted.
+to the server. If the fingerprint change is on purpose the according line
+in the file ~/.config/tryton/<version>/known_hosts must be deleted to
+re-enable the client connection.
 
- -- Mathias Behrle <mathiasb at m9s.biz>  Sat, 24 Apr 2014 12:00:00 +0200
+ -- Mathias Behrle <mbehrle at debian.org>  Mon, 05 Dec 2016 12:00:00 +0100
commit f15b92e51f6b4767352f8496ef30a5052807f21b
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon Dec 5 10:22:12 2016 +0100

    Updating the man page for 4.2.

diff --git a/debian/manpages/tryton.1 b/debian/manpages/tryton.1
index 8d406a8..6bc1306 100644
--- a/debian/manpages/tryton.1
+++ b/debian/manpages/tryton.1
@@ -1,4 +1,4 @@
-.TH TRYTON 1 "2016\-05\-30" "4.0" "Tryton Application Platform"
+.TH TRYTON 1 "2016\-12\-05" "4.2" "Tryton Application Platform"
 .SH NAME
 tryton \- Tryton Application Platform (Client)
 .SH SYNOPSIS
commit f65a33f2a3f2178b73d17a26f28c7e1db4a1e796
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon Dec 5 10:20:13 2016 +0100

    Refreshing patches.

diff --git a/debian/patches/01-desktop-icon.patch b/debian/patches/01-desktop-icon.patch
index 02d8fe8..5c2692b 100644
--- a/debian/patches/01-desktop-icon.patch
+++ b/debian/patches/01-desktop-icon.patch
@@ -1,8 +1,8 @@
 Author: Daniel Baumann <daniel at debian.org>
 Description: Adjust name of the icon to be used for the desktop file.
 
---- tryton-client.orig/tryton.desktop	2015-04-23 18:52:03.324762381 +0200
-+++ tryton-client/tryton.desktop	2015-04-23 18:52:03.324762381 +0200
+--- tryton-client.orig/tryton.desktop	2016-12-05 10:19:17.468168421 +0100
++++ tryton-client/tryton.desktop	2016-12-05 10:19:17.468168421 +0100
 @@ -24,7 +24,7 @@
  Comment[sl]=Dostop do Tryton strežnika
  Keywords=Business;Management;Enterprise;ERP;Framework;Client;
@@ -10,5 +10,5 @@ Description: Adjust name of the icon to be used for the desktop file.
 -Icon=tryton-icon
 +Icon=tryton-client
  Terminal=false
- MimeType=application/tryton
+ MimeType=application/tryton;
  Categories=Office;Finance;
diff --git a/debian/patches/02-icon-search-path.patch b/debian/patches/02-icon-search-path.patch
index da8f951..8d56a61 100644
--- a/debian/patches/02-icon-search-path.patch
+++ b/debian/patches/02-icon-search-path.patch
@@ -1,11 +1,11 @@
 Author: Daniel Baumann <daniel at debian.org>, Mathias Behrle <mathiasb at m9s.biz>
 Description: Adjust icon search path to policy conforming place.
 
---- tryton-client.orig/tryton/config.py	2016-09-06 14:29:10.642680333 +0200
-+++ tryton-client/tryton/config.py	2016-09-06 14:29:10.642680333 +0200
-@@ -175,7 +175,7 @@
-     if os.path.isdir(resources):
-         CURRENT_DIR = resources
+--- tryton-client.orig/tryton/config.py	2016-12-05 19:48:48.282674441 +0100
++++ tryton-client/tryton/config.py	2016-12-05 19:48:48.282674441 +0100
+@@ -170,7 +170,7 @@
+     CURRENT_DIR = os.path.dirname(unicode(sys.executable,
+         sys.getfilesystemencoding()))
  
 -PIXMAPS_DIR = os.path.join(CURRENT_DIR, 'data', 'pixmaps', 'tryton')
 +PIXMAPS_DIR = os.path.join(sys.prefix, 'share', 'icons', 'tryton')
-- 
tryton-client