Merge lp:~nuclearbob/utah/parser-packaging into lp:utah

[Max Brustkern]

This change adds a utah-common package that contains the python module egg and __init__.py. utah-client and utah-parser both depend on the common package, so they can both get __init__.py without conflicting.

[Joe Talbott (joetalbott)]

Looks good. Thanks.

review: Approve

=== modified file 'debian/control'
--- debian/control	2012-11-29 15:31:48 +0000
+++ debian/control	2012-11-30 14:33:34 +0000
@@ -25,14 +25,20 @@
 Package: utah-client
 Architecture: all
 Depends: ${misc:Depends}, ${python:Depends},
-         bzr, python-jsonschema (>= 0.5~), python-yaml
+         bzr, python-jsonschema (>= 0.5~), python-yaml, utah-common
 Recommends: git
 Description: Ubuntu Test Automation Harness Client
  Automation framework for testing in Ubuntu, client portion
+
+Package: utah-common
+Architecture: all
+Depends: ${misc:Depends}, ${python:Depends}
+Description: Ubuntu Test Automation Harness Common Files
+ Automation framework for testing in Ubuntu, common files
  
 Package: utah-parser
 Architecture: all
 Depends: ${misc:Depends}, ${python:Depends},
-         python-jsonschema (>= 0.5~), python-yaml
+         python-jsonschema (>= 0.5~), python-yaml, utah-common
 Description: Ubuntu Test Automation Harness Parser
  Automation framework for testing in Ubuntu, result parser
 
=== modified file 'debian/rules'
--- debian/rules	2012-11-29 15:31:48 +0000
+++ debian/rules	2012-11-30 14:33:34 +0000
@@ -21,13 +21,16 @@
 	# utah-parser lives in that tree as well
 	# utah should only install the provisioning subdirectory, and utah-client should install everything else
 	# except parser.py, which is now its own package
-	# If we just use dh_auto_install, both packages will get everything
+	# and __init__.py, which is now in the common package
+	# If we just use dh_auto_install, all packages will get everything
 	# We start by building the whole thing
 	set -e && for pyvers in $(PYVERS); do python$$pyvers setup.py install --install-layout=deb --root=$(CURDIR); done
 	# Next, we move the built provisioning directory aside for later use
 	mv build/*/utah/provisioning .
 	# Same with parser.py
 	mv build/*/utah/parser.py .
+	# And __init__.py
+	mv build/*/utah/__init__.py .
 	# Now we install into the utah-client directory, since provisioning is removed, using --skip-build to not rebuild it
 	set -e && for pyvers in $(PYVERS); do python$$pyvers setup.py install --skip-build --install-layout=deb --root=$(CURDIR)/debian/utah-client; done
 	# Now we remove everything we don't want in the utah package (i.e., everything that's still there)
@@ -40,6 +43,10 @@
 	rm -r build/*/utah/*
 	mv parser.py build/*/utah
 	set -e && for pyvers in $(PYVERS); do python$$pyvers setup.py install --skip-build --install-layout=deb --root=$(CURDIR)/debian/utah-parser; done
+	# And now we put back the init file and install that
+	rm -r build/*/utah/*
+	mv __init__.py build/*/utah
+	set -e && for pyvers in $(PYVERS); do python$$pyvers setup.py install --skip-build --install-layout=deb --root=$(CURDIR)/debian/utah-common; done
 	# Since the client changes names from client.py to utah, we can't use utah-client.install for that
 	# We also need to make our directory since we do this before dh_auto_install
 	mkdir -p $(CURDIR)/debian/utah-client/usr/bin
@@ -51,6 +58,8 @@
 	rm -r $(CURDIR)/debian/utah-client/usr/lib/python*/dist-packages/utah-*.egg-info
 	# Let's remove it from the parser as well
 	rm -r $(CURDIR)/debian/utah-parser/usr/lib/python*/dist-packages/utah-*.egg-info
+	# We'll remove it from the server and leave it in the client package
+	rm -r $(CURDIR)/debian/utah/usr/lib/python*/dist-packages/utah-*.egg-info
 	# We want to symlink the utah example scripts into /usr/bin, and we need a directory for that
 	mkdir -p $(CURDIR)/debian/utah/usr/bin
 	for script in $$(find examples -type f -name "*.py" -printf "%f\n"); do\