[MERGE] merge with latest stable

[odoo/odoo.git] / debian / rules

diff --git a/debian/rules b/debian/rules
index f3a9000..dafe2c3 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,63 +1,39 @@
 #!/usr/bin/make -f
 
-# include /usr/share/quilt/quilt.make
+EXTRA_MODULES_PATH ?= ../addons
 
-clean: clean-patched unpatch
-clean-patched: patch
-       dh_testdir
-       dh_testroot
-       rm -f build-stamp
+%:
+       dh  ${@}
 
-       NO_CHECK_MODULES=1 python setup.py clean
+override_dh_auto_clean:
+       dh_auto_clean
 
-       rm -rf build openerp-server
-       -find $(CURDIR) -type f -name "*.pyc" | xargs rm -f
+       rm -rf build
 
-       dh_clean
-
-build:
-
-install: patch
-       dh_testdir
-       dh_testroot
-       dh_prep
-       dh_installdirs
-
-       NO_CHECK_MODULES=1 python setup.py install --no-compile --prefix=$(CURDIR)/debian/openerp-server/usr
+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 .*python.*/site-packages|cd /usr/lib|' debian/openerp-server/usr/bin/openerp-server
-       mv debian/openerp-server/usr/lib/python*/site-packages/openerp-server debian/openerp-server/usr/lib
-       rm -rf debian/openerp-server/usr/lib/python*
-
-       # Fixing permissions
-       find debian/openerp-server/usr/lib/openerp-server/addons -type f -print0 | xargs -0 chmod 0644
+       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-*
 
-binary: binary-indep
+override_dh_fixperms:
+       dh_fixperms
 
-binary-arch:
+       find debian/openerp-server/usr/share/pyshared/openerp-server/addons -type f -print0 | xargs -0 chmod 0644
 
-binary-indep: install
-       dh_testdir
-       dh_testroot
+override_dh_installchangelogs:
        dh_installchangelogs doc/Changelog
-       dh_installdocs
-       dh_install
+
+override_dh_installinit:
        dh_installinit --update-rcd-params='defaults 21'
-       dh_lintian
-       dh_link
-       dh_compress
-       dh_fixperms
-       dh_installdeb
-       dh_gencontrol
-       dh_md5sums
-       dh_builddeb
-
-patch:
-       
-unpatch:
-       
-.PHONY: clean build install binary binary-arch binary-indep patch unpatch