[tryton-debian-vcs] tryton-server branch debian updated. debian/3.0.0-1-7-g2259d9b

[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.0.0-1-7-g2259d9b

commit 2259d9b26403a0db24f091fb1cd5ded65fa9baea
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sun Dec 1 14:53:07 2013 +0100

    Improving 01-debian-data-dir.patch according to dep3.

diff --git a/debian/patches/01-debian-data-dir.patch b/debian/patches/01-debian-data-dir.patch
index 7157d33..13a15d0 100644
--- a/debian/patches/01-debian-data-dir.patch
+++ b/debian/patches/01-debian-data-dir.patch
@@ -1,5 +1,6 @@
 Author: Mathias Behrle <mathiasb at m9s.biz>
 Description: Set the data path of the server to the home of the Debian tryton user.
+Forwarded: not-needed
 --- tryton-server.orig/etc/trytond.conf	2013-11-24 18:24:26.350839912 +0100
 +++ tryton-server/etc/trytond.conf	2013-11-24 18:24:26.346840051 +0100
 @@ -61,7 +61,7 @@
commit d45fd17df61a8a34cf60317fd10410951bf11da2
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sun Dec 1 13:54:49 2013 +0100

    Adding 02-snakeoil-certs.patch

diff --git a/debian/patches/02-snakeoil-certs.patch b/debian/patches/02-snakeoil-certs.patch
new file mode 100644
index 0000000..b587015
--- /dev/null
+++ b/debian/patches/02-snakeoil-certs.patch
@@ -0,0 +1,16 @@
+Author: Mathias Behrle <mathiasb at m9s.biz>
+Description: Prepare the conf file for the usage of ssl snakeoil certs.
+Forwarded: not-needed
+--- tryton-server.orig/etc/trytond.conf	2013-12-01 12:57:37.388363898 +0100
++++ tryton-server/etc/trytond.conf	2013-12-01 13:08:43.649163290 +0100
+@@ -48,8 +48,8 @@
+ #pidfile = False
+ #logfile = False
+ 
+-#privatekey = server.pem
+-#certificate = server.pem
++privatekey = /etc/ssl/private/ssl-cert-snakeoil.key
++certificate = /etc/ssl/certs/ssl-cert-snakeoil.pem
+ 
+ # Configure the SMTP connection
+ #smtp_server = localhost
diff --git a/debian/patches/series b/debian/patches/series
index d86a07a..2c10589 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 01-debian-data-dir.patch
+02-snakeoil-certs.patch
commit 986ece2f6bed1c0177457c7f51ae3c14799e7b6b
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sun Dec 1 13:16:21 2013 +0100

    Renaming 01-debian-data-dir to 01-debian-data-dir.patch.

diff --git a/debian/patches/01-debian-data-dir b/debian/patches/01-debian-data-dir.patch
similarity index 100%
rename from debian/patches/01-debian-data-dir
rename to debian/patches/01-debian-data-dir.patch
diff --git a/debian/patches/series b/debian/patches/series
index c83c506..d86a07a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-01-debian-data-dir
+01-debian-data-dir.patch
commit 0fd3af907244f46bb0227a3b14b098ad51a1b074
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sun Dec 1 12:46:09 2013 +0100

    Moving unoconv from Suggests to Recommends.

diff --git a/debian/control b/debian/control
index 41b5283..ece3cad 100644
--- a/debian/control
+++ b/debian/control
@@ -20,11 +20,11 @@ Depends:
  python-pkg-resources
 Recommends:
  postgresql, python-psycopg2, postgresql-client, python-levenshtein,
- python-pydot, python-tz, python-webdav, python-openssl, ssl-cert
+ python-pydot, python-tz, python-webdav, python-openssl, ssl-cert, unoconv
 Suggests:
  tryton-client | tryton-neso, tryton-server-doc, tryton-modules-all,
- python-psyco, python-sphinx, unoconv, libreoffice-draw,
- libreoffice-writer, libreoffice-calc
+ python-psyco, python-sphinx, libreoffice-draw, libreoffice-writer,
+ libreoffice-calc
 Description: Tryton Application Platform (Server)
  Tryton is a high-level general purpose application platform written in Python
  and using PostgreSQL as database engine. It is the core base of a complete
commit b58e93ecc421ce632b56edf9f297c67639a8bd2e
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sun Dec 1 12:43:29 2013 +0100

    Adding SSL packages to Recommends.

diff --git a/debian/control b/debian/control
index b271a58..41b5283 100644
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,7 @@ Depends:
  python-pkg-resources
 Recommends:
  postgresql, python-psycopg2, postgresql-client, python-levenshtein,
- python-pydot, python-tz, python-webdav
+ python-pydot, python-tz, python-webdav, python-openssl, ssl-cert
 Suggests:
  tryton-client | tryton-neso, tryton-server-doc, tryton-modules-all,
  python-psyco, python-sphinx, unoconv, libreoffice-draw,
-- 
tryton-server