From dab2f608000617ca501fd1e0f9fed8cdd3736a59 Mon Sep 17 00:00:00 2001 From: Vo Minh Thu Date: Mon, 28 Mar 2011 14:29:58 +0200 Subject: [PATCH] [REF] debian: - removed no more needed patches - added python-dateutil as dependency - removed code to specify modules to add in the server - added the debian directory to the setup.py sdist bzr revid: vmt@openerp.com-20110328122958-x0jsdd8i3bsvjc81 --- MANIFEST.in | 1 + debian/control | 7 ++++--- debian/patches/01-autobuild.patch | 15 --------------- debian/patches/02-migrate.patch | 15 --------------- debian/patches/03-shebang.patch | 12 ------------ debian/patches/series | 0 debian/rules | 27 --------------------------- 7 files changed, 5 insertions(+), 72 deletions(-) delete mode 100644 debian/patches/01-autobuild.patch delete mode 100644 debian/patches/02-migrate.patch delete mode 100644 debian/patches/03-shebang.patch delete mode 100644 debian/patches/series diff --git a/MANIFEST.in b/MANIFEST.in index ef075736fe4..6cd10b511cf 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -13,5 +13,6 @@ recursive-include pixmaps *bmp *ico *png recursive-include win32 *.py *.bat recursive-include openerp *css *csv *html *png *po *pot recursive-include openerp *rml *rng *sql *sxw *xml *xsl *yml +graft debian graft doc global-exclude *pyc *~ # Exclude possible garbage from previous graft. diff --git a/debian/control b/debian/control index 5aa00c8885b..d2fca92b5d8 100644 --- a/debian/control +++ b/debian/control @@ -17,9 +17,10 @@ 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-pyparsing, python-yaml, python-mako, postgresql-client (>= 8.2) + ${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: diff --git a/debian/patches/01-autobuild.patch b/debian/patches/01-autobuild.patch deleted file mode 100644 index abdd197247b..00000000000 --- a/debian/patches/01-autobuild.patch +++ /dev/null @@ -1,15 +0,0 @@ -Author: Daniel Baumann -Description: Disable modules check to make it buildable without X11. - -diff -Naurp openerp-server.orig/setup.py openerp-server/setup.py ---- openerp-server.orig/setup.py 2009-06-08 15:51:20.000000000 +0000 -+++ openerp-server/setup.py 2009-07-26 10:27:49.000000000 +0000 -@@ -121,7 +121,7 @@ def data_files(): - - return files - --check_modules() -+#check_modules() - - f = file('openerp-server','w') - start_script = """#!/bin/sh\necho "OpenERP Setup - The content of this file is generated at the install stage\n" """ diff --git a/debian/patches/02-migrate.patch b/debian/patches/02-migrate.patch deleted file mode 100644 index 3004042cb5b..00000000000 --- a/debian/patches/02-migrate.patch +++ /dev/null @@ -1,15 +0,0 @@ -Author: Brian DeRocher -Description: Correct SQL syntax in migrate script (Closes: #467517). - -diff -Naurp openerp-server.orig/doc/migrate/3.4.0-4.0.0/pre.py openerp-server/doc/migrate/3.4.0-4.0.0/pre.py ---- openerp-server.orig/doc/migrate/3.4.0-4.0.0/pre.py 2008-11-03 21:33:56.000000000 +0000 -+++ openerp-server/doc/migrate/3.4.0-4.0.0/pre.py 2008-11-09 09:09:49.000000000 +0000 -@@ -123,7 +123,7 @@ cr.commit() - - for line in ( - "ALTER TABLE ir_module_module ADD demo BOOLEAN", -- "ALTER TABLE ir_module_module SET demo DEFAULT False", -+ "ALTER TABLE ir_module_module alter column demo set DEFAULT False", - "DELETE FROM ir_values WHERE VALUE LIKE '%,False'", - """UPDATE ir_ui_view set arch='' where name='ir.ui.menu.tree' and type='tree' and field_parent='child_id'""", - ): diff --git a/debian/patches/03-shebang.patch b/debian/patches/03-shebang.patch deleted file mode 100644 index 68818e1f733..00000000000 --- a/debian/patches/03-shebang.patch +++ /dev/null @@ -1,12 +0,0 @@ -Author: Daniel Baumann -Description: Correcting shebang. - -diff -Naurp openerp-server.orig/bin/addons/document/ftpserver/ftpserver.py openerp-server/bin/addons/document/ftpserver/ftpserver.py ---- openerp-server.orig/bin/addons/document/ftpserver/ftpserver.py 2009-05-30 10:14:37.000000000 +0000 -+++ openerp-server/bin/addons/document/ftpserver/ftpserver.py 2009-05-30 11:02:00.000000000 +0000 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python - # -*- encoding: utf-8 -*- - # ftpserver.py - # diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/debian/rules b/debian/rules index dafe2c3b906..30ce14141e4 100755 --- a/debian/rules +++ b/debian/rules @@ -5,33 +5,6 @@ EXTRA_MODULES_PATH ?= ../addons %: dh ${@} -override_dh_auto_clean: - dh_auto_clean - - rm -rf build - -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 .*|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-* - -override_dh_fixperms: - dh_fixperms - - find debian/openerp-server/usr/share/pyshared/openerp-server/addons -type f -print0 | xargs -0 chmod 0644 - override_dh_installchangelogs: dh_installchangelogs doc/Changelog