Oh, are we doing this? I thought it was on hold (https://lists.debian.org/debian-l10n-english/2014/03/msg00014.html)
Christian PERRIER wrote: > --- ganeti.old/debian/templates/versioned.templates 2014-03-07 > 10:20:10.000000000 +0100 > +++ ganeti/debian/templates/versioned.templates 2014-03-21 > 07:14:50.704916373 +0100 I've got nothing to add to your review here. > --- ganeti.old/debian/control 2014-03-12 07:23:42.919560250 +0100 > +++ ganeti/debian/control 2014-03-21 07:08:01.385273303 +0100 > @@ -43,10 +43,10 @@ > Suggests: ganeti-doc, blktap-dkms > Conflicts: ganeti-htools > Provides: ${python:Provides}, ganeti-htools > -Description: Cluster-based virtualization management software > +Description: cluster-based virtualization management software > > (repeated over all other package descriptions: uncapitalize, as > recommended by Developer's Reference) It's also awkwardly long due to the inclusion of two rather useless words. How is cluster-BASED virtualization management different from actual CLUSTER virtualization management? And what would be in a set of Debian packages if not software? So we could just trim this to: Description: cluster virtualization manager But I notice the original upstream blurb was "Ganeti is a virtualization cluster management software" (which shows signs of non-native-speaker English). Maybe we should start from scratch with something like Description: VM clustering system ...but my patch sticks to the first option. > Ganeti is a virtual server cluster management software tool built on top What is the word "software" adding to that noun-pile? (It also seems odd to talk about building a tool, especially on top of something else, but never mind.) > - of the Xen and KVM virtualization technologies and other Free Software. > After > - setting it up it will provide you with an automated environment to > + of the Xen and KVM virtualization technologies and other free software. > + It provides an automated environment to > manage highly available virtual machine instances. "Highly available [thing]s" always looks wrong to me (the normal way of saying "[thing]s characterised by high availability" would be to say "high-availability [thing]s"), but it seems to be standard jargon in the field. > I don't really see any reason to capitalize "free software". This is > also repeated over other package descriptions. And this now makes a good introductory boilerplate paragraph, yes. Then the next two paragraphs could easily be knocked together into one "in-depth boilerplate" paragraph: > It has been designed to facilitate cluster management of virtual servers > and to provide fast and simple recovery after physical failures using > commodity hardware. > . > It will take care of operations such as redundant disk creation and > management, operating system installation (in cooperation with OS-specific > install scripts), startup, shutdown, failover of instances between physical > systems. Tweak a verbal aspect, reshuffle the "physical failures using commodity hardware", insert a conjunction: It is designed to facilitate cluster management of virtual servers using commodity hardware, and to provide fast and simple recovery after physical failures. It can take care of operations such as redundant disk creation and management, operating system installation (in cooperation with OS-specific install scripts), startup, shutdown, and failover of instances between physical systems. [...] > -Description: Cluster-based virtualization management software - Python > components > +Description: cluster-based virtualization management software - Python > components [...] > -Description: Cluster-based virtualization management software - Haskell > components > +Description: cluster-based virtualization management software - Haskell > components I'd like to shorten these to something like Description: cluster virtualization manager - $PROGLANG components > Package: ganeti-htools > Architecture: all > Depends: ${shlibs:Depends}, ${misc:Depends}, ganeti-htools-2.10 > Breaks: ganeti2 (<< 2.4) > -Description: Cluster allocation tools for Ganeti - stand-alone version > - Additional tools used for enhanced allocation, maintenance and capacity > - calculation on Ganeti clusters. > +Description: cluster allocation tools for Ganeti - stand-alone version A shorter blurb would also let us say something like Description: cluster virtualization manager - tools (stand-alone) > + Ganeti is a virtual server cluster management software tool built on top > + of the Xen and KVM virtualization technologies and other free software. > + It provides an automated environment to > + manage highly available virtual machine instances. > + . > + This package provides additional tools used for enhanced allocation, > + maintenance and capacity calculation on Ganeti clusters. > . > The tools provided are: > > Add the standard boilerplate paragraph to this package as well. > - hail: advanced instance allocator There's an excess indent on this list (and if I'm editing it then it might as well go into d-l-e "house style"): * hail: advanced instance allocator; They aren't quite all structurally parallel, but never mind. This package is intended for stand-alone systems that are not part of a Ganeti cluster. Or (since I dropped from the synopsis the hint that other versions are available): This package provides the version intended for stand-alone systems that are not part of a Ganeti cluster. [...] > -Description: Cluster allocation tools for Ganeti 2.10 > - Additional tools used for enhanced allocation, maintenance and capacity > - calculation on Ganeti clusters. > +Description: cluster allocation tools for Ganeti 2.10 Description: cluster virtualization manager - tools for Ganeti 2.10 [...] For use in non-cluster systems, install ganeti-htools instead of this package. I'd like to expand this to: This package provides the version intended for use on systems that are part of a Ganeti cluster. On stand-alone systems, use ganeti-htools instead. [...] > -Description: Cluster-based virtualization management software - documentation > +Description: cluster-based virtualization management software - documentation xxxxxx xxxxxxxxxxx x [...] > -Description: Cluster-based virtualization management software - RAPI client > library > +Description: cluster-based virtualization management software - RAPI client > library xxxxxx xxxxxxxxxxx x Badly needed. [...] > - This package contains a RAPI (Remote API) client library for Python. > + This package provides a RAPI (Remote API) client library for Python. Just when I thought I'd got over my annoyance at this webby misuse of the term "Application Programming Interface"... I'm very much hoping people pronounce that as an initialism ("ar-ay-pee-eye client"), not as the acronym ("rapey client"), and that it should therefore be "an". obWhyTheName: random nonsense-word, though it doesn't hurt that it begins with G for Google. Why is there no mention of Google in the description? -- JBR with qualifications in linguistics, experience as a Debian sysadmin, and probably no clue about this particular package
diff -ru ganeti-2.10.1.pristine/debian/control ganeti-2.10.1/debian/control --- ganeti-2.10.1.pristine/debian/control 2014-03-07 09:20:10.000000000 +0000 +++ ganeti-2.10.1/debian/control 2014-03-21 12:42:09.258560687 +0000 @@ -43,20 +43,18 @@ Suggests: ganeti-doc, blktap-dkms Conflicts: ganeti-htools Provides: ${python:Provides}, ganeti-htools -Description: Cluster-based virtualization management software - Ganeti is a virtual server cluster management software tool built on top - of the Xen and KVM virtualization technologies and other Free Software. After - setting it up it will provide you with an automated environment to - manage highly available virtual machine instances. - . - It has been designed to facilitate cluster management of virtual servers - and to provide fast and simple recovery after physical failures using - commodity hardware. - . - It will take care of operations such as redundant disk creation and - management, operating system installation (in cooperation with OS-specific - install scripts), startup, shutdown, failover of instances between physical - systems. +Description: cluster virtualization manager + Ganeti is a virtual server cluster management tool built on top of the + Xen and KVM virtualization technologies and other free software. It + provides an automated environment to manage highly available virtual + machine instances. + . + It is designed to facilitate cluster management of virtual servers using + commodity hardware, and to provide fast and simple recovery after physical + failures. It can take care of operations such as redundant disk creation + and management, operating system installation (in cooperation with + OS-specific install scripts), startup, shutdown, and failover of instances + between physical systems. . This package installs the complete Ganeti system. @@ -68,81 +66,88 @@ python-pyinotify, python-pycurl, python-paramiko, python-bitarray, python-ipaddr, socat, fping, adduser, debconf | debconf-2.0 Provides: ${python:Provides} -Description: Cluster-based virtualization management software - Python components - Ganeti is a virtual server cluster management software tool built on top - of the Xen and KVM virtualization technologies and other Free Software. After - setting it up it will provide you with an automated environment to - manage highly available virtual machine instances. - . - It has been designed to facilitate cluster management of virtual servers - and to provide fast and simple recovery after physical failures using - commodity hardware. - . - It will take care of operations such as redundant disk creation and - management, operating system installation (in cooperation with OS-specific - install scripts), startup, shutdown, failover of instances between physical - systems. +Description: cluster virtualization manager - Python components + Ganeti is a virtual server cluster management tool built on top of the + Xen and KVM virtualization technologies and other free software. It + provides an automated environment to manage highly available virtual + machine instances. + . + It is designed to facilitate cluster management of virtual servers using + commodity hardware, and to provide fast and simple recovery after physical + failures. It can take care of operations such as redundant disk creation + and management, operating system installation (in cooperation with + OS-specific install scripts), startup, shutdown, and failover of instances + between physical systems. . - This package contains all architecture-independent components of Ganeti 2.10. + This package provides all architecture-independent components of Ganeti 2.10. Package: ganeti-haskell-2.10 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, debconf | debconf-2.0 -Description: Cluster-based virtualization management software - Haskell components - Ganeti is a virtual server cluster management software tool built on top - of the Xen and KVM virtualization technologies and other Free Software. After - setting it up it will provide you with an automated environment to - manage highly available virtual machine instances. - . - It has been designed to facilitate cluster management of virtual servers - and to provide fast and simple recovery after physical failures using - commodity hardware. - . - It will take care of operations such as redundant disk creation and - management, operating system installation (in cooperation with OS-specific - install scripts), startup, shutdown, failover of instances between physical - systems. +Description: cluster virtualization manager - Haskell components + Ganeti is a virtual server cluster management tool built on top of the + Xen and KVM virtualization technologies and other free software. It + provides an automated environment to manage highly available virtual + machine instances. + . + It is designed to facilitate cluster management of virtual servers using + commodity hardware, and to provide fast and simple recovery after physical + failures. It can take care of operations such as redundant disk creation + and management, operating system installation (in cooperation with + OS-specific install scripts), startup, shutdown, and failover of instances + between physical systems. . - This package contains the architecture-dependent components of Ganeti 2.10 + This package provides the architecture-dependent components of Ganeti 2.10 written in Haskell. Package: ganeti-htools Architecture: all Depends: ${shlibs:Depends}, ${misc:Depends}, ganeti-htools-2.10 Breaks: ganeti2 (<< 2.4) -Description: Cluster allocation tools for Ganeti - stand-alone version - Additional tools used for enhanced allocation, maintenance and capacity - calculation on Ganeti clusters. +Description: cluster virtualization manager - tools (stand-alone) + Ganeti is a virtual server cluster management tool built on top of the + Xen and KVM virtualization technologies and other free software. It + provides an automated environment to manage highly available virtual + machine instances. + . + This package provides additional tools used for enhanced allocation, + maintenance and capacity calculation on Ganeti clusters. . The tools provided are: - - hail: advanced instance allocator - - harep: tool for automatically repairing Ganeti clusters - - hbal: automatic cluster balancing tool - - hinfo: print cluster information - - hroller: rolling maintenance/reboot scheduler for Ganeti nodes - - hscan: used to gather cluster files for offline use in hbal/hspace - - hspace: cluster capacity calculator + * hail: advanced instance allocator; + * harep: tool for automatically repairing Ganeti clusters; + * hbal: automatic cluster balancing tool; + * hinfo: print cluster information; + * hroller: rolling maintenance/reboot scheduler for Ganeti nodes; + * hscan: used to gather cluster files for offline use in hbal/hspace; + * hspace: cluster capacity calculator. . - This package is intended for stand-alone systems that are not part of a Ganeti - cluster. + This package provides the version intended for stand-alone systems that + are not part of a Ganeti cluster. Package: ganeti-htools-2.10 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, debconf | debconf-2.0 -Description: Cluster allocation tools for Ganeti 2.10 - Additional tools used for enhanced allocation, maintenance and capacity - calculation on Ganeti clusters. +Description: cluster virtualization manager - tools for Ganeti 2.10 + Ganeti is a virtual server cluster management tool built on top of the + Xen and KVM virtualization technologies and other free software. It + provides an automated environment to manage highly available virtual + machine instances. + . + This package provides additional tools used for enhanced allocation, + maintenance and capacity calculation on Ganeti clusters. . The tools provided are: - - hail: advanced instance allocator - - harep: tool for automatically repairing Ganeti clusters - - hbal: automatic cluster balancing tool - - hinfo: print cluster information - - hroller: rolling maintenance/reboot scheduler for Ganeti nodes - - hscan: used to gather cluster files for offline use in hbal/hspace - - hspace: cluster capacity calculator + * hail: advanced instance allocator; + * harep: tool for automatically repairing Ganeti clusters; + * hbal: automatic cluster balancing tool; + * hinfo: print cluster information; + * hroller: rolling maintenance/reboot scheduler for Ganeti nodes; + * hscan: used to gather cluster files for offline use in hbal/hspace; + * hspace: cluster capacity calculator. . - For use in non-cluster systems, install ganeti-htools instead of this package. + This package provides the version intended for use on systems that are part + of a Ganeti cluster. On stand-alone systems, use ganeti-htools instead. Package: ganeti-doc Architecture: all @@ -150,22 +155,20 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${sphinxdoc:Depends} Replaces: ganeti2 (<< 2.7.0-2) Breaks: ganeti2 (<< 2.7.0-2) -Description: Cluster-based virtualization management software - documentation - Ganeti is a virtual server cluster management software tool built on top - of the Xen and KVM virtualization technologies and other Free Software. After - setting it up it will provide you with an automated environment to - manage highly available virtual machine instances. - . - It has been designed to facilitate cluster management of virtual servers - and to provide fast and simple recovery after physical failures using - commodity hardware. - . - It will take care of operations such as redundant disk creation and - management, operating system installation (in cooperation with OS-specific - install scripts), startup, shutdown, failover of instances between physical - systems. +Description: cluster virtualization manager - documentation + Ganeti is a virtual server cluster management tool built on top of the + Xen and KVM virtualization technologies and other free software. It + provides an automated environment to manage highly available virtual + machine instances. + . + It is designed to facilitate cluster management of virtual servers using + commodity hardware, and to provide fast and simple recovery after physical + failures. It can take care of operations such as redundant disk creation + and management, operating system installation (in cooperation with + OS-specific install scripts), startup, shutdown, and failover of instances + between physical systems. . - This package contains the full HTML documentation for Ganeti. + This package provides the full HTML documentation for Ganeti. Package: python-ganeti-rapi Architecture: all @@ -174,19 +177,17 @@ Suggests: ganeti-doc Replaces: ganeti2 (<< 2.7.0-2) Breaks: ganeti2 (<< 2.7.0-2) -Description: Cluster-based virtualization management software - RAPI client library - Ganeti is a virtual server cluster management software tool built on top - of the Xen and KVM virtualization technologies and other Free Software. After - setting it up it will provide you with an automated environment to - manage highly available virtual machine instances. - . - It has been designed to facilitate cluster management of virtual servers - and to provide fast and simple recovery after physical failures using - commodity hardware. - . - It will take care of operations such as redundant disk creation and - management, operating system installation (in cooperation with OS-specific - install scripts), startup, shutdown, failover of instances between physical - systems. +Description: cluster virtualization manager - RAPI client library + Ganeti is a virtual server cluster management tool built on top of the + Xen and KVM virtualization technologies and other free software. It + provides an automated environment to manage highly available virtual + machine instances. + . + It is designed to facilitate cluster management of virtual servers using + commodity hardware, and to provide fast and simple recovery after physical + failures. It can take care of operations such as redundant disk creation + and management, operating system installation (in cooperation with + OS-specific install scripts), startup, shutdown, and failover of instances + between physical systems. . - This package contains a RAPI (Remote API) client library for Python. + This package provides an RAPI (Remote API) client library for Python. diff -ru ganeti-2.10.1.pristine/debian/versioned.templates ganeti-2.10.1/debian/versioned.templates --- ganeti-2.10.1.pristine/debian/versioned.templates 2014-03-21 11:39:25.647984777 +0000 +++ ganeti-2.10.1/debian/versioned.templates 2014-03-21 11:08:11.750356554 +0000 @@ -6,8 +6,8 @@ version is still ${version}. . This can happen if you upgrade the ganeti package to a new minor version, but - have not run `gnt-cluster upgrade' yet. Removing ${package} will cause Ganeti to + have not run "gnt-cluster upgrade" yet. Removing ${package} will cause Ganeti to stop functioning correctly. . - It is highly recommended to abort removal now and upgrade your cluster before + It is highly recommended to abort the removal now and upgrade the cluster before removing ${package}.
Source: ganeti Section: admin Priority: extra Maintainer: Debian Ganeti Team <pkg-ganeti-de...@lists.alioth.debian.org> Uploaders: Guido Trotter <ultrot...@debian.org>, Apollon Oikonomopoulos <apoi...@debian.org> Build-Depends: debhelper (>= 9), m4, python-all, ghc (>= 6.12), ghc-ghci, libghc-curl-dev, libghc-json-dev, libghc-snap-server-dev, libghc-network-dev, libcurl4-gnutls-dev, libghc-parallel-dev, libghc-utf8-string-dev, libghc-deepseq-dev, libghc-hslogger-dev, libghc-crypto-dev, libghc-text-dev, libghc-hinotify-dev, libghc-regex-pcre-dev, libghc-attoparsec-dev, libghc-vector-dev, libpcre3-dev, python-simplejson, python-pyparsing, python-openssl, python-bitarray, python-support (>= 0.6), python-pyinotify, python-pycurl, python-paramiko, python-ipaddr, python-sphinx (>= 1.0.7+dfsg), graphviz, qemu-utils, socat, iproute2 | iproute, bash-completion, po-debconf Standards-Version: 3.9.5 X-Python-Version: >= 2.6 Homepage: http://code.google.com/p/ganeti/ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-ganeti/ganeti.git Vcs-Git: git://anonscm.debian.org/pkg-ganeti/ganeti.git Package: ganeti2 Architecture: all Depends: ganeti, ${misc:Depends} Description: transitional dummy package This is a transitional dummy package for ganeti. It can safely be removed. Package: ganeti Architecture: all Breaks: ganeti2 (<< 2.7.0-2), ganeti-haskell Replaces: ganeti2 (<< 2.7.0-2), ganeti-haskell, ganeti-htools Depends: ganeti-2.10 (= ${source:Version}), ganeti-haskell-2.10 (>= ${source:Version}), ganeti-haskell-2.10 (<< ${source:Version}.1~), ganeti-htools-2.10 (>= ${source:Version}), ganeti-htools-2.10 (<< ${source:Version}.1~), adduser, ${misc:Depends} Recommends: drbd8-utils (>= 8.0.7), qemu-kvm | xen-linux-system-amd64 | xen-linux-system-686-pae, ganeti-instance-debootstrap, ndisc6 Suggests: ganeti-doc, blktap-dkms Conflicts: ganeti-htools Provides: ${python:Provides}, ganeti-htools Description: cluster virtualization manager Ganeti is a virtual server cluster management tool built on top of the Xen and KVM virtualization technologies and other free software. It provides an automated environment to manage highly available virtual machine instances. . It is designed to facilitate cluster management of virtual servers using commodity hardware, and to provide fast and simple recovery after physical failures. It can take care of operations such as redundant disk creation and management, operating system installation (in cooperation with OS-specific install scripts), startup, shutdown, and failover of instances between physical systems. . This package installs the complete Ganeti system. Package: ganeti-2.10 Architecture: all Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, lvm2, openssh-client, openssh-server, bridge-utils, iproute2 | iproute, iputils-arping, openssl, python-simplejson, python-pyparsing, python-openssl, python-pyinotify, python-pycurl, python-paramiko, python-bitarray, python-ipaddr, socat, fping, adduser, debconf | debconf-2.0 Provides: ${python:Provides} Description: cluster virtualization manager - Python components Ganeti is a virtual server cluster management tool built on top of the Xen and KVM virtualization technologies and other free software. It provides an automated environment to manage highly available virtual machine instances. . It is designed to facilitate cluster management of virtual servers using commodity hardware, and to provide fast and simple recovery after physical failures. It can take care of operations such as redundant disk creation and management, operating system installation (in cooperation with OS-specific install scripts), startup, shutdown, and failover of instances between physical systems. . This package provides all architecture-independent components of Ganeti 2.10. Package: ganeti-haskell-2.10 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, debconf | debconf-2.0 Description: cluster virtualization manager - Haskell components Ganeti is a virtual server cluster management tool built on top of the Xen and KVM virtualization technologies and other free software. It provides an automated environment to manage highly available virtual machine instances. . It is designed to facilitate cluster management of virtual servers using commodity hardware, and to provide fast and simple recovery after physical failures. It can take care of operations such as redundant disk creation and management, operating system installation (in cooperation with OS-specific install scripts), startup, shutdown, and failover of instances between physical systems. . This package provides the architecture-dependent components of Ganeti 2.10 written in Haskell. Package: ganeti-htools Architecture: all Depends: ${shlibs:Depends}, ${misc:Depends}, ganeti-htools-2.10 Breaks: ganeti2 (<< 2.4) Description: cluster virtualization manager - tools (stand-alone) Ganeti is a virtual server cluster management tool built on top of the Xen and KVM virtualization technologies and other free software. It provides an automated environment to manage highly available virtual machine instances. . This package provides additional tools used for enhanced allocation, maintenance and capacity calculation on Ganeti clusters. . The tools provided are: * hail: advanced instance allocator; * harep: tool for automatically repairing Ganeti clusters; * hbal: automatic cluster balancing tool; * hinfo: print cluster information; * hroller: rolling maintenance/reboot scheduler for Ganeti nodes; * hscan: used to gather cluster files for offline use in hbal/hspace; * hspace: cluster capacity calculator. . This package provides the version intended for stand-alone systems that are not part of a Ganeti cluster. Package: ganeti-htools-2.10 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, debconf | debconf-2.0 Description: cluster virtualization manager - tools for Ganeti 2.10 Ganeti is a virtual server cluster management tool built on top of the Xen and KVM virtualization technologies and other free software. It provides an automated environment to manage highly available virtual machine instances. . This package provides additional tools used for enhanced allocation, maintenance and capacity calculation on Ganeti clusters. . The tools provided are: * hail: advanced instance allocator; * harep: tool for automatically repairing Ganeti clusters; * hbal: automatic cluster balancing tool; * hinfo: print cluster information; * hroller: rolling maintenance/reboot scheduler for Ganeti nodes; * hscan: used to gather cluster files for offline use in hbal/hspace; * hspace: cluster capacity calculator. . This package provides the version intended for use on systems that are part of a Ganeti cluster. On stand-alone systems, use ganeti-htools instead. Package: ganeti-doc Architecture: all Section: doc Depends: ${shlibs:Depends}, ${misc:Depends}, ${sphinxdoc:Depends} Replaces: ganeti2 (<< 2.7.0-2) Breaks: ganeti2 (<< 2.7.0-2) Description: cluster virtualization manager - documentation Ganeti is a virtual server cluster management tool built on top of the Xen and KVM virtualization technologies and other free software. It provides an automated environment to manage highly available virtual machine instances. . It is designed to facilitate cluster management of virtual servers using commodity hardware, and to provide fast and simple recovery after physical failures. It can take care of operations such as redundant disk creation and management, operating system installation (in cooperation with OS-specific install scripts), startup, shutdown, and failover of instances between physical systems. . This package provides the full HTML documentation for Ganeti. Package: python-ganeti-rapi Architecture: all Section: python Depends: ${python:Depends}, ${misc:Depends}, python-pycurl, python-simplejson Suggests: ganeti-doc Replaces: ganeti2 (<< 2.7.0-2) Breaks: ganeti2 (<< 2.7.0-2) Description: cluster virtualization manager - RAPI client library Ganeti is a virtual server cluster management tool built on top of the Xen and KVM virtualization technologies and other free software. It provides an automated environment to manage highly available virtual machine instances. . It is designed to facilitate cluster management of virtual servers using commodity hardware, and to provide fast and simple recovery after physical failures. It can take care of operations such as redundant disk creation and management, operating system installation (in cooperation with OS-specific install scripts), startup, shutdown, and failover of instances between physical systems. . This package provides an RAPI (Remote API) client library for Python.
Template: @package@/abort-removal Type: boolean Default: true _Description: Abort ${package} removal? You are attempting to remove ${package}, but it seems that the running Ganeti version is still ${version}. . This can happen if you upgrade the ganeti package to a new minor version, but have not run "gnt-cluster upgrade" yet. Removing ${package} will cause Ganeti to stop functioning correctly. . It is highly recommended to abort the removal now and upgrade the cluster before removing ${package}.