diff options
| author | Scott Moser <smoser@ubuntu.com> | 2011-12-20 16:36:05 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2011-12-20 16:36:05 -0500 |
| commit | c7e8163c43cb0bb55399c5b47e6eec41a672b8cb (patch) | |
| tree | de718776a4c4647228e5dcedcf980c79f51de630 | |
| parent | 6bc6ab24d6ef11c068c609519d0a8fd4b1b6be07 (diff) | |
| parent | 7b6da6936cdf690598b6ed16f5c5c254dca19e39 (diff) | |
| download | vyos-cloud-init-c7e8163c43cb0bb55399c5b47e6eec41a672b8cb.tar.gz vyos-cloud-init-c7e8163c43cb0bb55399c5b47e6eec41a672b8cb.zip | |
merge from trunk
| -rw-r--r-- | debian.trunk/control | 4 | ||||
| -rwxr-xr-x | debian.trunk/rules | 3 |
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 |