Merge lp:~mordred/nova/fix-locale into lp:~ubuntu-server-dev/nova/essex

[Monty Taylor]

We moved to using Babel for i18n, so we need to move some locale files.

[Chuck Short (zulcss)]

Monty,

Thanks for this, however since the branch was already released I started a new changelog entry and put the entry in the new changelog entry.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-02-17 16:02:15 +0000
+++ debian/changelog	2012-02-17 23:29:19 +0000
@@ -16,7 +16,10 @@
   * Temporarily disable console patch. (LP: #932787)
   * New usptream version.
 
- -- Chuck Short <[e-mail]>  Fri, 17 Feb 2012 11:02:12 -0500
+  [ Monty Taylor ]
+  * Move files from nova/locale to /usr/share/locale
+
+ -- Monty Taylor <[e-mail]>  Fri, 17 Feb 2012 15:25:50 -0800
 
 nova (2012.1~e4~20120210.12574-0ubuntu1) precise; urgency=low
 

=== modified file 'debian/rules'
--- debian/rules	2012-02-13 17:01:11 +0000
+++ debian/rules	2012-02-17 23:29:19 +0000
@@ -3,6 +3,10 @@
 # Verbose mode
 #export DH_VERBOSE=1
 
+PACKAGE_NAME=python-nova
+PACKAGE_DIR=$(CURDIR)/debian/$(PACKAGE_NAME)
+SITE_PACKAGES_DIR=$(PACKAGE_DIR)$(call py_libdir,$(shell pyversions -d))
+
 # Lucid does not have dh_python2, but we would like to be able to use this
 # rules file to build on lucid as well. Thus the branching logic.
 WITH_PYTHON2 = $(shell test -f /usr/bin/dh_python2 && echo "--with python2")
@@ -54,6 +58,17 @@
 
 override_dh_install:
 	dh_install
+	set -e; \
+	for lang in `find $(SITE_PACKAGES_DIR)/nova/locale\
+		-maxdepth 1 -mindepth 1 -type d -printf "%f "`;\
+	do\
+		mkdir -p $(PACKAGE_DIR)/usr/share/locale/$$lang/LC_MESSAGES;\
+		mv $(SITE_PACKAGES_DIR)/nova/locale/$$lang/LC_MESSAGES/nova.mo\
+		   $(PACKAGE_DIR)/usr/share/locale/$$lang/LC_MESSAGES;\
+		rm -rf $(SITE_PACKAGES_DIR)/nova/locale/$$lang;\
+	done
+	rm -f $(SITE_PACKAGES_DIR)/nova/locale/nova.pot
+
 	chmod 440 $(CURDIR)/debian/nova-common/etc/sudoers.d/nova_sudoers
 	install -D -m 0664 $(CURDIR)/debian/nova-volume.default	$(CURDIR)/debian/nova-volume/etc/default/nova-volume
 	for hypervisor in qemu kvm xen uml lxc; do \