summaryrefslogtreecommitdiff
path: root/debian.trunk
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2011-12-20 16:27:33 -0500
committerScott Moser <smoser@ubuntu.com>2011-12-20 16:27:33 -0500
commit7b6da6936cdf690598b6ed16f5c5c254dca19e39 (patch)
tree684c05dc6d47b579a107cbf496843a941ba8c972 /debian.trunk
parentb17a271da699230be8dad5d8c0227a5c7c238503 (diff)
downloadvyos-cloud-init-7b6da6936cdf690598b6ed16f5c5c254dca19e39.tar.gz
vyos-cloud-init-7b6da6936cdf690598b6ed16f5c5c254dca19e39.zip
debian.trunk/ transition to dh_python2 from pycentral
This is the same 2 changes that were made to cloud-init under LP: #904248
Diffstat (limited to 'debian.trunk')
-rw-r--r--debian.trunk/control4
-rwxr-xr-xdebian.trunk/rules3
2 files changed, 4 insertions, 3 deletions
diff --git a/debian.trunk/control b/debian.trunk/control
index 0ea80115..76d0db0d 100644
--- a/debian.trunk/control
+++ b/debian.trunk/control
@@ -2,7 +2,9 @@ Source: cloud-init
Section: admin
Priority: extra
Maintainer: Scott Moser <smoser@ubuntu.com>
-Build-Depends: cdbs, debhelper (>= 5.0.38), python, python-central (>= 0.5.6)
+Build-Depends: cdbs,
+ debhelper (>= 5.0.38),
+ python (>= 2.6.6-3~),
XS-Python-Version: all
Standards-Version: 3.9.1
diff --git a/debian.trunk/rules b/debian.trunk/rules
index 95bff792..19384687 100755
--- a/debian.trunk/rules
+++ b/debian.trunk/rules
@@ -1,7 +1,6 @@
#!/usr/bin/make -f
-DEB_PYTHON_SYSTEM := pycentral
-export DH_PYCENTRAL=include-links
+DEB_PYTHON2_MODULE_PACKAGES = cloud-init
binary-install/cloud-init::cloud-init-fixups