Merge commit '1b1682894f7c199bc6be' into deb-scripts

Conflicts:
	debian/rules

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

1 files changed, 14 insertions, 62 deletions

diff --git a/debian/rules b/debian/rules
index f3684ed8707..62b338218be 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,77 +1,29 @@
 #!/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:
+	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-*
 
-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_installexamples
-	dh_install
-	dh_installinit --update-rcd-params='defaults 21'
-	dh_installdebconf
-	dh_lintian
-	dh_link
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
 
-.PHONY: clean build install binary binary-arch binary-indep
+override_dh_installinit:
+	dh_installinit --update-rcd-params='defaults 21'