diff options
| author | Ben Howard <ben.howard@canonical.com> | 2014-01-09 08:17:41 -0700 |
|---|---|---|
| committer | Ben Howard <ben.howard@canonical.com> | 2014-01-09 08:17:41 -0700 |
| commit | db215c30e7d7e9f9a9ffbe037beb6c92a2312b23 (patch) | |
| tree | 884f06f8460f046ce8deadc8a09409e2d6dcf794 /packages | |
| parent | a5727fe1477c9cc4288d1ac41f70bd1ab7d7928a (diff) | |
| parent | 3a4bf799ca2dd785fe1a5a35f188aed4f54ab5e5 (diff) | |
| download | vyos-cloud-init-db215c30e7d7e9f9a9ffbe037beb6c92a2312b23.tar.gz vyos-cloud-init-db215c30e7d7e9f9a9ffbe037beb6c92a2312b23.zip | |
Merge with upstream sources
Diffstat (limited to 'packages')
| -rwxr-xr-x | packages/bddeb | 2 | ||||
| -rw-r--r-- | packages/debian/control.in | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/packages/bddeb b/packages/bddeb index 8de4d466..f52eb55f 100755 --- a/packages/bddeb +++ b/packages/bddeb @@ -32,7 +32,7 @@ PKG_MP = { 'boto': 'python-boto', 'cheetah': 'python-cheetah', 'configobj': 'python-configobj', - 'jsonpatch': 'python-json-patch', + 'jsonpatch': 'python-jsonpatch | python-json-patch', 'oauth': 'python-oauth', 'prettytable': 'python-prettytable', 'pyserial': 'python-serial', diff --git a/packages/debian/control.in b/packages/debian/control.in index b9352f5b..fd9f3ffd 100644 --- a/packages/debian/control.in +++ b/packages/debian/control.in @@ -25,7 +25,6 @@ Depends: procps, #end for python-software-properties | software-properties-common, \${misc:Depends}, - \${python:Depends} XB-Python-Version: \${python:Versions} Description: Init scripts for cloud instances Cloud instances need special scripts to run during initialisation |