Merge lp:~gandelman-a/ubuntu/raring/python-novaclient/lp1172420 into lp:~openstack-ubuntu-testing/python-novaclient/grizzly

[Adam Gandelman]

NOTE: Proposing this to the raring/grizzly branches because we have no branches + peer review set up for havana/saucy. This needs to be fixed via standard, non-MRE SRU to novaclient. While there is no delta, I'll upload to saucy with a +1 here + get an raring SRU rolling.

Unmerged revisions

69. By Adam Gandelman on 2013-04-30

debian/{links, install, preinst}: Drop links, install bash completion
directly to /etc/bash_completion.d/. Add preinst to remove broken symlink
ahead of unpacking conffile. (LP: #1172420)

=== modified file 'debian/changelog'
--- debian/changelog	2013-04-04 12:40:06 +0000
+++ debian/changelog	2013-04-30 00:13:39 +0000
@@ -1,3 +1,11 @@
+python-novaclient (1:2.13.0-0ubuntu2) UNRELEASED; urgency=low
+
+  * debian/{links, install, preinst}: Drop links, install bash completion
+    directly to /etc/bash_completion.d/.  Add preinst to remove broken symlink
+    ahead of unpacking conffile. (LP: #1172420)
+
+ -- Adam Gandelman <[e-mail]>  Mon, 29 Apr 2013 17:07:13 -0700
+
 python-novaclient (1:2.13.0-0ubuntu1) raring; urgency=low
 
   * New upstream release.

=== added file 'debian/install'
--- debian/install	1970-01-01 00:00:00 +0000
+++ debian/install	2013-04-30 00:13:39 +0000
@@ -0,0 +1,1 @@
+tools/nova.bash_completion etc/bash_completion.d/

=== removed file 'debian/links'
--- debian/links	2013-04-04 12:40:06 +0000
+++ debian/links	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-usr/share/doc/python-novaclient/nova.bash_completion etc/bash_completion.d/nova.bash_completion

=== added file 'debian/preinst'
--- debian/preinst	1970-01-01 00:00:00 +0000
+++ debian/preinst	2013-04-30 00:13:39 +0000
@@ -0,0 +1,12 @@
+#!/bin/sh -e
+
+if [ "$1" = "upgrade" ] ; then
+  if [ -n "$2" ] && dpkg --compare-versions "$2" lt 1:2.13.0-0ubuntu2; then
+    # Remove broken symlink that was released with raring. (LP: #1172420)
+    if [ -L /etc/bash_completion.d/nova.bash_completion ] &&
+       [ "`readlink /etc/bash_completion.d/nova.bash_completion`" =\
+         "/usr/share/doc/python-novaclient/nova.bash_completion" ]; then
+      rm -rf /etc/bash_completion.d/nova.bash_completion
+   fi
+  fi
+fi