← Back to branch summary

~oddbloke/cloud-init/lp1506187

« back to all changes in this revision

Viewing changes to packages/debian/control.in

  • Committer: Scott Moser
  • Date: 2015-02-10 20:32:32 UTC
  • mto: This revision was merged to the branch mainline in revision 1054.
  • Revision ID: smoser@ubuntu.com-20150210203232-e360e4j7csbx48hc
make bddeb work with python3 or python2

painful, and not perfect, but at this point the output builds
on a vivid system python2 (bddeb --python2) or python3.

 * remove use of cheetah by bddeb in favor of builtin renderer
 * add '--python2' flag to bddeb and knowledge of python 2 and python3
   package names.
 * read-dependencies can now read test-requirements also.
 * differenciate from build-requirements and runtime requirements.

Show diffs side-by-side

added added

removed removed

Lines of Context:
packages/debian/control.in
1
 
## This is a cheetah template
 
1
## template:basic
2
2
Source: cloud-init
3
3
Section: admin
4
4
Priority: optional
6
6
Build-Depends: debhelper (>= 9),
7
7
               dh-python,
8
8
               dh-systemd,
9
 
               python (>= 2.6.6-3~),
10
 
               python-nose,
11
9
               pyflakes,
12
 
               python-setuptools,
13
 
               python-selinux,
14
 
               python-cheetah,
15
 
               python-mocker,
16
 
               python-httpretty,
17
 
#for $r in $requires
18
 
               ${r},
19
 
#end for
 
10
               ${python},
 
11
               ${test_requires},
 
12
               ${requires}
20
13
XS-Python-Version: all
21
 
Standards-Version: 3.9.3
 
14
Standards-Version: 3.9.6
22
15
 
23
16
Package: cloud-init
24
17
Architecture: all
25
18
Depends: procps,
26
 
         python,
27
 
#for $r in $requires
28
 
         ${r},
29
 
#end for
30
 
         python-software-properties | software-properties-common,
31
 
         \${misc:Depends},
 
19
         ${python},
 
20
         ${requires},
 
21
         software-properties-common,
 
22
         ${misc:Depends},
32
23
Recommends: sudo
33
 
XB-Python-Version: \${python:Versions}
 
24
XB-Python-Version: ${python:Versions}
34
25
Description: Init scripts for cloud instances
35
26
 Cloud instances need special scripts to run during initialisation
36
27
 to retrieve and install ssh keys and to let the user run various scripts.