[MERGE] merge with latest stable

[odoo/odoo.git] / debian / control

diff --git a/debian/control b/debian/control
index 2199787..11c9853 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,38 +1,40 @@
 Source: openerp-server
 Section: net
 Priority: optional
-Maintainer: Daniel Baumann <daniel@debian.org>
-Build-Depends: debhelper (>= 7), dpatch, python-dev
-Build-Depends-Indep: python-libxml2, python-libxslt1, python-psycopg
-Standards-Version: 3.8.0
+Maintainer: OpenERP SA. <xrg@openerp.com>
+Uploaders: Xrg <xrg@openerp.com>
+Build-Depends: debhelper (>= 7.0.50~), python
+Build-Depends-Indep:
+ python-libxslt1, python-lxml, python-pychart, python-pydot, python-psycopg2,
+ python-reportlab
+Standards-Version: 3.9.1
 Homepage: http://www.openerp.com/
-Vcs-Browser: http://git.debian.net/?p=debian/openerp-server.git
-Vcs-Git: git://git.debian.net/git/debian/openerp-server.git
+Vcs-Browser: http://git.hellug.gr/?p=xrg/openobject-server;a=summary
+Vcs-Git: http://members.hellug.gr/xrg/repos/openobject-server
+Vcs-Bzr: https://code.launchpad.net/openobject-server
 
 Package: openerp-server
 Section: net
 Architecture: all
-Depends: ${misc:Depends}, adduser, python, python-libxml2, python-libxslt1, python-psycopg, python-reportlab, python-tz
-Conflicts: tinyerp-server (<< 5.0.0~alpha-2)
+Depends:
+ ${misc:Depends}, adduser, python, python-dateutil, python-libxslt1,
+ python-lxml, python-psycopg2, python-pydot, python-pychart, python-reportlab,
+ python-tz, python-pyparsing, python-yaml, python-mako,
+ postgresql-client (>=8.2)
+Conflicts: tinyerp-server
 Replaces: tinyerp-server
-Recommends: graphviz, postgresql, postgresql-client, python-imaging, python-pyparsing
+Recommends:
+ graphviz, ghostscript, postgresql, python-imaging,
+ python-matplotlib
 Suggests: openerp-client
 Description: Enterprise Resource Management (server)
- OpenERP is a complete ERP and CRM. The main features are accounting (analytic
- and financial), stock management, sales and purchases management, tasks
- automation, marketing campaigns, help desk, POS, etc. Technical features
- include a distributed server, flexible workflows, an object database, a dynamic
- GUI, customizable reports, and NET-RPC and XML-RPC interfaces.
+ Open ERP, previously known as TinyERP, is a complete ERP and CRM. The main
+ features are accounting (analytic and financial), stock management, sales and
+ purchases management, tasks automation, marketing campaigns, help desk, POS,
+ etc. Technical features include a distributed server, flexible workflows, an
+ object database, a dynamic GUI, customizable reports, and NET-RPC and XML-RPC
+ interfaces.
  .
- This package contains the OpenERP server, install openerp-client package for
+ This package contains the Open ERP server, install openerp-client package for
  the client.
 
-Package: tinyerp-server
-Architecture: all
-Depends: openerp-server
-Description: Enterprise Resource Management (server; transitional package)
- Package to ease upgrading from older tinyerp-server packages to the new
- openerp-server package.
- .
- This package can be purged at anytime once the openerp-server package has been
- installed.