Merge lp:~andreserl/ubuntu/natty/cobbler/lp731616 into lp:ubuntu/natty/cobbler

Proposed by Andres Rodriguez
Status: Needs review
Proposed branch: lp:~andreserl/ubuntu/natty/cobbler/lp731616
Merge into: lp:ubuntu/natty/cobbler
Diff against target: 72 lines (+29/-3)
4 files modified
debian/changelog (+9/-0)
debian/control (+18/-2)
debian/python-cobbler.install (+1/-1)
debian/python-koan.install (+1/-0)
To merge this branch: bzr merge lp:~andreserl/ubuntu/natty/cobbler/lp731616
Reviewer Review Type Date Requested Status
Chuck Short Pending
Review via email: mp+52718@code.launchpad.net
To post a comment you must log in.

Unmerged revisions

7. By Andres Rodriguez on 2011-03-09

* Add python-koan package (LP: #731616):
  - debian/control: Add python-koan binary package; fix typo
  - debian/python-cobbler.install: Do not install koan python modules.
  - debian/python-koan.install: Add. Install koan python modules.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-02-26 00:44:10 +0000
3+++ debian/changelog 2011-03-09 17:39:32 +0000
4@@ -1,3 +1,12 @@
5+cobbler (2.1.0~bzr2002-0ubuntu3) natty; urgency=low
6+
7+ * Add python-koan package (LP: #731616):
8+ - debian/control: Add python-koan binary package; fix typo
9+ - debian/python-cobbler.install: Do not install koan python modules.
10+ - debian/python-koan.install: Add. Install koan python modules.
11+
12+ -- Andres Rodriguez <andreserl@ubuntu.com> Wed, 09 Mar 2011 12:33:42 -0500
13+
14 cobbler (2.1.0~bzr2002-0ubuntu2) natty; urgency=low
15
16 * rebuild for permissions issue
17
18=== modified file 'debian/control'
19--- debian/control 2011-01-28 14:39:12 +0000
20+++ debian/control 2011-03-09 17:39:32 +0000
21@@ -62,7 +62,7 @@
22 python-django,
23 ${misc:Depends}
24 Provides: ${python:Provides}
25-Description: Install server - python libraires.
26+Description: Install server - python libraries.
27 Cobbler is a network install server. Cobbler supports PXE, virtualized
28 installs, and reinstalling existing Linux machines. The last two modes use
29 a helper tool, 'koan', that integrates with cobbler. Cobbler's advanced
30@@ -108,12 +108,28 @@
31
32 Package: koan
33 Architecture: all
34-Depends: ${python:Depends}, ${misc:Depends}, libvirt-bin
35+Depends: ${python:Depends}, ${misc:Depends}, python-koan, libvirt-bin
36 Description: kickstart-over-a-network (koan)
37 Koan stands for kickstart-over-a-network and allows for both network
38 installation of new virtualized guests and re-installation of an existing
39 system. For use with a boot-server configure with Cobbler.
40
41+Package: python-koan
42+Architecture: all
43+Depends: ${python:Depends}, ${misc:Depends},
44+ python-libvirt,
45+ python-simplejson,
46+ python-urlgrabber
47+Provides: ${python:Provides}
48+Conflicts: python-cobbler (<= 2.1.0~bzr2002-0ubuntu2)
49+Replaces: python-cobbler (<=2.1.0~bzr2002-0ubuntu2)
50+Description: kickstart-over-a-network (koan) - python libraries
51+ Koan stands for kickstart-over-a-network and allows for both network
52+ installation of new virtualized guests and re-installation of an existing
53+ system. For use with a boot-server configure with Cobbler.
54+ .
55+ This package includes the koan python modules.
56+
57 Package: libcobbler4j-java
58 Architecture: all
59 Depends:
60
61=== modified file 'debian/python-cobbler.install'
62--- debian/python-cobbler.install 2011-01-18 12:03:14 +0000
63+++ debian/python-cobbler.install 2011-03-09 17:39:32 +0000
64@@ -1,1 +1,1 @@
65-usr/lib/python*/dist-packages/*
66+usr/lib/python*/dist-packages/cobbler/*
67
68=== added file 'debian/python-koan.install'
69--- debian/python-koan.install 1970-01-01 00:00:00 +0000
70+++ debian/python-koan.install 2011-03-09 17:39:32 +0000
71@@ -0,0 +1,1 @@
72+usr/lib/python*/dist-packages/koan/*

Subscribers

People subscribed via source and target branches