6 files changed, 14 insertions, 18 deletions
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