Merge lp:~gs.clearcorp/oerptools/2.0_oerptools into lp:oerptools

[Glen Sojo]

[ADD] - Added support for Ubuntu 12.04+ Postgresql 9.3 and installation of poppler-utils package.

=== modified file 'oerptools/oerp/server.py'
--- oerptools/oerp/server.py	2014-04-16 18:34:24 +0000
+++ oerptools/oerp/server.py	2014-07-07 14:37:48 +0000
@@ -39,8 +39,11 @@
                 self._postgresql_init_suffix = '-8.4'
             if self._os_info['version'][1] < '11.10':
                 self._postgresql_version = '8.4'
-            else:
+            if self._os_info['version'][1] < '14.04':
                 self._postgresql_version = '9.1'
+            else:
+                self._postgresql_version = '9.3'
+        # TODO check versions for Linux Mint and Arch Linux
         elif self._os_info['os'] == 'Linux' and self._os_info['version'][0] == 'LinuxMint':
             self._postgresql_version = '9.1'
         elif self._os_info['os'] == 'Linux' and self._os_info['version'][0] == 'arch':
@@ -169,6 +172,7 @@
                 'python-zsi':               'python-zsi',
                 'tinymce':                  'tinymce',
                 'wget':                     'wget',
+                'poppler-utils':            'poppler-utils'
             },
 
             'arch': {
@@ -207,6 +211,7 @@
                     'python-yaml':              'python2-yaml',
                     'tinymce':                  None,
                     'wget':                     'wget',
+                    'poppler-utils':            'poppler-utils' # Needs review on arch
                 },
                 'aur': {
                     'python-mock':              'python2-mock',
@@ -276,6 +281,7 @@
                 'python-simplejson',
                 'python-pyparsing',
                 # Recommended
+                'poppler-utils',
             ]
 
         # Packages for 7.0
@@ -316,6 +322,7 @@
                 'ghostscript',
                 'python-imaging',
                 'python-matplotlib',
+                'poppler-utils',
             ]
 
         # Test distro and call appropriate function