From 8d7a2aff58cfa3a8612c5ce4d9c658409f396dff Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Mon, 3 Oct 2011 03:17:35 +0200
Subject: [PATCH] [IMP] packaging debian

bzr revid: al@openerp.com-20111003011735-02q79s36os3wltm6
---
 debian/control                   |  7 ++-----
 debian/openerp.install           |  2 +-
 debian/openerp.lintian-overrides |  7 -------
 debian/openerp.postinst          |  2 --
 debian/rules                     | 13 +++++++++++--
 debian/source/format             |  1 -
 install/openerp-server.conf      | 27 ---------------------------
 7 files changed, 14 insertions(+), 45 deletions(-)
 delete mode 100644 debian/openerp.lintian-overrides
 delete mode 100644 debian/source/format

diff --git a/debian/control b/debian/control
index 7c1da67d3cf..ca7131c1508 100644
--- a/debian/control
+++ b/debian/control
@@ -2,13 +2,10 @@ Source: openerp
 Section: net
 Priority: optional
 Maintainer: OpenERP SA <al@openerp.com>
-Build-Depends: debhelper (>= 7.0.50~), python
-Build-Depends-Indep:
- python-libxslt1, python-lxml, python-pychart, python-pydot, python-psycopg2,
- python-reportlab
+Build-Depends: debhelper (>= 7.0.50~), python, rsync
 Standards-Version: 3.9.1
 Homepage: http://www.openerp.com/
-Vcs-Bzr: https://code.launchpad.net/openobject
+Vcs-Bzr: https://launchpad.net/openobject
 
 Package: openerp
 Section: net
diff --git a/debian/openerp.install b/debian/openerp.install
index 78a4a648a06..511075fb7c9 100644
--- a/debian/openerp.install
+++ b/debian/openerp.install
@@ -1 +1 @@
-doc/openerp-server.conf		/etc
+install/openerp-server.conf /etc/openerp
diff --git a/debian/openerp.lintian-overrides b/debian/openerp.lintian-overrides
deleted file mode 100644
index 25b1165c4be..00000000000
--- a/debian/openerp.lintian-overrides
+++ /dev/null
@@ -1,7 +0,0 @@
-# Add-on directories needs data directories, and sometimes they are
-# (intentionally) empty, hence overriting the lintian warning.
-openerp-server: package-contains-empty-directory
-# Add-on directoires contain images sometimes, but it's nothing that is
-# worthwile to be splittet out to /usr/share as it's all manual work for each
-# release.
-openerp-server: image-file-in-usr-lib
diff --git a/debian/openerp.postinst b/debian/openerp.postinst
index bbeee2a15f7..edb6c16450f 100644
--- a/debian/openerp.postinst
+++ b/debian/openerp.postinst
@@ -2,8 +2,6 @@
 
 set -e
 
-. /usr/share/debconf/confmodule
-
 CONFFILE="/etc/openerp.conf"
 FILESTORE="/var/lib/openerp/filestore"
 LOGFILE="/var/log/openerp.log"
diff --git a/debian/rules b/debian/rules
index 52d395fd86e..7d8b210d1ba 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,18 @@
 #!/usr/bin/make -f
 
-EXTRA_MODULES_PATH ?= ../addons
-
 %:
 	dh  ${@}
 
+override_dh_pysupport:
+	echo "rsync"
+	sh -c "[ -d debian/openerp/usr/lib/python2.6 ] && rsync -av openerp/ debian/openerp/usr/lib/python2.6/dist-packages/openerp/" || true
+	sh -c "[ -d debian/openerp/usr/lib/python2.7 ] && rsync -av openerp/ debian/openerp/usr/lib/python2.7/dist-packages/openerp/" || true
+	rm -Rf debian/openerp/usr/openerp debian/openerp/usr/lib/python2.6/dist-packages/tests debian/openerp/usr/lib/python2.7/dist-packages/tests
+	dh_pysupport
+	rm -Rf debian/openerp/usr/lib
+
+
+
 override_dh_installinit:
 	dh_installinit --update-rcd-params='defaults 21'
+
diff --git a/debian/source/format b/debian/source/format
deleted file mode 100644
index d3827e75a5c..00000000000
--- a/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-1.0
diff --git a/install/openerp-server.conf b/install/openerp-server.conf
index 4f13c8a45c2..ead261e5218 100644
--- a/install/openerp-server.conf
+++ b/install/openerp-server.conf
@@ -1,34 +1,7 @@
 [options]
-without_demo = True
 ; This is the password that allows database operations:
 ; admin_passwd = admin
-upgrade = False
-verbose = False
-netrpc = True
-; netrpc_interface = 
-; netrpc_port = 
-xmlrpc = True
-; xmlrpc_interface = 
-xmlrpc_port = 8069
 db_host = False
 db_port = False
-; Please uncomment the following line *after* you have created the
-; database. It activates the auto module check on startup.
-; db_name = terp
 db_user = openerp
 db_password = False
-; Uncomment these for xml-rpc over SSL
-; secure = True
-; secure_cert_file = /etc/openerp/server.cert
-; secure_pkey_file = /etc/openerp/server.key
-root_path = None
-soap = False
-translate_modules = ['all']
-demo = {}
-addons_path = None
-reportgz = False
-
-; Static http parameters
-static_http_enable = False
-static_http_document_root = /var/www/html
-static_http_url_prefix = /
\ No newline at end of file