Merge commit '1b1682894f7c199bc6be' into deb-scripts

Conflicts:
	debian/rules

bzr revid: p_christ@hol.gr-20101019103607-dztha2agnnlt8jzx

diff --cc debian/rules
index f3684ed,a0f68be..62b3382
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -1,53 -1,18 +1,18 @@@
  #!/usr/bin/make -f
  
- SHELL := sh -e
+ %:
+       dh --with quilt ${@}
  
- include /usr/share/quilt/quilt.make
+ override_dh_auto_clean:
+       dh_auto_clean
  
- update:
-       # Needs: shell-helper
+       rm -rf build
  
-       cd debian; \
-       debconf-create-preseed *.config; \
- 
-       for FILE in debian/*.preseed; \
-       do \
-               grep -v preseed $$FILE > $$FILE.tmp; \
-               mv $$FILE.tmp $$FILE; \
-               echo $$FILE >> debian/`basename $$FILE .preseed`.examples; \
-       done
- 
- clean: clean-patched unpatch
- clean-patched: patch
-       dh_testdir
-       dh_testroot
-       rm -f build-stamp
- 
-       NO_CHECK_MODULES=1 python setup.py clean
-       rm -rf build openerp-server
-       -find $(CURDIR) -type f -name "*.pyc" | xargs rm -f
- 
-       debconf-updatepo
- 
-       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:
 -      python setup.py install --install-layout=deb --no-compile --prefix=$(CURDIR)/debian/openerp-server/usr
++      NO_CHECK_MODULES=1 python setup.py install --install-layout=deb --no-compile --prefix=$(CURDIR)/debian/openerp-server/usr
  
        # 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-*