Merge with trunk-server

bzr revid: ysa@tinyerp.com-20110120053733-ws7mfcfw15p0iyy1

14 files changed, 288 insertions, 782 deletions

diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 00000000000..18b6b245bf0
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,37 @@
+Package Repositories
+--------------------
+
+Backports for the current stable debian distribution as well as snapshots of
+unreleased versions may be available in repositories listed on the maintainers
+homepage. The current URL of the maintainer homepage can be seen in
+debian/copyright.
+
+
+Source Access
+-------------
+
+You can obtain the sources of this package with:
+
+  $ apt-get source ${PACKAGE}
+
+whereas '${PACKAGE}' has to be replaced with the actual name of the package.
+
+This package is maintained with the Git version control system. The current git
+source tree can be obtained with:
+
+  $ git clone ${GIT_URI}
+
+whereas '${GIT_URI}' has to be replaced with the actual URI for the Git
+repository. The current Git URI can be seen in debian/control in the extracted
+package sources.
+
+More information about Git can be found in the git-core package.
+
+This package may use the Quilt patch system to manage all modifications to the
+upstream source. Changes, if any, are stored in the source package as diffs in
+debian/diff and are applied during the build. Current modifications can be
+applied to the source tree with:
+
+  $ QUILT_PATCHES=debian/patches quilt push -a
+
+More information about Quilt can be found in the quilt package.
diff --git a/debian/changelog b/debian/changelog
index 2f1950b39d4..b2fd874fa35 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,283 +1,144 @@
-openerp-server (5.0.6-0-1test4) unstable; urgency=low
-
-  [ Christophe Simonis ]
-  * [IMP] cchange version number
-
-  [ Jay (Open ERP) ]
-  * [FIX] Send mail : Non-English characters were throwing error.
-  * [IMP] Base : Rate for ARS Added
-  * [FIX] Base : 'Supplier Partners' menu will open new record with
-    supplier=1,customer=0
-  * [FIX] Security Loophole corrected
-  * [FIX] Send Mail : Unicode error handled
-  * [FIX] Translation issue with cache: it needed to restart
-    server,SOLVED
-
-  [ Harry (Open ERP) ]
-  * [IMP]quality_integration_server: put max_limit in server connection
-  * [IMP]quality_integration_server : quality html log
-
-  [ Jay (Open ERP) ]
-  * [FIX] Export : Error solved while Exporting O2M records with None
-    value of any field
-
-  [ Fabien Pinckaers ]
-  * merge
-
-  [ P. Christeas ]
-  * Debian changelog for 5.0.4
-  * Two hacks to make it python2.5 compatible..
-
-  [ Fabien Pinckaers ]
-  * [FIX] better log error, new line
-
-  [ P. Christeas ]
-  * Implement safe_eval() in order to armour eval()
-  * [Feature]: add condition to ir.sequence, let it be partitioned.
-  * safe_eval: make python 2.5 compatible.
-  * Backport the HTTP server code from python 2.6 to 2.5
-
-  [ Jay (Open ERP) ]
-  * [FIX] Better translation exportation.
-
-  [ P. Christeas ]
-  * ORM feature: allow renaming of columns.
-  * Web services: fix database operations (create, drop etc.) for new
-    API.
-  * ORM: Protect against dropping columns.
-
-  [ Jay (Open ERP) ]
-  * [IMP] Rng : Accepting Groups under/after/replacing Buttons
-
-  [ Fabien Pinckaers ]
-  * [FIX] regression in fields.function computation
-
-  [ Harry (Open ERP) ]
-  * [IMP]quality_integration_server: get message from
-    base_quality_module if module can not success to reach minimun score
-  * [FIX]quality_integration_server: get message from
-    base_quality_module if module can not success to reach minimun score
-
-  [ Mantavya Gajjar ]
-  * [REM]: remove the name search method, as this method was implemented
-    for the email address field
-  * [MERGE]: merging from the same branch
-
-  [ Harry (Open ERP) ]
-  * [FIX]quality_integration_server : quality log : reduce overwrite
-    last test log in other test logs
-  * [FIX]quality_integration_server: fixe problem on make link of extra-
-    module in addons
-
-  [ tailor ]
-  * [IMP] updated changelog file
-  * [MERGE]
-  * [IMP] updated changelog file
-  * [IMP] updated release.py to 5.0.5
-
-  [ Jay (Open ERP) ]
-  * [FIX] Price Accuracy : rounding made to be based on --price_accuracy
-    option
-  * [FIX] Fields.function : Store value computation corrected
-
-  [ P. Christeas ]
-  * [IMP]: allow binary function fields to directly return size.
-  * Ir.attachment: improve SQL for access checks.
-
-  [ tailor ]
-  * [REL] release.py: 5.0.6
-  * [IMP] updated changelog file for 5.0.6 release
-
-  [ Harry (Open ERP) ]
-  * [IMP]quality_integration_server: quality log : add new option to
-    specify qualitylog path to store html pages of log
-
-  [ Jay (Open ERP) ]
-  * [FIX] Update Module : Float8 to float and numeric to float casting
-    made possible
-
-  [ Harry (Open ERP) ]
-  * [FIX]quality_integration_server: ascci encoding problem in quality
-    html log
-
-  [ P. Christeas ]
-  * [Fix] Tolerate ids that came as strings.
-
-  [ Jay (Open ERP) ]
-  * [FIX] Fields.function : Store value computation corrected
-  * [FIX] Export Translation : Warning on Non-existing record instead of
-    breaking flow
-
-  [ mra (Open ERP) ]
-  * [IMP] base_quality_interrrogation: put message if the score of
-    quality less then minimal and remove unit test condition
-
-  [ Jay (Open ERP) ]
-  * [FIX] Allowing sql keywords as fields(don't use them in order by
-    clause)
-
-  [ Christophe Simonis ]
-  * [IMP] cron: check the arguments to avoid security issues
-
-  [ P. Christeas ]
-  * New API: work better for bad ExportServices.
-
-  [ Jay (Open ERP) ]
-  * [FIX] Name_search() is having now record limit to be 80 instead of
-    None
-  * [FIX] Import : Context of the action/screen passed,taken into
-    consideration while importing
-  * [FIX] Improved Previous bad commit for pagelayout error
-  * [FIX] Domain was getting failed when trying to work upon M2M,O2M
-    field of object
-  * [FIX] Import made successful when field is O2M and it has relation
-    under that.
-
-  [ Stephane Wirtel ]
-  * [MERGE] Backport: http://bazaar.launchpad.net/~openobject-
-    training/+junk/server/revision/1821
-  * [MERGE] Backport: http://bazaar.launchpad.net/~openobject-
-    training/+junk/server/revision/1822
-
-  [ HDA (OpenERP) ]
-  * merged for report improvements
-
-  [ Stephane Wirtel ]
-  * [FIX] Specify the name of the argument for the context, to avoir a
-    critical bug
-
-  [ Christophe Simonis ]
-  * [FIX] allow to call write without ids on osv_memory objects
-
-  [ Fabien Pinckaers ]
-  * [FIX] default context
-
-  [ Stephane Wirtel ]
-  * [FIX] Use an alternative for the locale.RADIXCHAR if this one
-    doesn't exist
-
-  [ P. Christeas ]
-  * [Imp] Allow expressions: ".. child_of, 1" , not only list(1)
-
-  [ Jay (Open ERP) ]
-  * [FIX] Improved Previous bad commit for pagelayout error
+openerp-server (6.0.0~rc2-0) experimental; urgency=low
 
