[tryton-debian-vcs] tryton-client branch debian updated. debian/4.0.4-1-2-gcdb6242

[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.4-1-2-gcdb6242

commit cdb624235eb96f9564d16de63d925a9ee2beca45
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Sep 6 14:37:43 2016 +0200

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

diff --git a/debian/changelog b/debian/changelog
index 8f6555d..e855cf2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-client (4.0.4-2) unstable; urgency=medium
+
+  * Refreshing 02-icon-search-path.patch.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Tue, 06 Sep 2016 14:37:23 +0200
+
 tryton-client (4.0.4-1) unstable; urgency=medium
 
   * Merging upstream version 4.0.4.
commit 62375b2bcae4c341e15a2f1057c8e39ee05eee6b
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Sep 6 14:37:08 2016 +0200

    Refreshing 02-icon-search-path.patch.

diff --git a/debian/patches/02-icon-search-path.patch b/debian/patches/02-icon-search-path.patch
index 52fd912..da8f951 100644
--- a/debian/patches/02-icon-search-path.patch
+++ b/debian/patches/02-icon-search-path.patch
@@ -1,14 +1,14 @@
 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	2015-11-12 18:17:09.505027905 +0100
-+++ tryton-client/tryton/config.py	2015-11-12 18:17:38.196780570 +0100
-@@ -176,7 +176,7 @@
+--- 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
  
 -PIXMAPS_DIR = os.path.join(CURRENT_DIR, 'data', 'pixmaps', 'tryton')
 +PIXMAPS_DIR = os.path.join(sys.prefix, 'share', 'icons', 'tryton')
  if not os.path.isdir(PIXMAPS_DIR):
-     PIXMAPS_DIR = pkg_resources.resource_filename(
-         'tryton', 'data/pixmaps/tryton')
+     # do not import when frozen
+     import pkg_resources
-- 
tryton-client