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

[Andres Rodriguez]

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.

=== 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 @@
+cobbler (2.1.0~bzr2002-0ubuntu3) natty; urgency=low
+
+  * 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.
+
+ -- Andres Rodriguez <[e-mail]>  Wed, 09 Mar 2011 12:33:42 -0500
+
 cobbler (2.1.0~bzr2002-0ubuntu2) natty; urgency=low
 
   * rebuild for permissions issue

=== 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 @@
  python-django, 
  ${misc:Depends}
 Provides: ${python:Provides}
-Description: Install server - python libraires.
+Description: Install server - python libraries.
  Cobbler is a network install server. Cobbler supports PXE, virtualized
  installs, and reinstalling existing Linux machines. The last two modes use
  a helper tool, 'koan', that integrates with cobbler. Cobbler's advanced
@@ -108,12 +108,28 @@
 
 Package: koan
 Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, libvirt-bin
+Depends: ${python:Depends}, ${misc:Depends}, python-koan, libvirt-bin
 Description: kickstart-over-a-network (koan)
  Koan stands for kickstart-over-a-network and allows for both network 
  installation of new virtualized guests and re-installation of an existing 
  system.  For use with a boot-server configure with Cobbler.
 
+Package: python-koan
+Architecture: all
+Depends: ${python:Depends}, ${misc:Depends},
+ python-libvirt,
+ python-simplejson,
+ python-urlgrabber
+Provides: ${python:Provides}
+Conflicts: python-cobbler (<= 2.1.0~bzr2002-0ubuntu2)
+Replaces: python-cobbler (<=2.1.0~bzr2002-0ubuntu2)
+Description: kickstart-over-a-network (koan) - python libraries
+ Koan stands for kickstart-over-a-network and allows for both network
+ installation of new virtualized guests and re-installation of an existing
+ system.  For use with a boot-server configure with Cobbler.
+ .
+ This package includes the koan python modules.
+
 Package: libcobbler4j-java
 Architecture: all
 Depends:

=== 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 @@
-usr/lib/python*/dist-packages/*
+usr/lib/python*/dist-packages/cobbler/*

=== 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 @@
+usr/lib/python*/dist-packages/koan/*