-  [ Fabien Pinckaers ]
-  * [IMP] default value for module
-  * [FIX] recursive child_of on one2many and many2many
-  * [FIX] recursive calls
+  * Upgrade to 6.0.0-rc2, let it build
 
-  [ Jay (Open ERP) ]
-  * [FIX] Export : Selection field gets imported by its external name
-    if export is not import compatible
-  * [FIX] Expression : domain calculation failes, max. recursion error
-    protected
+ -- P. Christeas <xrg@openerp.com>  Mon, 17 Jan 2011 14:18:00 +0100
 
-  [ P. Christeas ]
-  * Mandriva: when server starts/stops, run scripts
+openerp-server (5.0.14-1) experimental; urgency=low
 
-  [ Jay (Open ERP) ]
-  * [FIX] Config : wrong calculation if cached_timeout comes from config
-    file
+  * Updating to standards version 3.9.1.
+  * Merging upstream version 5.0.14.
 
-  [ P. Christeas ]
-  * [IMP] If SSL connection fails, close the socket.
+ -- Daniel Baumann <daniel@debian.org>  Wed, 15 Sep 2010 00:22:00 +0200
 
-  [ Jay (Open ERP) ]
-  * [FIX] Ir_attachment : Context updation corrected on preview
-  * [FIX] Record rule : domain evaluation problem corrected
+openerp-server (5.0.13-1) experimental; urgency=low
 
-  [ P. Christeas ]
-  * [IMP] Convert: two minor typos and tab expansion.
-  * Netsvc.Server: Expand tabs
-  * Server: get_stats() RPC call for any extended info.
-  * Client script for statistics.
-  * Net-RPC: armor the thread, provide stats and inf. timeout.
+  * Merging upstream version 5.0.13.
 
-  [ Jay (Open ERP) ]
-  * [REF] Partner : copy() improved
+ -- Daniel Baumann <daniel@debian.org>  Mon, 13 Sep 2010 09:14:10 +0200
 
-  [ panos ]
+openerp-server (5.0.12-2) unstable; urgency=low
 
- -- panos <panos@debian.pefnos2>  Mon, 02 Nov 2009 18:28:44 -0500
+  * Removing debhelper auto install overrides.
+  * Updating clean target in rules.
+  * Reverting to manual setup.py call, updated for version 5.0.12.
 
-openerp-server (5.0.4-0-1test3) intrepid; urgency=high
+ -- Daniel Baumann <daniel@debian.org>  Sat, 14 Aug 2010 18:53:43 +0200
 
-  [ Panos Christeas ]
-  * Testing release, with HTTP/1.1 features
+openerp-server (5.0.12-1) unstable; urgency=low
 
-  [ P. Christeas ]
-  * Translating: skip buggy wizard states.
-  * If the server is only translating, don't init the httpd.
-  * Remove debuggint print's
-  * Implement basic-authenticated services. Log messages.
-  * Initialize services before databases.
-  * Don't print messages, log them..
-  * Bring back net-rpc service.
-  * Fix quoting of ids when passed to sql.
-  * Fix merging of 5.0.4 into API-changed netsvc.
+  * Updating standards version to 3.9.0.
+  * Merging upstream version 5.0.12.
 
-  [ Jay (Open ERP) ]
-  * [FIX] Security Loophole corrected
+ -- Daniel Baumann <daniel@debian.org>  Sun, 18 Jul 2010 19:46:39 +0200
 
-  [ P. Christeas ]
-  * Fix https transports, certificates etc.
-  * [IMP] reorder the imports in websrv_lib.
-  * Fix dispatching of reports after API change.
-  * [MAJOR IMP] Rewrite the http/RPC engine and let HTTP/1.1 features.
+openerp-server (5.0.11-1) unstable; urgency=low
 
