[Python-apps-commits] r8107 - in packages/openerp6/trunk (debian debian/control debian/rules)

[xnox-guest at users.alioth.debian.org]

    Date: Monday, January 23, 2012 @ 23:09:39
  Author: xnox-guest
Revision: 8107

Improve error msg about missing componenets

Modified:
  packages/openerp6/trunk/debian/	(properties)
  packages/openerp6/trunk/debian/control
  packages/openerp6/trunk/debian/rules

Modified: packages/openerp6/trunk/debian/control
===================================================================
--- packages/openerp6/trunk/debian/control	2012-01-23 19:12:45 UTC (rev 8106)
+++ packages/openerp6/trunk/debian/control	2012-01-23 23:09:39 UTC (rev 8107)
@@ -14,6 +14,7 @@
 
 Package: openerp6-server
 Architecture: all
+Pre-Depends: dpkg (>= 1.15.6)
 Depends:
  ${python:Depends}, ${misc:Depends}, adduser, python, python-dateutil, python-libxslt1,
  python-lxml, python-psycopg2, python-pydot, python-pychart, python-reportlab,
@@ -38,6 +39,7 @@
 
 Package: openerp6-web
 Architecture: all
+Pre-Depends: dpkg (>= 1.15.6)
 Depends:
  ${misc:Depends}, ${python:Depends}, adduser, libjs-mochikit (>= 1.4),
  libjs-mootools, python-beaker (>= 1.1), python-cherrypy3 (>= 3.1.2),
@@ -60,6 +62,7 @@
  package for the desktop client.
 
 Package: openerp6-client
+Pre-Depends: dpkg (>= 1.15.6)
 Architecture: all
 Depends:
  ${misc:Depends}, ${python:Depends}, python-glade2, python-gtk2, python-pydot, python-tz,

Modified: packages/openerp6/trunk/debian/rules
===================================================================
--- packages/openerp6/trunk/debian/rules	2012-01-23 19:12:45 UTC (rev 8106)
+++ packages/openerp6/trunk/debian/rules	2012-01-23 23:09:39 UTC (rev 8107)
@@ -15,6 +15,17 @@
 override_dh_auto_build override_dh_auto_install:
 override_dh_auto_test:
 
+override_dh_testdir:
+	#
+	# Checking for unpacked tarball components
+	# if below fails try running
+	#
+	# ./debian/rules unpack-tarball-components
+	#
+	# to fetch & unpack & rename components
+	#
+	dh_testdir ./web/ ./client/
+
 override_dh_python2:
 	dh_python2 /usr/share/openerp6
 
@@ -37,7 +48,8 @@
 	dh_installchangelogs doc/Changelog
 
 override_dh_builddeb:
-	dh_builddeb -- -Zlzma
+	# because addons are HUGE
+	dh_builddeb -- -Zxz
 
 override_dh_fixperms:
 	dh_fixperms
@@ -88,11 +100,15 @@
 uscan_options:= --no-conf --force-download --no-symlink --destdir . --package $(package) --upstream-version $(package_vers) --download-current-version
 debian_dir:=$(dir $(firstword $(MAKEFILE_LIST)))
 get-orig-source:
-	uscan $(uscan_options) --watchfile $(debian_dir)watch
-	uscan $(uscan_options) --watchfile $(debian_dir)watch.client
-	uscan $(uscan_options) --watchfile $(debian_dir)watch.web
+	find . -name 'watch*' | xargs -t -I {} uscan $(uscan_options) --watchfile {} 1>/dev/null
 	mv openerp-server-$(package_vers).tar.gz $(package_name).orig.tar.gz
-	mv openerp-client-$(package_vers).tar.gz $(package_name).orig-client.tar.gz
-	mv openerp-web-$(package_vers).tar.gz $(package_name).orig-web.tar.gz
+	printf 'client\nweb\n' | xargs -t -I {} mv openerp-{}-$(package_vers).tar.gz $(package_name).orig-{}.tar.gz
 
-.PHONY: stable-updates generate-config get-orig-source debian/patches/series
+unpack-tarball-components:
+	printf 'client\nweb\n' | xargs -t -I {} rm -rf {}
+	printf 'client\nweb\n' | xargs -t -I {} uscan $(uscan_options) --watchfile $(debian_dir)watch.{}
+	printf 'client\nweb\n' | xargs -t -I {} tar xf openerp-{}-$(package_vers).tar.gz
+	printf 'client\nweb\n' | xargs -t -I {} mv openerp-{}-$(package_vers) {}
+	printf 'client\nweb\n' | xargs -t -I {} rm -rf openerp-{}-$(package_vers).tar.gz
+
+.PHONY: stable-updates generate-config get-orig-source debian/patches/series unpack-tarball-components