[Pkg-ganeti-devel] Patch against pkg-ganeti to support 2.0 rc3

[Guido Trotter]

On Wed, Apr 22, 2009 at 05:37:13PM +0200, Cyril Bouthors wrote:

Hi,

> Guido,
> 
> According to our conversation on the chat, here's the patch against
> pkg-ganeti to support 2.0 rc3 without any lintian error.
> 
> Before applying the patch, You first have to:
>  - remove ganeti.examples
>  - rename ganeti.dirs into ganeti2.0.dirs
> 

Ok, thanks!

> Index: control
> ===================================================================
> --- control	(revision 72)
> +++ control	(working copy)
> @@ -2,20 +2,22 @@
>  Section: admin
>  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>
> +Uploaders: Guido Trotter <ultrotter at debian.org>, Iustin Pop <iusty at k1024.org>, Leonardo Rodrigues de Mello <l at lmello.eu.org>, Cyril Bouthors <cyril at bouthors.org>, 
>  Build-Depends: cdbs (>= 0.4.49), debhelper (>= 5), docbook-utils, python-simplejson, python-pyparsing, python-openssl, python-twisted-core, patchutils, python-support (>= 0.6)
> -Standards-Version: 3.8.0.1
> +Standards-Version: 3.8.1
>  Vcs-Svn: http://ganeti.googlecode.com/svn/trunk/ganeti/
>  Vcs-Browser: http://ganeti.googlecode.com/svn/trunk/ganeti/
>  Homepage: http://code.google.com/p/ganeti/
>  DM-Upload-Allowed: yes
>  
> -Package: ganeti
> +Package: ganeti2.0
>  Architecture: all
>  Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, lvm2, ssh, bridge-utils, iproute, iputils-arping, openssl, python-simplejson, python-pyparsing, python-openssl, python-twisted-core
>  Recommends: drbd8-utils (>= 8.0.7) | drbd0.7-utils, mdadm, xen-linux-system-2.6.26-1-xen-amd64 | xen-linux-system-2.6.26-1-xen-686, ganeti-instance-debootstrap
>  Suggests: drbd8-module-source (>= 8.0.7) | drbd0.7-module-source
>  Provides: ${python:Provides}
> +Conflicts: ganeti
> +Replaces: ganeti

Should we also Provides: ganeti ?

>  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
> Index: changelog
> ===================================================================
> --- changelog	(revision 72)
> +++ changelog	(working copy)
> @@ -1,3 +1,9 @@
> +ganeti (2.0.0~rc3-1) unstable; urgency=low
> +
> +  * New upstream release
> +
> + -- Cyril Bouthors <cyril at bouthors.org>  Tue, 21 Apr 2009 17:10:11 +0200
> +
>  ganeti (1.2.6-3) unstable; urgency=low
>  
>    * Cherry-pick commit 2461 from upstream, fixing (yet again, hopefully 
> Index: rules
> ===================================================================
> --- rules	(revision 72)
> +++ rules	(working copy)
> @@ -13,16 +13,20 @@
>    --with-iallocator-search-path=/usr/local/lib/ganeti/iallocators,/usr/lib/ganeti/iallocators \
>    --with-os-search-path=/srv/ganeti/os,/usr/local/lib/ganeti/os,/usr/lib/ganeti/os,/usr/share/ganeti/os
>  
> +# hack to avoid compiling .pyc files
> +DEB_MAKE_INSTALL_TARGET += py_compile="echo py-compile"
> +

What's exactly the problem we have with .pyc files? And why isn't dh_pysupport
taking care of them, for us?

>  #DEB_DH_INSTALLINIT_ARGS = --no-start
>  
>  clean::
> -	rm -f debian/ganeti.init
> -	rm -f debian/ganeti.cron.d
> +	rm -f debian/ganeti2.0.init
> +	rm -f debian/ganeti2.0.cron.d
>  
> -build/ganeti::
> -	cp doc/examples/ganeti.cron debian/ganeti.cron.d
> -	cp doc/examples/ganeti.initd debian/ganeti.init
> +build/ganeti2.0::
> +	cp doc/examples/ganeti.cron debian/ganeti2.0.cron.d
> +	cp doc/examples/ganeti.initd debian/ganeti2.0.init
>  
> -install/ganeti::
> -	dh_pysupport -pganeti
> -	install -m 0755 doc/examples/dumb-allocator debian/ganeti/usr/lib/ganeti/iallocators/dumb
> +install/ganeti2.0::
> +	dh_pysupport -pganeti2.0
> +	install -m 0755 doc/examples/dumb-allocator debian/ganeti2.0/usr/lib/ganeti/iallocators/dumb
> +	rmdir debian/ganeti2.0/var/run/ganeti


Thanks!!

Guido