Merge lp:~gandelman-a/ubuntu/precise/glance/lp907543 into lp:~ubuntu-server-dev/glance/essex

[Adam Gandelman]

Apparently, python-glance.postinst was dependent on python-support. This wasn't being installed by the package but we were getting for free due to other packages' reliance. Those have apparently converted to dh_python2 and we can't (mistakenly) assume that python-support is installed anymore.

[Alex Muntada (alex.muntada)]

Reviewed trivial change, approved.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-12-16 20:57:21 +0000
+++ debian/changelog	2011-12-21 23:00:30 +0000
@@ -1,3 +1,12 @@
+glance (2012.1~e2-0ubuntu3) UNRELEASED; urgency=low
+
+  * debian/control: Drop python-support from Build-Depends
+  * debian/python-glance.postinst: Removed. python-support is needed
+    for update-python-modules but not a dependency.  Let dh_python2
+    generate instead. (LP: #907543)
+
+ -- Adam Gandelman <[e-mail]>  Wed, 21 Dec 2011 14:50:55 -0800
+
 glance (2012.1~e2-0ubuntu2) precise; urgency=low
 
   * debian/glance-registry.postinst: Fix typo in postinst. 

=== modified file 'debian/control'
--- debian/control	2011-12-15 18:21:14 +0000
+++ debian/control	2011-12-21 23:00:30 +0000
@@ -4,7 +4,7 @@
 Maintainer: Ubuntu OpenStack <[e-mail]>
 Build-Depends: debhelper (>= 7.0.50),
  python-all (>= 2.6),
- python-all-dev (>= 2.6.6-3~) | python-support,
+ python-all-dev (>= 2.6.6-3~)
 Build-Depends-Indep:
  python-setuptools,
  python-sphinx,

=== removed file 'debian/python-glance.postinst'
--- debian/python-glance.postinst	2011-05-06 12:25:11 +0000
+++ debian/python-glance.postinst	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-set -e
-
-#DEBHELPER#
-
-if [ "$1" = "configure" ]
-then
-    update-python-modules --post-install
-fi
-
-exit 0