[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: [email protected]
microscaler · Mar 28, 2011 · dab2f60 · dab2f60
1 parent b815396
commit dab2f60
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 72 deletions.
diff --git 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
@@ -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
diff --git a/debian/patches/02-migrate.patch b/debian/patches/02-migrate.patch
diff --git a/debian/patches/03-shebang.patch b/debian/patches/03-shebang.patch
diff --git a/debian/patches/series b/debian/patches/series
diff --git 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