-  [ Christophe Simonis ]
-  * [REL] 5.0.4
-  * [MERGE]
-  * [MERGE]
-  * [IMP] replace partner name and address in demo
-  * [IMP] add translation names
-  * [IMP] update translations files
+  * Merging upstream version 5.0.11.
+  * Adding patch from Timothy E. Harris <maintainer@mepiscommunity.org>
+    to prevents creating a new database if the locale is not a UTF-8 one
+    (Closes: #584976).
 
-  [ Jay (Open ERP) ]
-  * [FIX] Functional fields with M2O relation can be printed on print
-    screen now
+ -- Daniel Baumann <daniel@debian.org>  Tue, 08 Jun 2010 11:42:23 +0200
 
-  [ HDA (OpenERP) ]
-  * [FIX] Pagecount probelm while all objects print on same page and
-    printing special character on xsl report
+openerp-server (5.0.10-1) unstable; urgency=low
 
-  [ Harry (Open ERP) ]
-  * [FIX] import: support "<rel_field>:db_id" , better warning message
+  * Merging upstream version 5.0.10.
 
-  [ Jay (Open ERP) ]
-  * [FIX] ir_cron :function and its arguements are now editable
+ -- Daniel Baumann <daniel@debian.org>  Fri, 07 May 2010 15:02:31 +0200
 
-  [ HDA (OpenERP) ]
-  * [Merge]
+openerp-server (5.0.9-1) unstable; urgency=low
 
-  [ Panos Christeas ]
+  * Merging upstream version 5.0.9.
 
- -- Panos Christeas <p_christ@hol.gr>  Tue, 08 Sep 2009 10:06:51 +0300
+ -- Daniel Baumann <daniel@debian.org>  Fri, 16 Apr 2010 06:47:02 +0200
 
-openerp-server (5.0.3-0-1ubuntu2) intrepid; urgency=low
+openerp-server (5.0.8-1) unstable; urgency=low
 
-  * Merge packaging work from Debian official
+  * Merging upstream version 5.0.8.
 
- -- Panos Christeas <p_christ@hol.gr>  Mon, 24 Aug 2009 22:10:00 +0300
+ -- Daniel Baumann <daniel@debian.org>  Wed, 14 Apr 2010 20:19:21 +0200
 
-openerp-server (5.0.3-0-1ubuntu1) intrepid; urgency=low
+openerp-server (5.0.7-2) unstable; urgency=low
 
-  [ P. Christeas ]
-  * Introduce 'debug2' loglevel, use it for SQL
+  * Updating python build-depends.
+  * Adding patch to fix bad whatis entry in openerp-server manpage.
 
-  [ Christophe Simonis ]
-  * [IMP] change version number
+ -- Daniel Baumann <daniel@debian.org>  Wed, 07 Apr 2010 00:09:23 +0200
 
-  [ P. Christeas ]
-  * [IMP]: allow Log level to be changed in runtime.
-  * Config: misc options. Logger: option to turn env_info off.
-  * Remove base_setup/i18n/el_GR.po, module is moved to addons repo.
-  * Merge el_GR translation with template.
-  * Update translation template.
-  * Fix +x permission of openerp-server.py
+openerp-server (5.0.7-1) unstable; urgency=low
 
- -- Panos Christeas <p_christ@hol.gr>  Fri, 14 Aug 2009 20:40:29 +0300
+  * Merging upstream version 5.0.7 (Closes: #573716):
+  * Updating copyright file.
+  * Resorting the dh call to more common order.
+  * Updating README.source.
+  * Dropping python-lxml patch, went upstream.
+  * Dropping postgresql-8.4.patch, went upstream.
+  * Adding some more python module build-depends to avoid some chicken-
+    egg problem with the new setup.py and quilt.
+  * Adding dependency to remote_fs in init script.
+
+ -- Daniel Baumann <daniel@debian.org>  Sat, 13 Mar 2010 13:55:50 +0100
+
+openerp-server (5.0.6-4) unstable; urgency=low
+
+  * Adding explicit debian source version 1.0 until switch to 3.0.
+  * Updating year in copyright file.
+  * Updating to standards 3.8.4.
+  * Adding patch from Toni Mueller <support@oeko.net> to fix SQL for
+    postgresql 8.4 (Closes: #568119).
+
+ -- Daniel Baumann <daniel@debian.org>  Sat, 06 Feb 2010 10:22:05 +0100
+
+openerp-server (5.0.6-3) unstable; urgency=low
+
+  [ Daniel Baumann ]
+  * Setting last-translator for German debconf templates to me, no
+    intention do deal with debian-l10n-german in the future anymore.
+
+  [ Mathias Behrle ]
+  * Removing deprecated option -q for PostgreSQL client commands
+    (Closes: #548875).
+
+ -- Daniel Baumann <daniel@debian.org>  Sat, 31 Oct 2009 09:20:27 +0100
+
+openerp-server (5.0.6-2) unstable; urgency=low
+
+  * Minimizing rules file.
+
+ -- Daniel Baumann <daniel@debian.org>  Sun, 18 Oct 2009 21:19:57 +0200
+
+openerp-server (5.0.6-1) unstable; urgency=low
+
+  * Merging upstream version 5.0.6.
+  * Rediffing python-lxml.patch.
+
+ -- Daniel Baumann <daniel@debian.org>  Sat, 17 Oct 2009 08:32:56 +0200
+
+openerp-server (5.0.5-1) unstable; urgency=low
+
+  * Merging upstream version 5.0.5.
+
+ -- Daniel Baumann <daniel@debian.org>  Mon, 21 Sep 2009 20:38:00 +0200
+
+openerp-server (5.0.4-1) unstable; urgency=medium
+
+  * Merging upstream version 5.0.4:
+    - fixes a security problem.
+  * No longer calling debconf-updatepo in clean target of rules.
+
+ -- Daniel Baumann <daniel@debian.org>  Mon, 21 Sep 2009 00:01:13 +0200
+
+openerp-server (5.0.3-0-2) unstable; urgency=low
+
+  * Adding README.source.
+  * Moving maintainer homepage from control to copyright.
+  * Updating README.source.
+  * Adding patch from upstream to use python-lxml instead of python-xml,
+    thanks to Alan Bell <alan.bell@theopenlearningcentre.com> (Closes:
+    #543947).
+
+ -- Daniel Baumann <daniel@debian.org>  Wed, 16 Sep 2009 21:18:30 +0200
 
 openerp-server (5.0.3-0-1) unstable; urgency=low
 
@@ -316,416 +177,6 @@ openerp-server (5.0.2-0-2) unstable; urgency=high
 
  -- Daniel Baumann <daniel@debian.org>  Thu, 13 Aug 2009 14:45:17 +0200
 
-openerp-server (5.0.2-0-1ubuntu2) intrepid; urgency=critical
-
-  [ P. Christeas ]
-  * Security: check_creds is not really needed, use "check"
-
-  [ Christophe Simonis ]
-  * [FIX] security issue: avoid access to inactive users
-  * [FIX] avoid a bug when look in stack when translate code strings
-
-  [ P. Christeas ]
-  * [SEC] [CRITICAL] Forbid RPC calls w/o credentials.
-
-  [ Panos Christeas ]
-
- -- Panos Christeas <p_christ@hol.gr>  Thu, 13 Aug 2009 15:25:26 +0300
-
-openerp-server (5.0.2-0-1ubuntu1) intrepid; urgency=low
-
-  [ P. Christeas ]
-  * [b98f26433c82] Greek translations, shorten terms.
-  * [2567b4e8fbc4] [IMP] Partial restrict operator for domains.
-  * [a507f9bee128] Shortcuts in RNG view definition.
-  * [e8da054afe0a] [IMP] Allow OS to rotate the logs, use
-    WatchedFileHandler if needed.
-
-  [ Jay (Open ERP) ]
-  * [8174407a30ec] [FIX] Property : Removed old referenced values from
-    property
-
-  [ mra (Open ERP) ]
-  * [819f9df328fa] [REV] revert chanegs for revision no 1810
-  * [70535423260f] [FIX] loading module sequence while creating new
-    database
-
-  [ Fabien Pinckaers ]
-  * [5aa83e5bb359] [FIX] bug 369947
-  * [dcde99cd9c5e] [FIX] bug 371496
-  * [8fbad91c586e] [FIX] bug 371768 bad tooltip
-  * [f42a9ae9115b] merge
-  * [db313489098d] merge
-
-  [ dsh (Open ERP) ]
-  * [a86dc3304dde] [IMP] attributes of barcode
-
-  [ Jay (Open ERP) ]
-  * [b2dafdb68cce] [FIX] ir_translation : corrected entry insertion when
-    adding translation
-
-  [ husen daudi ]
-  * [696445ddfb83] [MERGE]
-  * [7f9d0d2dd239] [FIX] module:base made name field translatable in
-    action.server (ref:mga)
-
-  [ Jay (Open ERP) ]
-  * [ed97326339a8] [FIX] Character Truncation problem on updation solved
-
-  [ Christophe Simonis ]
-  * [0b6c92ede314] [IMP] ir_model_data: convert assert to sql constraint
-    + exception
-
-  [ Jay (Open ERP) ]
-  * [f98cc5a0bee6] [FIX] Custom report : sorted X-axis values
-  * [0cf0628f3c8a] [FIX] SQL Constraint failure error on particular
-    record while importing
-
-  [ husen daudi ]
-  * [d56bb59ca02d] [FIX] xml encoding in header for &.<.>
-  * [04d765f45692] [Merge] Converted xml reports from xmldom to etree
-    and better error message with environment information
-
-  [ Jay (Open ERP) ]
-  * [a915dc15dbfd] [FIX] User with blank password(if so) allowed to log
-    in.
-
-  [ Fabien Pinckaers ]
-  * [19e2f2b84eac] [FIX] avoid required parameters rule (domain_force)
-  * [b8d383a666e6] merge
-  * [7cdc6778acb1] merge
-  * [70c8fcdf67f2] merge
-  * [7cd04889bd27] [IMP] better error message
-
-  [ Jay (Open ERP) ]
-  * [99f3b0db73f8] [FIX] Fixed oldxml at  python2.6 for Ubuntu
-    8.0.4,9.04
-  * [14b488955652] [IMP] default_xx in context isuue
-
-  [ Fabien Pinckaers ]
-  * [15a617ecbe04] merge
-  * [26f02d120db1] [fix] launch signal after action in workflows
-
-  [ Jay (Open ERP) ]
-  * [0ff7ddcd394d] [FIX] ORM: Defult_field name in context belongs to
-    curent object only, not to its relationals anymore
-  * [843604436871] [FIX] ir_attachment preview method corrected
-
-  [ Stephane Wirtel ]
-  * [406601019f23] [MERGE]
-  * [fa17b9e5f302] [FIX] fields.related (m2o poiting to M2M/O2M should
-    be skipped during write.
-
-  [ Jay (Open ERP) ]
-  * [7feb86ed7ad4] [IMP] Temporarily commented exception for browse
-    record that broke reports from wizard
-
-  [ husen daudi ]
-  * [665433813e7f] [FIX] Bad commit
-  * [c866dcb38c74] [FIX] Added PageCount tag in report engine
-
-  [ Fabien Pinckaers ]
-  * [a79d7777c888] merge
-  * [60d6357d3b2b] modifs
-  * [9ed525cfcd51] [FIX] bug in report engine
-
-  [ Jay (Open ERP) ]
-  * [2a571396d23e] [FIX] GIF image is previewed
-
-  [ Christophe Simonis ]
-  * [cee0846dff3c] [MERGE]
-  * [d2a31d33e1b1] [FIX] upgrade doesn't try to delete modules
-  * [1376272db30b] [MERGE]
-  * [bbaad3809f36] [FIX] xml: the tag <delete> delete also the reference
-    to the deleted objects into ir_model_data
-  * [35d4aa682b36] [FIX] translation export: catch the case when a
-    object does not exists in database
-  * [1f0cb7576704] [FIX] browse_record: raise a better exception when
-    the id doesn't exists
-
-  [ dsh (Open ERP) ]
-  * [0c8fe65fe3c0] [FIX] fix &,<,> problem for html2html-url report
-  * [71298ebb40b4] [FIX] fix &,<,> problem for html2html report
-  * [58b9464b7813] [IMP] added style for the url which are as text
-
-  [ Fabien Pinckaers ]
-  * [b934dd73d408] merge
-  * [fe33fdc8df19] [FIX] translations resynchro terms
-  * [4efe96b4f584] [FIX] Bugfix translations and float/int format in
-    reports
-  * [688883ce8183] bugfix_lang_notavailabel
-
-  [ Olivier Laurent ]
-  * [bee98151efd0] [MERGE]
-  * [adf826c7285b] [IMP] base: french translations
-
-  [ Christophe Simonis ]
-  * [cf01b2f3ee31] [IMP] maintenance: complete the remarks with the
-    database name
-  * [34e10ece0768] [FIX] complete rng file
-  * [eb179c00941a] [FIX] load the module graph even if it containt only
-    "base"
-
-  [ dsh (Open ERP) ]
-  * [5f1426c9e322] bug fix(skip text if child nodes are there) for the
-    html2html and openoffice reports
-
-  [ Panos Christeas ]
-
-  [ husen daudi ]
-  * Revert bad commit
-
-  [ Christophe Simonis ]
-  * [REL] 5.0.2
-  * [MERGE]
-  * [FIX] ensure sys is imported
-
-  [ Jay (Open ERP) ]
-  * [FIX] _inherits was misbehaving on search
-
-  [ Christophe Simonis ]
-  * [FIX] pass the context to check method of 'ir.model.access'
-  * [FIX] disallow the deletion of records set as default properties
-  * [MERGE]
-  * [FIX] increase size of field "name" of ir.model.data
-  * [IMP] update french translations
-  * [IMP] update french translations
-
-  [ Jay (Open ERP) ]
-  * [REF] Unused argument removed
-
-  [ Christophe Simonis ]
-  * [IMP] update po(t) files
-
-  [ Jay (Open ERP) ]
-  * [FIX] Login : Login and password accepting accented characters
-  * [FIX] Error reporting : library error corrected
-  * [FIX] default_xxx in context was passed to relational
-    fields,corrected.
-
-  [ P. Christeas ]
-  * Fix whitespace merging, that broke logging.
-
-  [ Jay (Open ERP) ]
-  * [FIX] Print screen now displays the report as per WYSIWYG
-  * [FIX]Importation problem for bool fields corrected
-
-  [ Christophe Simonis ]
-  * [IMP] new method that ollow the server to return a message that will
-    be display on login page
-
-  [ Jay (Open ERP) ]
-  * [FIX] ir_model_data : SQL_Constraint failure covered
-  * [FIX] Accented characters are displayed on footer now
-  * [FIX] DB operations(backup,restore) process corrected,were blocked
-    if db_port was supplied
-
-  [ husen daudi ]
-  * Merged
-
-  [ Jay (Open ERP) ]
-  * [FIX] Expression calculation for Datetime Corrected
-  * [FIX] Logger notification improved
-  * [FIX] ir_model : context key deletion
-  * [FIX] Translation : Text with prefix '_' from py files included for
-    exports.
-  * [FIX] Corrected bug of expression calculation in previous commit
-
-  [ Olivier Laurent ]
-  * [FIX] sql expression: in search, add the time part to datetime field
-    when it's not present
-
-  [ P. Christeas ]
-  * email_send: feature to place mails in a maildir, instead of smtp
-  * Fix Greek translation of email "subject".
-
-  [ Olivier Laurent ]
-  * [FIX] setup.py: py2exe now adds 'zoneinfo' directory in library.zip
-
-  [ Jay (Open ERP) ]
-  * [FIX] Importation problem corrected for unicode.
-  * [IMP] Environment Information Notification  Improved
-
-  [ husen daudi ]
-  * [FIX] place tag
-
-  [ Olivier Laurent ]
-  * [MERGE]
-  * [FIX] tools.amount_to_text_en: now displays cents
-
-  [ P. Christeas ]
-  * Greek translations, shorten terms.
-
-  [ Olivier Laurent ]
-  * [MERGE]
-  * [FIX] RuntimeError in the cache system
-
-  [ Jay (Open ERP) ]
-  * [FIX] Print screen reports will behave acc. to locale for
-    date,datetime
-  * [FIX] Import : context provided for language translation
-
-  [ dsh (Open ERP) ]
-  * [FIX] size miss match for page and frame
-
-  [ husen daudi ]
-  * [FIX] removed report etree warning of len
-  * [FIX] Added sql_constraint on adding field having size<1
-
-  [ Quentin De Paoli ]
-  * [FIX] security on wokflows bugfixed. The security has to be checked
-    using the current uid, not the one that created the workflow
-    instance!
-
-  [ Harry (Open ERP) ]
-  * [FIX] export window : use context for import compatable option in
-    pass argument instend of added new argemenent
-  * [IMP] import/export : added Database ID, ID
-
-  [ P. Christeas ]
-  * [IMP] Partial restrict operator for domains.
-  * Shortcuts in RNG view definition.
-  * [IMP] Allow OS to rotate the logs, use WatchedFileHandler if needed.
-
-  [ Olivier Laurent ]
-  * [MERGE]
-  * [FIX] supply password problem with pg_dump, pg_restore on win32
-  * [IMP] french translations
-
-  [ Jay (Open ERP) ]
-  * [FIX] Certificate in non-digit format will not be accepted
-  * [FIX] Certificate in non-digit format will not be accepted
-
-  [ husen daudi ]
-  * [IMP] Improved environment information message
-
-  [ Jay (Open ERP) ]
-  * [Fix] CSV Import : Accepting 'Value' of selection field
-    from[(key,value)]
-  * [FIX] Property : Removed old referenced values from property
-
-  [ mra (Open ERP) ]
-  * [REV] revert chanegs for revision no 1810
-  * [FIX] loading module sequence while creating new database
-
-  [ Fabien Pinckaers ]
-  * [FIX] bug 369947
-  * [FIX] bug 371496
-  * [FIX] bug 371768 bad tooltip
-  * merge
-  * merge
-
-  [ dsh (Open ERP) ]
-  * [IMP] attributes of barcode
-
-  [ Jay (Open ERP) ]
-  * [FIX] ir_translation : corrected entry insertion when adding
-    translation
-
-  [ husen daudi ]
-  * [MERGE]
-  * [FIX] module:base made name field translatable in action.server
-    (ref:mga)
-
-  [ Jay (Open ERP) ]
-  * [FIX] Character Truncation problem on updation solved
-
-  [ Christophe Simonis ]
-  * [IMP] ir_model_data: convert assert to sql constraint + exception
-
-  [ Jay (Open ERP) ]
-  * [FIX] Custom report : sorted X-axis values
-  * [FIX] SQL Constraint failure error on particular record while
-    importing
-
-  [ husen daudi ]
-  * [FIX] xml encoding in header for &.<.>
-  * [Merge] Converted xml reports from xmldom to etree and better error
-    message with environment information
-
-  [ Jay (Open ERP) ]
-  * [FIX] User with blank password(if so) allowed to log in.
-
-  [ Fabien Pinckaers ]
-  * [FIX] avoid required parameters rule (domain_force)
-  * merge
-  * merge
-  * merge
-  * [IMP] better error message
-
-  [ Jay (Open ERP) ]
-  * [FIX] Fixed oldxml at  python2.6 for Ubuntu 8.0.4,9.04
-  * [IMP] default_xx in context isuue
-
-  [ Fabien Pinckaers ]
-  * merge
-  * [fix] launch signal after action in workflows
-
-  [ Jay (Open ERP) ]
-  * [FIX] ORM: Defult_field name in context belongs to curent object
-    only, not to its relationals anymore
-  * [FIX] ir_attachment preview method corrected
-
-  [ Stephane Wirtel ]
-  * [MERGE]
-  * [FIX] fields.related (m2o poiting to M2M/O2M should be skipped
-    during write.
-
-  [ Jay (Open ERP) ]
-  * [IMP] Temporarily commented exception for browse record that broke
-    reports from wizard
-
-  [ husen daudi ]
-  * [FIX] Bad commit
-  * [FIX] Added PageCount tag in report engine
-
-  [ Fabien Pinckaers ]
-  * merge
-  * modifs
-  * [FIX] bug in report engine
-
-  [ Jay (Open ERP) ]
-  * [FIX] GIF image is previewed
-
-  [ Christophe Simonis ]
-  * [MERGE]
-  * [FIX] upgrade doesn't try to delete modules
-  * [MERGE]
-  * [FIX] xml: the tag <delete> delete also the reference to the deleted
-    objects into ir_model_data
-  * [FIX] translation export: catch the case when a object does not
-    exists in database
-  * [FIX] browse_record: raise a better exception when the id doesn't
-    exists
-
-  [ dsh (Open ERP) ]
-  * [FIX] fix &,<,> problem for html2html-url report
-  * [FIX] fix &,<,> problem for html2html report
-  * [IMP] added style for the url which are as text
-
-  [ Fabien Pinckaers ]
-  * merge
-  * [FIX] translations resynchro terms
-  * [FIX] Bugfix translations and float/int format in reports
-  * bugfix_lang_notavailabel
-
-  [ Olivier Laurent ]
-  * [MERGE]
-  * [IMP] base: french translations
-
-  [ Christophe Simonis ]
-  * [IMP] maintenance: complete the remarks with the database name
-  * [FIX] complete rng file
-  * [FIX] load the module graph even if it containt only "base"
-
-  [ dsh (Open ERP) ]
-  * bug fix(skip text if child nodes are there) for the html2html and
-    openoffice reports
-
-  [ Panos Christeas ]
-
- -- Panos Christeas <p_christ@hol.gr>  Thu, 13 Aug 2009 10:21:28 +0300
-
 openerp-server (5.0.2-0-1) unstable; urgency=low
 
   * Updating standards to 3.8.1.
@@ -740,18 +191,6 @@ openerp-server (5.0.2-0-1) unstable; urgency=low
 
  -- Daniel Baumann <daniel@debian.org>  Thu, 13 Aug 2009 11:24:59 +0200
 
-openerp-server (5.0.1-0-1ubuntu2) karmic; urgency=low
-
-  * Minor updates
-
- -- Panagiotis Kranidiotis <panos@anaximandros>  Thu, 18 Jun 2009 19:05:32 +0300
-
-openerp-server (5.0.1-0-1ubuntu1) karmic; urgency=low
-
-  * New greek translations added
-
- -- Panagiotis Kranidiotis <kranidiotis@vatica.org>  Wed, 17 Jun 2009 18:45:37 +0300
-
 openerp-server (5.0.1-0-1) unstable; urgency=low
 
   * Merging upstream version 5.0.1-0.
diff --git a/debian/control b/debian/control
index 880a0761c04..0eb6cfd55ee 100644
--- a/debian/control
+++ b/debian/control
@@ -1,27 +1,30 @@
 Source: openerp-server
 Section: net
 Priority: optional
-Maintainer: Jimmy Angelakos <vyruss@hellug.gr>
-Uploaders: Daniel Baumann <daniel@debian.org>
-Build-Depends: debhelper (>= 7), po-debconf, python-dev, quilt
-Build-Depends-Indep: python-libxslt1, python-lxml, python-psycopg2
-Standards-Version: 3.8.3
+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-maintainers.org/?p=open-object/openerp-server.git
-Vcs-Git: git://git.debian-maintainers.org/git/open-object/openerp-server.git
-XSBC-Maintainer-Homepage: http://open-object.debian-maintainers.org/
+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-libxslt1, python-lxml,
- python-psycopg2, python-pydot, python-pychart, python-reportlab, python-tz
+ python-psycopg2, python-pydot, python-pychart, python-reportlab, python-tz,
+ python-pyparsing, python-yaml, python-mako, postgresql-client (>= 8.4)
 Conflicts: tinyerp-server
 Replaces: tinyerp-server
 Recommends:
- graphviz, ghostscript, postgresql, postgresql-client, python-imaging,
- python-matplotlib, python-openssl, python-pyparsing
+ graphviz, ghostscript, postgresql, python-imaging,
+ python-matplotlib
 Suggests: openerp-client
 Description: Enterprise Resource Management (server)
  Open ERP, previously known as TinyERP, is a complete ERP and CRM. The main
@@ -33,3 +36,4 @@ Description: Enterprise Resource Management (server)
  .
  This package contains the Open ERP server, install openerp-client package for
  the client.
+
diff --git a/debian/copyright b/debian/copyright
index 26494c03fc4..3f50a3a825e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,8 +1,10 @@
-Author: Tiny.be <info@tiny.be>
-Download: http://www.openerp.com/
+Upstream-Contact: OpenERP <support@openerp.com>
+Upstream-Homepage: http://www.openerp.com/
+Maintainer-Contact: Debian Open Object Maintainers <gnunet@lists.debian-maintainers.org>
+Maintainer-Homepage: http://open-object.debian-maintainers.org/
 
 Files: *
-Copyright: (C) 2004-2009 Tiny.be <info@tiny.be>
+Copyright: (C) 2004-2010 OpenERP SA. (www.openerp.com)
 License: GPL-3+
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -21,28 +23,6 @@ License: GPL-3+
  can be found in /usr/share/common-licenses/GPL-3 file.
 
 Files:
- bin/addons/gen_graph.sh
- doc/migrate/*
-Copyright: (C) 2004-2008 Tiny.be <info@tiny.be>
-License: GPL-2+
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; either version 2
- of the License, or (at your option) any later version.
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- .
- On Debian systems, the complete text of the GNU General Public License
- can be found in /usr/share/common-licenses/GPL-2 file.
-
-Files:
  bin/addons/account/report/general_ledger.py
  bin/addons/account/report/general_ledger_landscape.py
  bin/addons/account/wizard/wizard_statement_from_invoice.py
@@ -226,7 +206,7 @@ License: other
  permission.
 
 Files: debian/*
-Copyright: (C) 2005-2009 Daniel Baumann <daniel@debian.org>
+Copyright: (C) 2005-2010 Daniel Baumann <daniel@debian.org>
 License: GPL-3+
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
diff --git a/debian/openerp-server.README.Debian b/debian/openerp-server.README.Debian
index 39dede87780..af298134af8 100644
--- a/debian/openerp-server.README.Debian
+++ b/debian/openerp-server.README.Debian
@@ -15,7 +15,7 @@ explanation how to achieve this (you need to execute all commands as root):
 
   1. Creating the database user
 
-     # su - postgres -c "createuser -q --createdb --no-createrole --pwprompt openerp"
+     # su - postgres -c "createuser --createdb --no-createrole --pwprompt openerp"
 
      Note: If you want to run the database as another user than 'openerp', you
      need to replace 'openerp' above with the user you want instead, and you
diff --git a/debian/openerp-server.init b/debian/openerp-server.init
index e981d2cffe8..1f5c8822175 100644
--- a/debian/openerp-server.init
+++ b/debian/openerp-server.init
@@ -2,8 +2,8 @@
 
 ### BEGIN INIT INFO
 # Provides:		openerp-server
-# Required-Start:	$syslog
-# Required-Stop:	$syslog
+# Required-Start:	$remote_fs $syslog
+# Required-Stop:	$remote_fs $syslog
 # Should-Start:		$network
 # Should-Stop:		$network
 # Default-Start:	2 3 4 5
@@ -29,7 +29,8 @@ case "${1}" in
 
 		start-stop-daemon --start --quiet --pidfile /var/run/${NAME}.pid \
 			--chuid ${USER} --background --make-pidfile \
-			--exec ${DAEMON} -- --config=/etc/openerp-server.conf
+			--exec ${DAEMON} -- --config=/etc/openerp-server.conf \
+			    --logfile=/var/log/openerp-server.log
 
 		echo "${NAME}."
 		;;
@@ -53,7 +54,8 @@ case "${1}" in
 
 		start-stop-daemon --start --quiet --pidfile /var/run/${NAME}.pid \
 			--chuid ${USER} --background --make-pidfile \
-			--exec ${DAEMON} -- --config=/etc/openerp-server.conf
+			--exec ${DAEMON} -- --config=/etc/openerp-server.conf \
+			    --logfile=/var/log/openerp-server.log
 
 		echo "${NAME}."
 		;;
diff --git a/debian/openerp-server.install b/debian/openerp-server.install
index ccfbbb27fd6..78a4a648a06 100644
--- a/debian/openerp-server.install
+++ b/debian/openerp-server.install
@@ -1 +1 @@
-debian/local/openerp-server.conf	/etc
+doc/openerp-server.conf		/etc
diff --git a/debian/po/es.po b/debian/po/es.po
index 46d906b1248..2907d11b885 100644
--- a/debian/po/es.po
+++ b/debian/po/es.po
@@ -9,8 +9,8 @@ msgstr ""
 "Report-Msgid-Bugs-To: openerp-server@packages.debian.org\n"
 "POT-Creation-Date: 2009-08-24 22:41+0300\n"
 "PO-Revision-Date: 2009-12-14 06:11+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) <jesteve@zikzakmedia."
+"com>\n"
 "Language-Team: Spanish <debian-l10n-spanish@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/debian/po/es_CL.po b/debian/po/es_CL.po
new file mode 100644
index 00000000000..294a945017c
--- /dev/null
+++ b/debian/po/es_CL.po
@@ -0,0 +1,39 @@
+# Spanish (Chile) translation for openobject-server
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-server package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-server\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-24 22:41+0300\n"
+"PO-Revision-Date: 2011-01-19 14:33+0000\n"
+"Last-Translator: Juan Pizarro <jpizarrom@gmail.com>\n"
+"Language-Team: Spanish (Chile) <es_CL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-01-20 04:50+0000\n"
+"X-Generator: Launchpad (build 12177)\n"
+
+#. Type: string
+#. Description
+#: ../openerp-server.templates:1001
+msgid "Dedicated system account for the Open ERP server:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../openerp-server.templates:1001
+msgid ""
+"The Open ERP server must use a dedicated account for its operation so that "
+"the system's security is not compromised by running it with superuser "
+"privileges."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../openerp-server.templates:1001
+msgid "Please choose that account's username."
+msgstr ""
diff --git a/debian/po/hu.po b/debian/po/hu.po
new file mode 100644
index 00000000000..077a894a031
--- /dev/null
+++ b/debian/po/hu.po
@@ -0,0 +1,42 @@
+# Hungarian translation for openobject-server
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-server package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-server\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-24 22:41+0300\n"
+"PO-Revision-Date: 2011-01-12 09:45+0000\n"
+"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\n"
+"Language-Team: Hungarian <hu@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-01-13 04:40+0000\n"
+"X-Generator: Launchpad (build 12177)\n"
+
+#. Type: string
+#. Description
+#: ../openerp-server.templates:1001
+msgid "Dedicated system account for the Open ERP server:"
+msgstr "Dedikált rendszer felhasználó az Open ERP szerver számára:"
+
+#. Type: string
+#. Description
+#: ../openerp-server.templates:1001
+msgid ""
+"The Open ERP server must use a dedicated account for its operation so that "
+"the system's security is not compromised by running it with superuser "
+"privileges."
+msgstr ""
+"Az Open ERP szervernek egy dedikált felhasználóként kell futnia, így a "
+"rendszer biztonsága védettebb, mivel nem rendszergazda felhasználó jogaival "
+"fut."
+
+#. Type: string
+#. Description
+#: ../openerp-server.templates:1001
+msgid "Please choose that account's username."
+msgstr "Kérem válassza ki annak a felhasználónak a nevét."
diff --git a/debian/po/ja.po b/debian/po/ja.po
index 20e0bc105be..5b2b9730802 100644
--- a/debian/po/ja.po
+++ b/debian/po/ja.po
@@ -30,7 +30,8 @@ msgid ""
 "the system's security is not compromised by running it with superuser "
 "privileges."
 msgstr ""
-"Open ERP サーバはその動作について専用のアカウントを使うようになっているため、管理者特権で動作していてもシステムのセキュリティは侵害されません。"
+"Open ERP サーバはその動作について専用のアカウントを使うようになっているため、"
+"管理者特権で動作していてもシステムのセキュリティは侵害されません。"
 
 #. Type: string
 #. Description
diff --git a/debian/po/zh_CN.po b/debian/po/zh_CN.po
index 243dc2a4a40..a1480f2a01a 100644
--- a/debian/po/zh_CN.po
+++ b/debian/po/zh_CN.po
@@ -29,7 +29,9 @@ msgid ""
 "The Open ERP server must use a dedicated account for its operation so that "
 "the system's security is not compromised by running it with superuser "
 "privileges."
-msgstr "Open ERP 服务器必须使用一个专用的账户来进行操作，这样就不会因为使用超级用户权限运行而破坏系统的安全。"
+msgstr ""
+"Open ERP 服务器必须使用一个专用的账户来进行操作，这样就不会因为使用超级用户权"
+"限运行而破坏系统的安全。"
 
 #. Type: string
 #. Description
diff --git a/debian/rules b/debian/rules
index 1e598f4d580..dafe2c3b906 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,80 +1,39 @@
 #!/usr/bin/make -f
 
-SHELL := sh -e
+EXTRA_MODULES_PATH ?= ../addons
 
+%:
+	dh  ${@}
 
-update:
-	# Needs: shell-helper
+override_dh_auto_clean:
+	dh_auto_clean
 
-	cd debian; \
-	debconf-create-preseed *.config; \
+	rm -rf build
 
-	for FILE in debian/*.preseed; \
-	do \
-		grep -v preseed $$FILE > $$FILE.tmp; \
-		mv $$FILE.tmp $$FILE; \
-		echo $$FILE >> debian/`basename $$FILE .preseed`.examples; \
-	done
-
-clean: clean-patched unpatch
-clean-patched: patch
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp
-
-	NO_CHECK_MODULES=1 python setup.py clean
-	rm -rf build openerp-server
-	-find $(CURDIR) -type f -name "*.pyc" | xargs rm -f
-
-	debconf-updatepo
-
-	dh_clean
-
-build:
-
-install: patch
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
-
-	NO_CHECK_MODULES=1 python setup.py install --no-compile --prefix=$(CURDIR)/debian/openerp-server/usr
+override_dh_auto_install:
+	# Adding ALL addons to the server package
+	if [ -d "${EXTRA_MODULES_PATH}" ] ; then \
+	    cd ${EXTRA_MODULES_PATH} ; \
+		echo > server_modules.list ; \
+	        for ADD_DIR in * ; do \
+	            [ -d "$$ADD_DIR" ] && [ -r "$$ADD_DIR"/__openerp__.py ] && echo "$$ADD_DIR" >> server_modules.list ; \
+		done ; \
+	fi
+	NO_CHECK_MODULES=1 python setup.py install --install-layout=deb --no-compile --root=$(CURDIR)/debian/openerp-server
 
 	# Adjusting program location
-	sed -i -e 's|cd .*python.*/site-packages|cd /usr/lib|' debian/openerp-server/usr/bin/openerp-server
-	mv debian/openerp-server/usr/lib/python*/site-packages/openerp-server debian/openerp-server/usr/lib
-	rm -rf debian/openerp-server/usr/lib/python*
-
-	# Fixing permissions
-	find debian/openerp-server/usr/lib/openerp-server/addons -type f -print0 | xargs -0 chmod 0644
+	sed -i -e 's|cd .*|cd /usr/share/pyshared/openerp-server|' debian/openerp-server/usr/bin/openerp-server
 
 	# Removing double files
 	rm -rf debian/openerp-server/usr/share/doc/openerp-server-*
 
-binary: binary-indep
+override_dh_fixperms:
+	dh_fixperms
 
-binary-arch:
+	find debian/openerp-server/usr/share/pyshared/openerp-server/addons -type f -print0 | xargs -0 chmod 0644
 
-binary-indep: install
-	dh_testdir
-	dh_testroot
+override_dh_installchangelogs:
 	dh_installchangelogs doc/Changelog
-	dh_installdocs
-	dh_installexamples
-	dh_install
-	dh_installinit --update-rcd-params='defaults 21'
-	dh_installdebconf
-	dh_lintian
-	dh_link
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
 
-patch:
-	
-unpatch:
-	
-.PHONY: clean build install binary binary-arch binary-indep patch unpatch
+override_dh_installinit:
+	dh_installinit --update-rcd-params='defaults 21'
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 00000000000..d3827e75a5c
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+1.0