Skip to content

Commit

Permalink
[REF] debian:
Browse files Browse the repository at this point in the history
- 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
  • Loading branch information
Vo Minh Thu committed Mar 28, 2011
1 parent b815396 commit dab2f60
Show file tree
Hide file tree
Showing 7 changed files with 5 additions and 72 deletions.
1 change: 1 addition & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -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.
7 changes: 4 additions & 3 deletions debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
15 changes: 0 additions & 15 deletions debian/patches/01-autobuild.patch

This file was deleted.

15 changes: 0 additions & 15 deletions debian/patches/02-migrate.patch

This file was deleted.

12 changes: 0 additions & 12 deletions debian/patches/03-shebang.patch

This file was deleted.

Empty file removed debian/patches/series
Empty file.
27 changes: 0 additions & 27 deletions debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit dab2f60

Please sign in to comment.