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
=== modified file 'debian/changelog'
--- debian/changelog 2011-02-26 00:44:10 +0000
+++ debian/changelog 2011-03-09 17:39:32 +0000
@@ -1,3 +1,12 @@
1cobbler (2.1.0~bzr2002-0ubuntu3) natty; urgency=low
2
3 * Add python-koan package (LP: #731616):
4 - debian/control: Add python-koan binary package; fix typo
5 - debian/python-cobbler.install: Do not install koan python modules.
6 - debian/python-koan.install: Add. Install koan python modules.
7
8 -- Andres Rodriguez <andreserl@ubuntu.com> Wed, 09 Mar 2011 12:33:42 -0500
9
1cobbler (2.1.0~bzr2002-0ubuntu2) natty; urgency=low10cobbler (2.1.0~bzr2002-0ubuntu2) natty; urgency=low
211
3 * rebuild for permissions issue12 * rebuild for permissions issue
413
=== modified file 'debian/control'
--- debian/control 2011-01-28 14:39:12 +0000
+++ debian/control 2011-03-09 17:39:32 +0000
@@ -62,7 +62,7 @@
62 python-django, 62 python-django,
63 ${misc:Depends}63 ${misc:Depends}
64Provides: ${python:Provides}64Provides: ${python:Provides}
65Description: Install server - python libraires.65Description: Install server - python libraries.
66 Cobbler is a network install server. Cobbler supports PXE, virtualized66 Cobbler is a network install server. Cobbler supports PXE, virtualized
67 installs, and reinstalling existing Linux machines. The last two modes use67 installs, and reinstalling existing Linux machines. The last two modes use
68 a helper tool, 'koan', that integrates with cobbler. Cobbler's advanced68 a helper tool, 'koan', that integrates with cobbler. Cobbler's advanced
@@ -108,12 +108,28 @@
108108
109Package: koan109Package: koan
110Architecture: all110Architecture: all
111Depends: ${python:Depends}, ${misc:Depends}, libvirt-bin111Depends: ${python:Depends}, ${misc:Depends}, python-koan, libvirt-bin
112Description: kickstart-over-a-network (koan)112Description: kickstart-over-a-network (koan)
113 Koan stands for kickstart-over-a-network and allows for both network 113 Koan stands for kickstart-over-a-network and allows for both network
114 installation of new virtualized guests and re-installation of an existing 114 installation of new virtualized guests and re-installation of an existing
115 system. For use with a boot-server configure with Cobbler.115 system. For use with a boot-server configure with Cobbler.
116116
117Package: python-koan
118Architecture: all
119Depends: ${python:Depends}, ${misc:Depends},
120 python-libvirt,
121 python-simplejson,
122 python-urlgrabber
123Provides: ${python:Provides}
124Conflicts: python-cobbler (<= 2.1.0~bzr2002-0ubuntu2)
125Replaces: python-cobbler (<=2.1.0~bzr2002-0ubuntu2)
126Description: kickstart-over-a-network (koan) - python libraries
127 Koan stands for kickstart-over-a-network and allows for both network
128 installation of new virtualized guests and re-installation of an existing
129 system. For use with a boot-server configure with Cobbler.
130 .
131 This package includes the koan python modules.
132
117Package: libcobbler4j-java133Package: libcobbler4j-java
118Architecture: all134Architecture: all
119Depends:135Depends:
120136
=== modified file 'debian/python-cobbler.install'
--- debian/python-cobbler.install 2011-01-18 12:03:14 +0000
+++ debian/python-cobbler.install 2011-03-09 17:39:32 +0000
@@ -1,1 +1,1 @@
1usr/lib/python*/dist-packages/*1usr/lib/python*/dist-packages/cobbler/*
22
=== added file 'debian/python-koan.install'
--- debian/python-koan.install 1970-01-01 00:00:00 +0000
+++ debian/python-koan.install 2011-03-09 17:39:32 +0000
@@ -0,0 +1,1 @@
1usr/lib/python*/dist-packages/koan/*

Subscribers

People subscribed via source and target branches