[tryton-debian-vcs] tryton-client branch debian updated. debian/3.0.3-1-5-g5f0730b

[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/3.0.3-1-5-g5f0730b

commit 5f0730b3429ec17c160e91e2b788f676e704a7d2
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu Apr 24 12:57:00 2014 +0200

    Updating manpage.

diff --git a/debian/manpages/tryton.1 b/debian/manpages/tryton.1
index 532b6bf..9d70521 100644
--- a/debian/manpages/tryton.1
+++ b/debian/manpages/tryton.1
@@ -1,4 +1,4 @@
-.TH TRYTON 1 "2013\-11\-24" "3.0" "Tryton Application Platform"
+.TH TRYTON 1 "2014\-04\-24" "3.2" "Tryton Application Platform"
 
 .SH NAME
 tryton \- Tryton Application Platform (Client)
commit 65014a3aa25f9e4ee7dca28e7c0ee58c548d331b
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu Apr 24 12:52:40 2014 +0200

    Adapting and refreshing patches.

diff --git a/debian/patches/01-desktop-icon.patch b/debian/patches/01-desktop-icon.patch
index 80b6487..d0957b7 100644
--- a/debian/patches/01-desktop-icon.patch
+++ b/debian/patches/01-desktop-icon.patch
@@ -1,13 +1,14 @@
 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	2013-11-24 18:14:07.592229707 +0100
-+++ tryton-client/tryton.desktop	2013-11-24 18:14:07.532231789 +0100
-@@ -22,6 +22,6 @@
+--- tryton-client.orig/tryton.desktop	2014-04-24 12:39:48.801927175 +0200
++++ tryton-client/tryton.desktop	2014-04-24 12:41:47.981807040 +0200
+@@ -22,7 +22,7 @@
  Comment[sl]=Dostop do Tryton strežnika
  Keywords=Business;Management;Enterprise;ERP;Framework;Client;
- Exec=tryton
+ Exec=tryton %u
 -Icon=tryton-icon
 +Icon=tryton-client
  Terminal=false
+ MimeType=application/tryton
  Categories=Office;Finance;
diff --git a/debian/patches/02-icon-directory.patch b/debian/patches/02-icon-directory.patch
index 034e39c..c03c8bd 100644
--- a/debian/patches/02-icon-directory.patch
+++ b/debian/patches/02-icon-directory.patch
@@ -1,8 +1,8 @@
 Author: Daniel Baumann <daniel at debian.org>
 Description: Adjust icon directory to policy conforming place.
 
---- tryton-client.orig/setup.py	2013-11-24 18:14:23.223687647 +0100
-+++ tryton-client/setup.py	2013-11-24 18:14:23.219687786 +0100
+--- tryton-client.orig/setup.py	2014-04-24 12:42:28.128418131 +0200
++++ tryton-client/setup.py	2014-04-24 12:42:28.084419654 +0200
 @@ -56,7 +56,7 @@
          yield lang.split('_')[0]
  
@@ -12,22 +12,17 @@ Description: Adjust icon directory to policy conforming place.
          glob.glob('share/pixmaps/tryton/*.svg')),
      ('share/locale', ['share/locale/tryton.pot']),
      ]
---- tryton-client.orig/tryton/config.py	2013-11-24 18:14:23.223687647 +0100
-+++ tryton-client/tryton/config.py	2013-11-24 18:14:23.219687786 +0100
-@@ -179,13 +179,13 @@
+--- tryton-client.orig/tryton/config.py	2014-04-24 12:42:28.128418131 +0200
++++ tryton-client/tryton/config.py	2014-04-24 12:49:16.790198039 +0200
+@@ -179,9 +179,9 @@
+     CURRENT_DIR = os.path.abspath(os.path.normpath(os.path.join(
+         unicode(os.path.dirname(__file__), sys.getfilesystemencoding()),
          '..')))
- PREFIX = os.path.abspath(os.path.normpath(os.path.join(
-     os.path.realpath(os.path.dirname(sys.argv[0])), '..')))
 -PIXMAPS_DIR = os.path.join(CURRENT_DIR, 'share', 'pixmaps', 'tryton')
 +PIXMAPS_DIR = os.path.join(CURRENT_DIR, 'share', 'icons', 'tryton')
  if not os.path.isdir(PIXMAPS_DIR):
--    PIXMAPS_DIR = os.path.join(PREFIX, 'share', 'pixmaps', 'tryton')
-+    PIXMAPS_DIR = os.path.join(PREFIX, 'share', 'icons', 'tryton')
-     if not os.path.isdir(PIXMAPS_DIR):
-         PREFIX = os.path.abspath(os.path.normpath(
-             os.path.dirname(sys.argv[0])))
--        PIXMAPS_DIR = os.path.join(PREFIX, 'share', 'pixmaps', 'tryton')
-+        PIXMAPS_DIR = os.path.join(PREFIX, 'share', 'icons', 'tryton')
+-    PIXMAPS_DIR = os.path.join(sys.prefix, 'share', 'pixmaps', 'tryton')
++    PIXMAPS_DIR = os.path.join(sys.prefix, 'share', 'icons', 'tryton')
  
  TRYTON_ICON = gtk.gdk.pixbuf_new_from_file(
          os.path.join(PIXMAPS_DIR, 'tryton-icon.png').encode('utf-8'))
commit 70b78bdf0606dd920b805493053b3440fa486be9
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu Apr 24 12:35:55 2014 +0200

    Updating Depends and Recommends for version 3.2.

diff --git a/debian/control b/debian/control
index 785a686..834f735 100644
--- a/debian/control
+++ b/debian/control
@@ -16,10 +16,9 @@ Package: tryton-client
 Architecture: all
 Depends:
  ${misc:Depends}, ${python:Depends}, python-dateutil, python-gtk2,
- python-pkg-resources, librsvg2-common
+ python-simplejson, librsvg2-common, python-pkg-resources
 Recommends:
- libreoffice-writer, libreoffice-calc, evince | pdf-viewer, python-goocalendar,
- python-tz, python-simplejson
+ libreoffice-writer, libreoffice-calc, pdf-viewer, python-goocalendar
 Suggests: tryton-client-doc, tryton-server, tryton-server-doc
 Description: Tryton Application Platform (Client)
  Tryton is a high-level general purpose application platform written in Python
-- 
tryton-client