Merge lp:~zulcss/python-novaclient/2.14.1 into lp:~openstack-ubuntu-testing/python-novaclient/havana

[Chuck Short]

2.14.1 release

Unmerged revisions

78. By <email address hidden> on 2013-08-13

Refresh changelog

77. By <email address hidden> on 2013-08-13

releasing version 1:2.14.1-0ubuntu1

76. By James Page on 2013-07-16

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)

75. By James Page on 2013-07-09

d/control: Update VCS fields for new branch locations.

=== modified file 'debian/changelog'
--- debian/changelog	2013-06-07 13:03:56 +0000
+++ debian/changelog	2013-08-13 14:17:22 +0000
@@ -1,4 +1,4 @@
-python-novaclient (1:2.13.0.45.g2925d5b-0ubuntu1) UNRELEASED; urgency=low
+python-novaclient (1:2.14.1-0ubuntu1) saucy; urgency=low
 
   [ Chuck Short ]
   * New upstream release. 
@@ -9,7 +9,15 @@
   [ Yolanda Robla ]
   * debian/tests: added autopkgtests
 
- -- Yolanda <[e-mail]>  Fri, 07 Jun 2013 13:22:31 +0200
+  [ James Page ]
+  * d/control: Update VCS fields for new branch locations.
+
+  [ Adam Gandelman ]
+  * 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)
+
+ -- Chuck Short <[e-mail]>  Tue, 13 Aug 2013 08:52:34 -0400
 
 python-novaclient (1:2.13.0-0ubuntu1) raring; urgency=low
 

=== modified file 'debian/control'
--- debian/control	2013-06-07 11:23:51 +0000
+++ debian/control	2013-08-13 14:17:22 +0000
@@ -22,8 +22,8 @@
                testrepository
 X-Python-Version: >= 2.7
 Standards-Version: 3.9.3
-Vcs-Browser: https://bazaar.launchpad.net/~openstack-ubuntu-packagers/python-novaclient/ubuntu/files
-Vcs-Bzr: https://bazaar.launchpad.net/~openstack-ubuntu-packagers/python-novaclient/ubuntu/
+Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-server-dev/python-novaclient/havana/files
+Vcs-Bzr: https://code.launchpad.net/~ubuntu-server-dev/python-novaclient/havana
 XS-Testsuite: autopkgtest
 
 Package: python-novaclient

=== added file 'debian/install'
--- debian/install	1970-01-01 00:00:00 +0000
+++ debian/install	2013-08-13 14:17:22 +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-08-13 14:17:22 +0000
@@ -0,0 +1,16 @@
+#!/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
+
+#DEBHELPER#
+
+exit 0