[tryton-debian-vcs] tryton-server branch debian updated. debian/3.4.3-1-6-g91e8cb7

[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-server.git;a=commitdiff;h=debian/3.4.3-1-6-g91e8cb7

commit 91e8cb76ae9a03f00ba986415cee20acf807e00d
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu Apr 23 18:45:45 2015 +0200

    Adding setting price_decimal to trytond.conf.

diff --git a/debian/trytond.conf b/debian/trytond.conf
index 040617b..56f8938 100644
--- a/debian/trytond.conf
+++ b/debian/trytond.conf
@@ -128,3 +128,9 @@ path = /var/lib/tryton
 #uri = ldap://host:port/dn?attributes?scope?filter?extensions
 # A basic default URL could look like
 #uri = ldap://localhost:389/
+#
+#[product]
+# The number of decimals with which the unit prices are stored
+# in the database. The default value is 4.
+# Warning: This setting can not be lowered once a database is created.
+#price_decimal = 4
commit 15aea379f87b055e4d713468365ace355955397b
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu Apr 23 18:35:40 2015 +0200

    Updating manpage.

diff --git a/debian/manpages/trytond.1 b/debian/manpages/trytond.1
index 2b620db..b152436 100644
--- a/debian/manpages/trytond.1
+++ b/debian/manpages/trytond.1
@@ -1,4 +1,4 @@
-.TH TRYTOND 1 "2014\-10\-21" "3.4" "Tryton Application Platform"
+.TH TRYTOND 1 "2015\-04\-23" "3.6" "Tryton Application Platform"
 
 .SH NAME
 trytond \- Tryton Application Platform (Server)
commit 624bad7a93236ffd11778cf66ec4fed08682ab86
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu Apr 23 18:33:16 2015 +0200

    Renaming and updating patch 01_migrate_obsolete_ldap_connection to 01_migrate_obsolete_modules.

diff --git a/debian/patches/01_migrate_obsolete_ldap_connection b/debian/patches/01_migrate_obsolete_modules
similarity index 52%
rename from debian/patches/01_migrate_obsolete_ldap_connection
rename to debian/patches/01_migrate_obsolete_modules
index 8a256dd..8ec4d5b 100644
--- a/debian/patches/01_migrate_obsolete_ldap_connection
+++ b/debian/patches/01_migrate_obsolete_modules
@@ -1,21 +1,23 @@
-Description: Migration for obsolete module ldap_connection
+Description: Migration for obsolete modules
+ The server fails to start with a missing module, so we remove them
+ from the modules table.
+ Server module workflow was removed in version 2.4.
  tryton-modules-ldap-connection was merged into
- tryton-modules-ldap-authentication. The server fails to start with a
- missing module, so we remove it from the modules table.
+ tryton-modules-ldap-authentication in version 3.4.
 Author: Mathias Behrle <mathiasb at m9s.biz>
 Bug: http://bugs.tryton.org/issue4280
 Forwarded: https://bugs.tryton.org/issue4280
 
---- tryton-server-3.4.0.orig/trytond/modules/__init__.py
-+++ tryton-server-3.4.0/trytond/modules/__init__.py
-@@ -365,8 +365,10 @@ def load_modules(database_name, pool, up
+--- tryton-server.orig/trytond/modules/__init__.py	2015-04-23 18:27:43.953539864 +0200
++++ tryton-server/trytond/modules/__init__.py	2015-04-23 18:27:43.953539864 +0200
+@@ -368,6 +368,11 @@
+         global res
          cursor = Transaction().cursor
          if update:
-             # Migration from 2.2: workflow module removed
++            # Migration from 2.2: module workflow removed
 +            # Migration from 3.2: module ldap_connection removed
 +            obsolete_modules = ['workflow', 'ldap_connection']
-             cursor.execute(*ir_module.delete(
--                    where=(ir_module.name == 'workflow')))
++            cursor.execute(*ir_module.delete(
 +                    where=(ir_module.name.in_(obsolete_modules))))
              cursor.execute(*ir_module.select(ir_module.name,
                      where=ir_module.state.in_(('installed', 'to install',
diff --git a/debian/patches/series b/debian/patches/series
index f9bd601..8e32e7f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-01_migrate_obsolete_ldap_connection
+01_migrate_obsolete_modules
commit c41c8bb133af1ecde9303ca8aee93c1f64c9afed
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu Apr 23 18:14:42 2015 +0200

    Adding NEWS for version 3.6.

diff --git a/debian/NEWS b/debian/NEWS
index f605046..344d679 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,3 +1,14 @@
+tryton-server (3.6.0-1) unstable; urgency=medium
+
+  This is the new major release 3.6.0.
+  As for each major release don't forget to backup your database(s) and
+  then run the database update with
+  # trytond --all -d <your_database_name>
+  and restart the server with
+  # service tryton-server restart
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Thu, 23 Apr 2015 18:13:16 +0200
+
 tryton-server (3.4.0-1) unstable; urgency=medium
 
   This is the new major release 3.4.0.
-- 
tryton-server