[tryton-debian-vcs] tryton-client branch debian updated. debian/3.6.3-1-9-g83fb1c8

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Fri Nov 13 13:24:45 UTC 2015 

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.6.3-1-9-g83fb1c8

commit 83fb1c88ec303258b6e202e767fd21acf84cc679
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu Nov 12 19:31:40 2015 +0100

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

diff --git a/debian/changelog b/debian/changelog
index 0d96757..0a8e51e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+tryton-client (3.8.2-1) unstable; urgency=medium
+
+  * Merging upstream version 3.8.0.
+  * Merging upstream version 3.8.1.
+  * Merging upstream version 3.8.2.
+  * Adapting the icon search path for version 3.8.
+  * Moving files to their policy conforming place in the rules file.
+  * Adapting the svg path in copyright to their new location.
+  * Actualisation of the man page.
+  * Adding python-chardet to Depends.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Thu, 12 Nov 2015 19:06:28 +0100
+
 tryton-client (3.6.3-1) unstable; urgency=medium
 
   * Merging upstream version 3.6.3.
commit 6721c43ffcba2d2f375fe9bffb9979f401890059
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu Nov 12 18:58:24 2015 +0100

    Adding python-chardet to Depends.

diff --git a/debian/control b/debian/control
index 17911f0..2c345f3 100644
--- a/debian/control
+++ b/debian/control
@@ -19,6 +19,7 @@ Package: tryton-client
 Architecture: all
 Depends:
  librsvg2-common,
+ python-chardet,
  python-dateutil,
  python-gtk2,
  python-pkg-resources,
commit 4608fbea8b3940d3a1ab54984aeb85c3cd6abc58
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu Nov 12 18:50:53 2015 +0100

    Actualisation of the man page.

diff --git a/debian/manpages/tryton.1 b/debian/manpages/tryton.1
index 0653c60..e177726 100644
--- a/debian/manpages/tryton.1
+++ b/debian/manpages/tryton.1
@@ -1,4 +1,4 @@
-.TH TRYTON 1 "2015\-04\-23" "3.6" "Tryton Application Platform"
+.TH TRYTON 1 "2015\-11\-12" "3.8" "Tryton Application Platform"
 
 .SH NAME
 tryton \- Tryton Application Platform (Client)
commit 390ae13acf0ff83b8e9f9bb9276ac90f3d651c3e
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu Nov 12 18:42:34 2015 +0100

    Adapting the svg path in copyright to their new location.

diff --git a/debian/copyright b/debian/copyright
index a6cf8a8..5968bbc 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -22,7 +22,7 @@ Copyright: 2008-2011 Anne Krings
            2008-2011 Udo Spallek
 License: GPL-3+
 
-Files: share/pixmaps/tryton/*.svg
+Files: tryton/data/pixmaps/tryton/*.svg
 Copyright: not applicable
 License: public-domain
 
commit cef840c14e3caff7f4374f40283dc2b98cc226fe
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu Nov 12 18:29:45 2015 +0100

    Moving files to their policy conforming place in the rules file.

diff --git a/debian/rules b/debian/rules
index 3fcdb41..ca161b2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,5 +16,9 @@ override_dh_auto_build:
 override_dh_install:
 	dh_install
 	mv debian/tryton-client/usr/share/applications/tryton.desktop debian/tryton-client/usr/share/applications/tryton-client.desktop
-
-
+	# Moving files to their policy conforming place
+	mkdir -p debian/tryton-client/usr/share/icons
+	mv debian/tryton-client/usr/lib/python2.7/dist-packages/tryton/data/pixmaps/*	debian/tryton-client/usr/share/icons
+	mkdir -p debian/tryton-client/usr/share/locale
+	mv debian/tryton-client/usr/lib/python2.7/dist-packages/tryton/data/locale/*	debian/tryton-client/usr/share/locale
+	find debian/tryton-client/usr/lib/python2.7/dist-packages/tryton -type d -empty -delete
commit 5541e5920fce57ec6fecff5e3c143e5490f57642
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu Nov 12 18:24:10 2015 +0100

    Adapting the icon search path for version 3.8.
    
    - We are moving now the files in rules to their policy conforming place.
    - Renaming the patch to better describe its functionality.

diff --git a/debian/patches/02-icon-directory.patch b/debian/patches/02-icon-directory.patch
deleted file mode 100644
index 9a93b52..0000000
--- a/debian/patches/02-icon-directory.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Author: Daniel Baumann <daniel at debian.org>
-Description: Adjust icon directory to policy conforming place.
-
---- tryton-client.orig/setup.py	2015-04-23 18:52:03.332762311 +0200
-+++ tryton-client/setup.py	2015-04-23 18:52:03.328762346 +0200
-@@ -57,7 +57,7 @@
-         yield lang.split('_')[0]
- 
- data_files = [
--    ('share/pixmaps/tryton', glob.glob('share/pixmaps/tryton/*.png') +
-+    ('share/icons/tryton', glob.glob('share/pixmaps/tryton/*.png') +
-         glob.glob('share/pixmaps/tryton/*.svg')),
-     ('share/locale', ['share/locale/tryton.pot']),
-     ]
---- tryton-client.orig/tryton/config.py	2015-04-23 18:52:03.332762311 +0200
-+++ tryton-client/tryton/config.py	2015-04-23 18:52:03.332762311 +0200
-@@ -180,7 +180,7 @@
-         '..')))
- 
- for dir in [CURRENT_DIR, getattr(site, 'USER_BASE', sys.prefix), sys.prefix]:
--    PIXMAPS_DIR = os.path.join(dir, 'share', 'pixmaps', 'tryton')
-+    PIXMAPS_DIR = os.path.join(dir, 'share', 'icons', 'tryton')
-     if os.path.isdir(PIXMAPS_DIR):
-         break
- 
diff --git a/debian/patches/02-icon-search-path.patch b/debian/patches/02-icon-search-path.patch
new file mode 100644
index 0000000..52fd912
--- /dev/null
+++ b/debian/patches/02-icon-search-path.patch
@@ -0,0 +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 @@
+     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')
diff --git a/debian/patches/series b/debian/patches/series
index 0a0e5f0..1edb80e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
 01-desktop-icon.patch
-02-icon-directory.patch
+02-icon-search-path.patch
-- 
tryton-client

More information about the tryton-debian-vcs mailing list