Merge lp:~gandelman-a/glance/ubuntu-rm-postinst into lp:~openstack-ubuntu-packagers/glance/ubuntu

[Adam Gandelman]

[Jay Pipes (jaypipes)]

review: Approve

Unmerged revisions

76. By Adam Gandelman on 2011-12-22

* 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)

=== modified file 'debian/changelog'
--- debian/changelog	2011-12-15 05:19:49 +0000
+++ debian/changelog	2011-12-22 22:40:32 +0000
@@ -12,6 +12,10 @@
   * Only remove user/group in .postrm if they exist. (LP: #857021)
   * Add dependencies previously removed from client package to glance-common,
     where they are required for glance-{api,registry}
+  * 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)
 
  -- Scott Moser <[e-mail]>  Wed, 07 Dec 2011 14:10:28 -0500
 

=== modified file 'debian/control'
--- debian/control	2011-12-15 05:19:49 +0000
+++ debian/control	2011-12-22 22:40:32 +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