[Pkg-ganeti-commits] r29 - in trunk/ganeti/debian: . patches

Sun Jan 20 22:15:37 UTC 2008

Author: iustin-guest
Date: 2008-01-20 22:15:37 +0000 (Sun, 20 Jan 2008)
New Revision: 29

Added:
   trunk/ganeti/debian/patches/01_fix_initd_stop_levels.patch
   trunk/ganeti/debian/pyversions
Modified:
   trunk/ganeti/debian/changelog
   trunk/ganeti/debian/control
   trunk/ganeti/debian/rules
Log:
Adjust the packaging of the python modules

This patch switches the python modules from hand installed to pysupport
and also fixes some other issues.

Reviewed-by: ultrotter


Modified: trunk/ganeti/debian/changelog
===================================================================

--- trunk/ganeti/debian/changelog	2008-01-19 08:49:09 UTC (rev 28)
+++ trunk/ganeti/debian/changelog	2008-01-20 22:15:37 UTC (rev 29)
@@ -1,5 +1,15 @@
 ganeti (1.2.1-1) unstable; urgency=low
 
+  [ Iustin Pop ]
+  * Switch python modules from hand-crafted to pysupport
+  * Add patch for the upstream-provided init.d script to fix a lintian warning
+  * Add the Vcs-Svn and Vcs-Browser control fields
+  * Remove the no-start of the daemon(s) on upgrades since we need to restart
+    if the source code has changed; the daemons will not do anything if the
+    node is not joined to a cluster
+  * Extend the OS search path with /usr/share/ganeti/os in order to accomodate
+    arch all OS packages
+
   [ Guido Trotter ]
   * New upstream version
   * Add the option of drbd8-module-source to suggests
@@ -8,7 +18,7 @@
   [ Leonardo Rodrigues de Mello ]
   * Fix dependency on SimpleJSON
 
- -- Guido Trotter <ultrotter at debian.org>  Sat, 19 Jan 2008 09:43:21 +0100
+ -- Iustin Pop <iusty at k1024.org>  Sat, 19 Jan 2008 23:17:57 +0100
 
 ganeti (1.2.0-1) unstable; urgency=low
 

Modified: trunk/ganeti/debian/control
===================================================================
--- trunk/ganeti/debian/control	2008-01-19 08:49:09 UTC (rev 28)
+++ trunk/ganeti/debian/control	2008-01-20 22:15:37 UTC (rev 29)
@@ -3,14 +3,17 @@
 Priority: extra
 Maintainer: Debian Ganeti Team <pkg-ganeti-devel at lists.alioth.debian.org>
 Uploaders: Guido Trotter <ultrotter at debian.org>, Iustin Pop <iusty at k1024.org>, Leonardo Rodrigues de Mello <l at lmello.eu.org>
-Build-Depends: cdbs, debhelper (>= 5), docbook-utils, python-simplejson, python-pyparsing, python-pyopenssl, python-twisted-core
+Build-Depends: cdbs (>= 0.4.49), debhelper (>= 5), docbook-utils, python-simplejson, python-pyparsing, python-pyopenssl, python-twisted-core, patchutils, python-support (>= 0.6)
 Standards-Version: 3.7.3
+Vcs-Svn: http://ganeti.googlecode.com/svn/trunk/ganeti/
+Vcs-Browser: http://ganeti.googlecode.com/svn/trunk/ganeti/
 
 Package: ganeti
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, python (>= 2.4), lvm2, ssh, bridge-utils, iproute, iputils-arping, fping, python-twisted-core, python-pyopenssl,  openssl, mdadm, python-pyparsing, python-simplejson
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, lvm2, ssh, bridge-utils, iproute, iputils-arping, fping, openssl, mdadm, python-simplejson, python-pyparsing, python-pyopenssl, python-twisted-core
 Recommends: drbd8-utils (>= 8.0.7) | drbd0.7-utils, xen-linux-system-2.6.18-5-xen-vserver-686 | xen-linux-system-2.6.18-4-xen-686 | xen-linux-system-2.6.18-5-xen-686 | xen-linux-system-2.6.18-4-xen-vserver-686 | xen-linux-system-2.6.18-4-xen-amd64 | xen-linux-system-2.6.18-4-xen-vserver-amd64 | xen-linux-system-2.6.18-5-xen-amd64 |  xen-linux-system-2.6.18-5-xen-vserver-amd64
 Suggests: drbd8-module-source (>= 8.0.7) | drbd0.7-module-source 
+Provides: ${python:Provides}
 Description: Cluster-based virtualization management software
  Ganeti is a virtual server cluster management software tool built on top
  of the Xen virtual machine monitor and other Open Source software. After

Added: trunk/ganeti/debian/patches/01_fix_initd_stop_levels.patch
===================================================================
--- trunk/ganeti/debian/patches/01_fix_initd_stop_levels.patch	                        (rev 0)
+++ trunk/ganeti/debian/patches/01_fix_initd_stop_levels.patch	2008-01-20 22:15:37 UTC (rev 29)
@@ -0,0 +1,12 @@
+diff -urN ganeti-1.2.1.old/doc/examples/ganeti.initd.in ganeti-1.2.1/doc/examples/ganeti.initd.in
+--- ganeti-1.2.1.old/doc/examples/ganeti.initd.in	2008-01-16 16:46:44.000000000 +0100
++++ ganeti-1.2.1/doc/examples/ganeti.initd.in	2008-01-18 14:56:45.723900500 +0100
+@@ -6,7 +6,7 @@
+ # Required-Start:    $syslog $remote_fs xend
+ # Required-Stop:     $syslog $remote_fs xend
+ # Default-Start:     2 3 4 5
+-# Default-Stop:      S 0 1 6
++# Default-Stop:      0 1 6
+ # Short-Description: Ganeti Xen Cluster Manager
+ # Description:       Ganeti Xen Cluster Manager 
+ ### END INIT INFO

Added: trunk/ganeti/debian/pyversions
===================================================================
--- trunk/ganeti/debian/pyversions	                        (rev 0)
+++ trunk/ganeti/debian/pyversions	2008-01-20 22:15:37 UTC (rev 29)
@@ -0,0 +1 @@
+2.4-

Modified: trunk/ganeti/debian/rules
===================================================================
--- trunk/ganeti/debian/rules	2008-01-19 08:49:09 UTC (rev 28)
+++ trunk/ganeti/debian/rules	2008-01-20 22:15:37 UTC (rev 29)
@@ -10,9 +10,10 @@
   --localstatedir=/var \
   --sysconfdir=/etc \
   --with-export-dir=/var/lib/ganeti/export \
-  --with-os-search-path=/srv/ganeti/os,/usr/local/lib/ganeti/os,/usr/lib/ganeti/os
-DEB_DH_INSTALLINIT_ARGS = --no-start
+  --with-os-search-path=/srv/ganeti/os,/usr/local/lib/ganeti/os,/usr/lib/ganeti/os,/usr/share/ganeti/os
 
+#DEB_DH_INSTALLINIT_ARGS = --no-start
+
 clean::
 	rm -f debian/ganeti.init
 	rm -f debian/ganeti.cron
@@ -21,6 +22,5 @@
 	cp doc/examples/ganeti.cron debian/ganeti.cron
 	cp doc/examples/ganeti.initd debian/ganeti.init
 
-binary-post-install/ganeti::
-	find debian/$(cdbs_curpkg) -name '*.py[co]' -print0 | xargs -0 rm -f --
-
+binary-install/ganeti::
+	dh_pysupport -pganeti


