[tryton-debian-vcs] tryton-server branch debian-jessie created. debian/3.4.0-1-6-g16bd4be

[Mathias Behrle]

The following commit has been merged in the debian-jessie branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-server.git;a=commitdiff;h=debian/3.4.0-1-6-g16bd4be
commit 16bd4bef0135d405ab05ce272e5425c9e7c86292
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sun Dec 7 17:28:45 2014 +0100

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

diff --git a/debian/changelog b/debian/changelog
index 689b660..7ca5077 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+tryton-server (3.4.0-2) unstable; urgency=medium
+
+  * Adding path to the configuration file to the commands in the README.
+  * Adding path to the configuration file to the commands in NEWS.
+  * Correcting conf file handling.
+  * Improving the documentation in trytond.conf.
+  * Correcting documentation in trytond.conf to reflect current ipv6
+    behavior.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Sun, 07 Dec 2014 15:26:32 +0100
+
 tryton-server (3.4.0-1) unstable; urgency=medium
 
   * Merging upstream version 3.4.0.
commit 751f69d2345f822cfc36bd0a917d621553c9c250
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Nov 18 21:26:37 2014 +0100

    Correcting documentation in trytond.conf to reflect current ipv6 behavior.

diff --git a/debian/trytond.conf b/debian/trytond.conf
index 8b0a99e..040617b 100644
--- a/debian/trytond.conf
+++ b/debian/trytond.conf
@@ -58,8 +58,11 @@ path = /var/lib/tryton
 # The IP/host and port number of the interface
 # (Internal default: localhost:8000)
 #
+# Listen on all interfaces (IPv4)
+#listen = 0.0.0.0:8000
+#
 # Listen on all interfaces (IPv4 and IPv6)
-#listen = 0.0.0.0:8000,:8000
+#listen = [::]:8000
 
 # The hostname for this interface
 #hostname = 
commit df9f83848b0c5cc610ae0577a29e7f95680f80cd
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon Nov 17 13:47:17 2014 +0100

    Improving the documentation in trytond.conf.

diff --git a/debian/trytond.conf b/debian/trytond.conf
index fd28e1f..8b0a99e 100644
--- a/debian/trytond.conf
+++ b/debian/trytond.conf
@@ -12,14 +12,21 @@
 
 # The URI to connect to the SQL database (following RFC-3986)
 # uri = database://username:password@host:port/
+# (Internal default: sqlite:// (i.e. a local SQLite database))
 #
-# PostgreSQL via TCP/IP
-#uri = postgresql://tryton:tryton@localhost:5432/
 # PostgreSQL via Unix domain sockets
+# (e.g. PostgreSQL database running on the same machine (localhost))
 #uri = postgresql://tryton:tryton@/
+#
+# PostgreSQL via TCP/IP
+# (e.g. connecting to a PostgreSQL database running on a remote machine or
+# by means of md5 authentication. Needs PostgreSQL to be configured to accept
+# those connections (pg_hba.conf).)
+#uri = postgresql://tryton:tryton@localhost:5432/
 
 # The path to the directory where the Tryton Server stores files.
 # The server must have write permissions to this directory.
+# (Internal default: /var/lib/trytond)
 path = /var/lib/tryton
 
 # Shall available databases be listed in the client?
@@ -49,10 +56,10 @@ path = /var/lib/tryton
 # Settings for the JSON-RPC network interface
 
 # The IP/host and port number of the interface
-#listen = localhost:8000
+# (Internal default: localhost:8000)
 #
 # Listen on all interfaces (IPv4 and IPv6)
-#listen = 0.0.0.0:8000,*:8000
+#listen = 0.0.0.0:8000,:8000
 
 # The hostname for this interface
 #hostname = 
-- 
tryton-server