[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
This commit is contained in:
parent
b815396f06
commit
dab2f60800
|
@ -13,5 +13,6 @@ recursive-include pixmaps *bmp *ico *png
|
||||||
recursive-include win32 *.py *.bat
|
recursive-include win32 *.py *.bat
|
||||||
recursive-include openerp *css *csv *html *png *po *pot
|
recursive-include openerp *css *csv *html *png *po *pot
|
||||||
recursive-include openerp *rml *rng *sql *sxw *xml *xsl *yml
|
recursive-include openerp *rml *rng *sql *sxw *xml *xsl *yml
|
||||||
|
graft debian
|
||||||
graft doc
|
graft doc
|
||||||
global-exclude *pyc *~ # Exclude possible garbage from previous graft.
|
global-exclude *pyc *~ # Exclude possible garbage from previous graft.
|
||||||
|
|
|
@ -17,9 +17,10 @@ Package: openerp-server
|
||||||
Section: net
|
Section: net
|
||||||
Architecture: all
|
Architecture: all
|
||||||
Depends:
|
Depends:
|
||||||
${misc:Depends}, adduser, python, python-libxslt1, python-lxml,
|
${misc:Depends}, adduser, python, python-dateutil, python-libxslt1,
|
||||||
python-psycopg2, python-pydot, python-pychart, python-reportlab, python-tz,
|
python-lxml, python-psycopg2, python-pydot, python-pychart, python-reportlab,
|
||||||
python-pyparsing, python-yaml, python-mako, postgresql-client (>= 8.2)
|
python-tz, python-pyparsing, python-yaml, python-mako,
|
||||||
|
postgresql-client (>=8.2)
|
||||||
Conflicts: tinyerp-server
|
Conflicts: tinyerp-server
|
||||||
Replaces: tinyerp-server
|
Replaces: tinyerp-server
|
||||||
Recommends:
|
Recommends:
|
||||||
|
|
|
@ -1,15 +0,0 @@
|
||||||
Author: Daniel Baumann <daniel@debian.org>
|
|
||||||
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" """
|
|
|
@ -1,15 +0,0 @@
|
||||||
Author: Brian DeRocher <brian@derocher.org>
|
|
||||||
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='<?xml version="1.0"?><tree string="Menu" toolbar="1"><field icon="icon" name="name"/></tree>' where name='ir.ui.menu.tree' and type='tree' and field_parent='child_id'""",
|
|
||||||
):
|
|
|
@ -1,12 +0,0 @@
|
||||||
Author: Daniel Baumann <daniel@debian.org>
|
|
||||||
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
|
|
||||||
#
|
|
|
@ -5,33 +5,6 @@ EXTRA_MODULES_PATH ?= ../addons
|
||||||
%:
|
%:
|
||||||
dh ${@}
|
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:
|
override_dh_installchangelogs:
|
||||||
dh_installchangelogs doc/Changelog
|
dh_installchangelogs doc/Changelog
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue