[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: [RFR] templates://qpid-cpp/{qpidd.templates}



Christian PERRIER wrote:
>  Template: qpidd/password2
[...]
> 
> I actually re-used the exact same wording than the one used in Debian
> Installerr, for consistency.

My only comment is that "the QPID daemon administrator" should be
"Qpid" to match how it's used elsewhere.
 
(I'm assuming the answer to "why Qpid?" is "because Qpid™!")

>  Package: qpidd
[...]
> -Description: Apache qpid AMQP broker
> - Apache Qpid is a cross-platform Enterprise Messaging system which implements
> +Description: cross-platform enterprise messaging system - broker

That would be fine except that standardising it across the suite would
leave us saying things like
   Description: cross-platform enterprise messaging system - common development files
which is a bit too long.  Could we perhaps drop "cross-platform" from
the synopsis version?  The alternative (not implemented below) is to
go back to "Apache Qpid" as the suite-name:
   Description: Apache Qpid - common development files

Trying to fill in the blanks:

>  Package: qpid-client

As above.

>  Package: libqmf1
[...]
> +Description: cross-platform enterprise messaging system - QMF libraries
[...]
> + This package provides the QMF libraries.

Fair enough, assuming that QMF1 is the "default" QMF.  I'd like to
expand it in the long descriptions, though (throughout):

    This package provides the Qpid Management Framework libraries.

>  Package: libqpidmessaging2
[...]
> +Description: cross-platform enterprise messaging system - AMQP libraries

Are these the only things that can claim to be AQMP libraries?  I've
gone for
   Description: enterprise messaging system - AMQP messaging libraries
and likewise, just squeezing under the 80-column limit:

>  Package: libqpidmessaging2-dev
   Description: enterprise messaging system - AMQP messaging development files

>  Package: libsslcommon2
[...]
> +Description: cross-platform enterprise messaging system - common SSL files
[...]
> + This package provides the AMQP libraries.

Surely (here and equivalently in the -dev package):
    This package provides the common SSL files.
(whatever that means exactly)...
  
>  Package: libsslcommon2-dev
[...]
> +Description: cross-platform enterprise messaging system - common SSL development files
>  Description: Apache qpid AMQP develpment files

Editing glitch.
  
>  Package: librdmawrap2
[...]
> +Description: cross-platform enterprise messaging system - ?????
[...]
> + This package provides the AMQP libraries.

Best guess:
   Description: enterprise messaging system - RDMA libraries
[...]
   This package provides the Remote Direct Memory Access libraries.
(and equivalently in the -dev package)

>  Package: libqpidtypes1
   Description: enterprise messaging system - API libraries

>  Package: libqpidcommon2
   Description: enterprise messaging system - common libraries

>  Package: libqpidclient2
   Description: enterprise messaging system - AMQP client libraries

>  Package: libqpidbroker2
   Description: enterprise messaging system - AMQP broker libraries
  
>  Package: libqmfengine1
   Description: enterprise messaging system - QMF engine libraries

>  Package: python-cqpid
>  Package: python-qmf2
>  Package: python-cqmf2
>  Package: python-qmf
>  #Package: qpid-doc

These ones just need to drop the word "AMQP" a few times.
  
>  Package: libqpid-ruby1.8
>  #Package: libqpid-perl

Why do Python modules get called modules while Ruby and Perl ones get
called "bindings" and/or "support"?  Oh well, maybe there are reasons,
so I'll leave them incompletely standardised.
-- 
JBR	with qualifications in linguistics, experience as a Debian
	sysadmin, and probably no clue about this particular package
Template: qpidd/password1
Type: password
_Description: Administrator password:
 Please enter the password for the Qpid daemon administrator.

Template: qpidd/password2
Type: password
_Description: Re-enter password to verify:
 Please enter the same Qpid daemon administrator password again to verify that you have typed it
 correctly.

Template: qpidd/password_mismatch
Type: note
_Description: Password input error
 The two passwords you entered were not the same. Please try again.
Source: qpid-cpp
Section: misc
Priority: extra
Maintainer: Cajus Pollmeier <cajus@debian.org>
Build-Depends: debhelper (>= 7.0.50~), autotools-dev, autoconf (>= 2.61), automake (>= 1.9.6), libtool (>= 1.5.22), libboost-all-dev (>= 1.35), ruby (>= 1.8.4), ruby-dev, libperl-dev, uuid-dev, libopenais-dev (>= 0.80.3), libsasl2-dev, libxqilla-dev (>= 2.0.0), libxmltooling5 | libxmltooling4, libibverbs-dev, librdmacm-dev, libnspr4-dev, libnss3-dev, libssl-dev, sasl2-bin, libcorosync-dev, libxerces-c-dev (>= 2.7.0), libcman-dev, swig (>= 1.3.35), python (>= 2.6.6-3~), doxygen, help2man, valgrind, zip, procps
X-Python-Version: 2.7
Standards-Version: 3.9.2
Homepage: http://qpid.apache.org

Package: qpidd
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, libsasl2-modules, sasl2-bin
Replaces: qpid-broker
Conflicts: qpid-broker
Description: enterprise messaging system - broker
 Apache Qpid is a cross-platform enterprise messaging system which implements
 the Advanced Message Queuing Protocol (AMQP), providing message brokers
 written in C++ and Java, along with clients for C++, Java JMS, .Net, Python,
 and Ruby.
 .
 This package provides the AMQP broker.

Package: qpid-client
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: enterprise messaging system - AMQP client
 Apache Qpid is a cross-platform enterprise messaging system which implements
 the Advanced Message Queuing Protocol (AMQP), providing message brokers
 written in C++ and Java, along with clients for C++, Java JMS, .Net, Python,
 and Ruby.
 .
 This package provides the AMQP client support.

Package: libqmf1
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: enterprise messaging system - QMF libraries
 Apache Qpid is a cross-platform enterprise messaging system which implements
 the Advanced Message Queuing Protocol (AMQP), providing message brokers
 written in C++ and Java, along with clients for C++, Java JMS, .Net, Python,
 and Ruby.
 .
 This package provides the Qpid Management Framework libraries.

Package: libqmf-dev
Architecture: any
Section: libdevel
Depends: ${misc:Depends}
Description: enterprise messaging system - QMF development files
 Apache Qpid is a cross-platform enterprise messaging system which implements
 the Advanced Message Queuing Protocol (AMQP), providing message brokers
 written in C++ and Java, along with clients for C++, Java JMS, .Net, Python,
 and Ruby.
 .
 This package provides the Qpid Management Framework development files.

Package: libqmf2-1
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: enterprise messaging system - QMF2 libraries
 Apache Qpid is a cross-platform enterprise messaging system which implements
 the Advanced Message Queuing Protocol (AMQP), providing message brokers
 written in C++ and Java, along with clients for C++, Java JMS, .Net, Python,
 and Ruby.
 .
 This package provides the Qpid Management Framework 2 libraries.

Package: libqmf2-dev
Architecture: any
Section: libdevel
Depends: ${misc:Depends}
Description: enterprise messaging system - QMF2 development files
 Apache Qpid is a cross-platform enterprise messaging system which implements
 the Advanced Message Queuing Protocol (AMQP), providing message brokers
 written in C++ and Java, along with clients for C++, Java JMS, .Net, Python,
 and Ruby.
 .
 This package provides the Qpid Management Framework 2 development files.

Package: libqmfconsole2
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: enterprise messaging system - QMF console library
 Apache Qpid is a cross-platform enterprise messaging system which implements
 the Advanced Message Queuing Protocol (AMQP), providing message brokers
 written in C++ and Java, along with clients for C++, Java JMS, .Net, Python,
 and Ruby.
 .
 This package provides the Qpid Management Framework console.

Package: libqmfconsole2-dev
Architecture: any
Section: libdevel
Depends: ${misc:Depends}
Description: enterprise messaging system - QMF console development files
 Apache Qpid is a cross-platform enterprise messaging system which implements
 the Advanced Message Queuing Protocol (AMQP), providing message brokers
 written in C++ and Java, along with clients for C++, Java JMS, .Net, Python,
 and Ruby.
 .
 This package provides the Qpid Management Framework console development
 files.

Package: libqpidmessaging2
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: enterprise messaging system - AMQP libraries
 Apache Qpid is a cross-platform enterprise messaging system which implements
 the Advanced Message Queuing Protocol (AMQP), providing message brokers
 written in C++ and Java, along with clients for C++, Java JMS, .Net, Python,
 and Ruby.
 .
 This package provides the AMQP messaging libraries.

Package: libqpidmessaging2-dev
Architecture: any
Section: libdevel
Depends: ${misc:Depends}
Description: enterprise messaging system - AMQP messaging development files
 Apache Qpid is a cross-platform enterprise messaging system which implements
 the Advanced Message Queuing Protocol (AMQP), providing message brokers
 written in C++ and Java, along with clients for C++, Java JMS, .Net, Python,
 and Ruby.
 .
 This package provides the AMQP messaging development files.

Package: libsslcommon2
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: enterprise messaging system - common SSL files
 Apache Qpid is a cross-platform enterprise messaging system which implements
 the Advanced Message Queuing Protocol (AMQP), providing message brokers
 written in C++ and Java, along with clients for C++, Java JMS, .Net, Python,
 and Ruby.
 .
 This package provides the common SSL files.

Package: libsslcommon2-dev
Architecture: any
Section: libdevel
Depends: ${misc:Depends}
Description: enterprise messaging system - common SSL development files
 Apache Qpid is a cross-platform enterprise messaging system which implements
 the Advanced Message Queuing Protocol (AMQP), providing message brokers
 written in C++ and Java, along with clients for C++, Java JMS, .Net, Python,
 and Ruby.
 .
 This package provides the common SSL development files.

Package: librdmawrap2
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: enterprise messaging system - RDMA libraries
 Apache Qpid is a cross-platform enterprise messaging system which implements
 the Advanced Message Queuing Protocol (AMQP), providing message brokers
 written in C++ and Java, along with clients for C++, Java JMS, .Net, Python,
 and Ruby.
 .
 This package provides the Remote Direct Memory Access libraries.

Package: librdmawrap2-dev
Architecture: any
Section: libdevel
Depends: ${misc:Depends}
Description: enterprise messaging system - RDMA develpment files
 Apache Qpid is a cross-platform enterprise messaging system which implements
 the Advanced Message Queuing Protocol (AMQP), providing message brokers
 written in C++ and Java, along with clients for C++, Java JMS, .Net, Python,
 and Ruby.
 .
 This package provides the Remote Direct Memory Access development files.

Package: libqpidtypes1
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: enterprise messaging system - API libraries
 Apache Qpid is a cross-platform enterprise messaging system which implements
 the Advanced Message Queuing Protocol (AMQP), providing message brokers
 written in C++ and Java, along with clients for C++, Java JMS, .Net, Python,
 and Ruby.
 .
 This package provides the API libraries.

Package: libqpidtypes1-dev
Architecture: any
Section: libdevel
Depends: ${misc:Depends}
Description: enterprise messaging system - API development files
 Apache Qpid is a cross-platform enterprise messaging system which implements
 the Advanced Message Queuing Protocol (AMQP), providing message brokers
 written in C++ and Java, along with clients for C++, Java JMS, .Net, Python,
 and Ruby.
 .
 This package provides the API development files.

Package: libqpidcommon2
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: enterprise messaging system - common libraries
 Apache Qpid is a cross-platform enterprise messaging system which implements
 the Advanced Message Queuing Protocol (AMQP), providing message brokers
 written in C++ and Java, along with clients for C++, Java JMS, .Net, Python,
 and Ruby.
 .
 This package provides the common libraries.

Package: libqpidcommon2-dev
Architecture: any
Section: libdevel
Depends: ${misc:Depends}
Description: enterprise messaging system - common development files
 Apache Qpid is a cross-platform enterprise messaging system which implements
 the Advanced Message Queuing Protocol (AMQP), providing message brokers
 written in C++ and Java, along with clients for C++, Java JMS, .Net, Python,
 and Ruby.
 .
 This package provides the common development files.

Package: libqpidclient2
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: enterprise messaging system - AMQP client libraries
 Apache Qpid is a cross-platform enterprise messaging system which implements
 the Advanced Message Queuing Protocol (AMQP), providing message brokers
 written in C++ and Java, along with clients for C++, Java JMS, .Net, Python,
 and Ruby.
 .
 This package provides the AMQP client libraries.

Package: libqpidclient2-dev
Architecture: any
Section: libdevel
Depends: ${misc:Depends}
Description: enterprise messaging system - AMQP client developmet files
 Apache Qpid is a cross-platform enterprise messaging system which implements
 the Advanced Message Queuing Protocol (AMQP), providing message brokers
 written in C++ and Java, along with clients for C++, Java JMS, .Net, Python,
 and Ruby.
 .
 This package provides the AMQP client development files.

Package: libqpidbroker2
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: enterprise messaging system - AMQP broker libraries
 Apache Qpid is a cross-platform enterprise messaging system which implements
 the Advanced Message Queuing Protocol (AMQP), providing message brokers
 written in C++ and Java, along with clients for C++, Java JMS, .Net, Python,
 and Ruby.
 .
 This package provides the AMQP broker libraries.

Package: libqpidbroker2-dev
Architecture: any
Section: libdevel
Depends: ${misc:Depends}
Description: enterprise messaging system - AMQP broker development files
 Apache Qpid is a cross-platform enterprise messaging system which implements
 the Advanced Message Queuing Protocol (AMQP), providing message brokers
 written in C++ and Java, along with clients for C++, Java JMS, .Net, Python,
 and Ruby.
 .
 This package provides the AMQP broker development files.

Package: libqmfengine1
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: enterprise messaging system - QMF engine libraries
 Apache Qpid is a cross-platform enterprise messaging system which implements
 the Advanced Message Queuing Protocol (AMQP), providing message brokers
 written in C++ and Java, along with clients for C++, Java JMS, .Net, Python,
 and Ruby.
 .
 This package provides the Qpid Management Framework libraries.

Package: libqmfengine1-dev
Architecture: any
Section: libdevel
Depends: ${misc:Depends}
Description: enterprise messaging system - QMF engine development files
 Apache Qpid is a cross-platform enterprise messaging system which implements
 the Advanced Message Queuing Protocol (AMQP), providing message brokers
 written in C++ and Java, along with clients for C++, Java JMS, .Net, Python,
 and Ruby.
 .
 This package provides the Qpid Management Framework development files.

Package: python-cqpid
Architecture: any
Section: python
Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
Provides: ${python:Provides}
Description: enterprise messaging system - Python cqpid module
 Apache Qpid is a cross-platform enterprise messaging system which implements
 the Advanced Message Queuing Protocol (AMQP), providing message brokers
 written in C++ and Java, along with clients for C++, Java JMS, .Net, Python,
 and Ruby.
 .
 This package provides the Python cqpid module.

Package: python-qmf2
Architecture: any
Section: python
Depends: ${python:Depends}, ${misc:Depends}
Provides: ${python:Provides}
Description: enterprise messaging system - Python qmf2 module
 Apache Qpid is a cross-platform enterprise messaging system which implements
 the Advanced Message Queuing Protocol (AMQP), providing message brokers
 written in C++ and Java, along with clients for C++, Java JMS, .Net, Python,
 and Ruby.
 .
 This package provides the Python qmf2 module.

Package: python-cqmf2
Architecture: any
Section: python
Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
Provides: ${python:Provides}
Description:  enterprise messaging system - Python cqmf2 module
 Apache Qpid is a cross-platform enterprise messaging system which implements
 the Advanced Message Queuing Protocol (AMQP), providing message brokers
 written in C++ and Java, along with clients for C++, Java JMS, .Net, Python,
 and Ruby.
 .
 This package provides the Python cqmf2 module.

Package: python-qmf
Architecture: any
Section: python
Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
Provides: ${python:Provides}
Description: enterprise messaging system - Python qmf module
 Apache Qpid is a cross-platform enterprise messaging system which implements
 the Advanced Message Queuing Protocol (AMQP), providing message brokers
 written in C++ and Java, along with clients for C++, Java JMS, .Net, Python,
 and Ruby.
 .
 This package provides the Python qmf module.

#Package: qpid-doc
#Architecture: all
#Section: doc
#Depends: ${misc:Depends}
#Description: enterprise messaging system - documentation and examples
# Apache Qpid is a cross-platform enterprise messaging system which implements
# the Advanced Message Queuing Protocol (AMQP), providing message brokers
# written in C++ and Java, along with clients for C++, Java JMS, .Net, Python,
# and Ruby.
# .
# This package provides the documentation.

Package: libqpid-ruby1.8
Architecture: any
Section: ruby
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: enterprise messaging system - Ruby bindings
 Apache Qpid is a cross-platform enterprise messaging system which implements
 the Advanced Message Queuing Protocol (AMQP), providing message brokers
 written in C++ and Java, along with clients for C++, Java JMS, .Net, Python,
 and Ruby.
 .
 This package provides the Ruby support.

#Package: libqpid-perl
#Architecture: any
#Depends: ${shlibs:Depends}, ${misc:Depends}
#Section: perl
#Description: enterprise messaging system - Perl bindings
# Apache Qpid is a cross-platform enterprise messaging system which implements
# the Advanced Message Queuing Protocol (AMQP), providing message brokers
# written in C++ and Java, along with clients for C++, Java JMS, .Net, Python,
# and Ruby.
# .
# This package provides the Perl bindings.
diff -ru old/control new/control
--- old/control	2011-10-13 07:20:13.168548512 +0100
+++ new/control	2011-10-19 22:06:10.076214585 +0100
@@ -12,362 +12,363 @@
 Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, libsasl2-modules, sasl2-bin
 Replaces: qpid-broker
 Conflicts: qpid-broker
-Description: Apache qpid AMQP broker
- Apache Qpid is a cross-platform Enterprise Messaging system which implements
+Description: enterprise messaging system - broker
+ Apache Qpid is a cross-platform enterprise messaging system which implements
  the Advanced Message Queuing Protocol (AMQP), providing message brokers
  written in C++ and Java, along with clients for C++, Java JMS, .Net, Python,
  and Ruby.
  .
- This package contains the AMQP broker.
+ This package provides the AMQP broker.
 
 Package: qpid-client
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Apache qpid AMQP client
- Apache Qpid is a cross-platform Enterprise Messaging system which implements
+Description: enterprise messaging system - AMQP client
+ Apache Qpid is a cross-platform enterprise messaging system which implements
  the Advanced Message Queuing Protocol (AMQP), providing message brokers
  written in C++ and Java, along with clients for C++, Java JMS, .Net, Python,
  and Ruby.
  .
- This package contains the AMQP client support.
+ This package provides the AMQP client support.
 
 Package: libqmf1
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Apache qpid AMQP libraries
- Apache Qpid is a cross-platform Enterprise Messaging system which implements
+Description: enterprise messaging system - QMF libraries
+ Apache Qpid is a cross-platform enterprise messaging system which implements
  the Advanced Message Queuing Protocol (AMQP), providing message brokers
  written in C++ and Java, along with clients for C++, Java JMS, .Net, Python,
  and Ruby.
  .
- This package contains the QMF libraries.
+ This package provides the Qpid Management Framework libraries.
 
 Package: libqmf-dev
 Architecture: any
 Section: libdevel
 Depends: ${misc:Depends}
-Description: Apache qpid AMQP develpment files
- Apache Qpid is a cross-platform Enterprise Messaging system which implements
+Description: enterprise messaging system - QMF development files
+ Apache Qpid is a cross-platform enterprise messaging system which implements
  the Advanced Message Queuing Protocol (AMQP), providing message brokers
  written in C++ and Java, along with clients for C++, Java JMS, .Net, Python,
  and Ruby.
  .
- This package contains the QMF development files.
+ This package provides the Qpid Management Framework development files.
 
 Package: libqmf2-1
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Apache qpid AMQP libraries
- Apache Qpid is a cross-platform Enterprise Messaging system which implements
+Description: enterprise messaging system - QMF2 libraries
+ Apache Qpid is a cross-platform enterprise messaging system which implements
  the Advanced Message Queuing Protocol (AMQP), providing message brokers
  written in C++ and Java, along with clients for C++, Java JMS, .Net, Python,
  and Ruby.
  .
- This package contains the QMF2 libraries.
+ This package provides the Qpid Management Framework 2 libraries.
 
 Package: libqmf2-dev
 Architecture: any
 Section: libdevel
 Depends: ${misc:Depends}
-Description: Apache qpid AMQP develpment files
- Apache Qpid is a cross-platform Enterprise Messaging system which implements
+Description: enterprise messaging system - QMF2 development files
+ Apache Qpid is a cross-platform enterprise messaging system which implements
  the Advanced Message Queuing Protocol (AMQP), providing message brokers
  written in C++ and Java, along with clients for C++, Java JMS, .Net, Python,
  and Ruby.
  .
- This package contains the QMF2 development files.
+ This package provides the Qpid Management Framework 2 development files.
 
 Package: libqmfconsole2
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Apache qpid AMQP libraries
- Apache Qpid is a cross-platform Enterprise Messaging system which implements
+Description: enterprise messaging system - QMF console library
+ Apache Qpid is a cross-platform enterprise messaging system which implements
  the Advanced Message Queuing Protocol (AMQP), providing message brokers
  written in C++ and Java, along with clients for C++, Java JMS, .Net, Python,
  and Ruby.
  .
- This package contains the AMQP libraries.
+ This package provides the Qpid Management Framework console.
 
 Package: libqmfconsole2-dev
 Architecture: any
 Section: libdevel
 Depends: ${misc:Depends}
-Description: Apache qpid AMQP develpment files
- Apache Qpid is a cross-platform Enterprise Messaging system which implements
+Description: enterprise messaging system - QMF console development files
+ Apache Qpid is a cross-platform enterprise messaging system which implements
  the Advanced Message Queuing Protocol (AMQP), providing message brokers
  written in C++ and Java, along with clients for C++, Java JMS, .Net, Python,
  and Ruby.
  .
- This package contains the AMQP development files.
+ This package provides the Qpid Management Framework console development
+ files.
 
 Package: libqpidmessaging2
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Apache qpid AMQP libraries
- Apache Qpid is a cross-platform Enterprise Messaging system which implements
+Description: enterprise messaging system - AMQP libraries
+ Apache Qpid is a cross-platform enterprise messaging system which implements
  the Advanced Message Queuing Protocol (AMQP), providing message brokers
  written in C++ and Java, along with clients for C++, Java JMS, .Net, Python,
  and Ruby.
  .
- This package contains the AMQP messaging libraries.
+ This package provides the AMQP messaging libraries.
 
 Package: libqpidmessaging2-dev
 Architecture: any
 Section: libdevel
 Depends: ${misc:Depends}
-Description: Apache qpid AMQP develpment files
- Apache Qpid is a cross-platform Enterprise Messaging system which implements
+Description: enterprise messaging system - AMQP messaging development files
+ Apache Qpid is a cross-platform enterprise messaging system which implements
  the Advanced Message Queuing Protocol (AMQP), providing message brokers
  written in C++ and Java, along with clients for C++, Java JMS, .Net, Python,
  and Ruby.
  .
- This package contains the AMQP messaging development files.
+ This package provides the AMQP messaging development files.
 
 Package: libsslcommon2
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Apache qpid AMQP libraries
- Apache Qpid is a cross-platform Enterprise Messaging system which implements
+Description: enterprise messaging system - common SSL files
+ Apache Qpid is a cross-platform enterprise messaging system which implements
  the Advanced Message Queuing Protocol (AMQP), providing message brokers
  written in C++ and Java, along with clients for C++, Java JMS, .Net, Python,
  and Ruby.
  .
- This package contains the AMQP libraries.
+ This package provides the common SSL files.
 
 Package: libsslcommon2-dev
 Architecture: any
 Section: libdevel
 Depends: ${misc:Depends}
-Description: Apache qpid AMQP develpment files
- Apache Qpid is a cross-platform Enterprise Messaging system which implements
+Description: enterprise messaging system - common SSL development files
+ Apache Qpid is a cross-platform enterprise messaging system which implements
  the Advanced Message Queuing Protocol (AMQP), providing message brokers
  written in C++ and Java, along with clients for C++, Java JMS, .Net, Python,
  and Ruby.
  .
- This package contains the AMQP development files.
+ This package provides the common SSL development files.
 
 Package: librdmawrap2
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Apache qpid AMQP libraries
- Apache Qpid is a cross-platform Enterprise Messaging system which implements
+Description: enterprise messaging system - RDMA libraries
+ Apache Qpid is a cross-platform enterprise messaging system which implements
  the Advanced Message Queuing Protocol (AMQP), providing message brokers
  written in C++ and Java, along with clients for C++, Java JMS, .Net, Python,
  and Ruby.
  .
- This package contains the AMQP libraries.
+ This package provides the Remote Direct Memory Access libraries.
 
 Package: librdmawrap2-dev
 Architecture: any
 Section: libdevel
 Depends: ${misc:Depends}
-Description: Apache qpid AMQP develpment files
- Apache Qpid is a cross-platform Enterprise Messaging system which implements
+Description: enterprise messaging system - RDMA develpment files
+ Apache Qpid is a cross-platform enterprise messaging system which implements
  the Advanced Message Queuing Protocol (AMQP), providing message brokers
  written in C++ and Java, along with clients for C++, Java JMS, .Net, Python,
  and Ruby.
  .
- This package contains the AMQP development files.
+ This package provides the Remote Direct Memory Access development files.
 
 Package: libqpidtypes1
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Apache qpid AMQP libraries
- Apache Qpid is a cross-platform Enterprise Messaging system which implements
+Description: enterprise messaging system - API libraries
+ Apache Qpid is a cross-platform enterprise messaging system which implements
  the Advanced Message Queuing Protocol (AMQP), providing message brokers
  written in C++ and Java, along with clients for C++, Java JMS, .Net, Python,
  and Ruby.
  .
- This package contains the AMQP libraries.
+ This package provides the API libraries.
 
 Package: libqpidtypes1-dev
 Architecture: any
 Section: libdevel
 Depends: ${misc:Depends}
-Description: Apache qpid AMQP develpment files
- Apache Qpid is a cross-platform Enterprise Messaging system which implements
+Description: enterprise messaging system - API development files
+ Apache Qpid is a cross-platform enterprise messaging system which implements
  the Advanced Message Queuing Protocol (AMQP), providing message brokers
  written in C++ and Java, along with clients for C++, Java JMS, .Net, Python,
  and Ruby.
  .
- This package contains the AMQP development files.
+ This package provides the API development files.
 
 Package: libqpidcommon2
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Apache qpid AMQP libraries
- Apache Qpid is a cross-platform Enterprise Messaging system which implements
+Description: enterprise messaging system - common libraries
+ Apache Qpid is a cross-platform enterprise messaging system which implements
  the Advanced Message Queuing Protocol (AMQP), providing message brokers
  written in C++ and Java, along with clients for C++, Java JMS, .Net, Python,
  and Ruby.
  .
- This package contains the AMQP libraries.
+ This package provides the common libraries.
 
 Package: libqpidcommon2-dev
 Architecture: any
 Section: libdevel
 Depends: ${misc:Depends}
-Description: Apache qpid AMQP develpment files
- Apache Qpid is a cross-platform Enterprise Messaging system which implements
+Description: enterprise messaging system - common development files
+ Apache Qpid is a cross-platform enterprise messaging system which implements
  the Advanced Message Queuing Protocol (AMQP), providing message brokers
  written in C++ and Java, along with clients for C++, Java JMS, .Net, Python,
  and Ruby.
  .
- This package contains the AMQP development files.
+ This package provides the common development files.
 
 Package: libqpidclient2
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Apache qpid AMQP libraries
- Apache Qpid is a cross-platform Enterprise Messaging system which implements
+Description: enterprise messaging system - AMQP client libraries
+ Apache Qpid is a cross-platform enterprise messaging system which implements
  the Advanced Message Queuing Protocol (AMQP), providing message brokers
  written in C++ and Java, along with clients for C++, Java JMS, .Net, Python,
  and Ruby.
  .
- This package contains the AMQP libraries.
+ This package provides the AMQP client libraries.
 
 Package: libqpidclient2-dev
 Architecture: any
 Section: libdevel
 Depends: ${misc:Depends}
-Description: Apache qpid AMQP develpment files
- Apache Qpid is a cross-platform Enterprise Messaging system which implements
+Description: enterprise messaging system - AMQP client developmet files
+ Apache Qpid is a cross-platform enterprise messaging system which implements
  the Advanced Message Queuing Protocol (AMQP), providing message brokers
  written in C++ and Java, along with clients for C++, Java JMS, .Net, Python,
  and Ruby.
  .
- This package contains the AMQP development files.
+ This package provides the AMQP client development files.
 
 Package: libqpidbroker2
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Apache qpid AMQP libraries
- Apache Qpid is a cross-platform Enterprise Messaging system which implements
+Description: enterprise messaging system - AMQP broker libraries
+ Apache Qpid is a cross-platform enterprise messaging system which implements
  the Advanced Message Queuing Protocol (AMQP), providing message brokers
  written in C++ and Java, along with clients for C++, Java JMS, .Net, Python,
  and Ruby.
  .
- This package contains the AMQP libraries.
+ This package provides the AMQP broker libraries.
 
 Package: libqpidbroker2-dev
 Architecture: any
 Section: libdevel
 Depends: ${misc:Depends}
-Description: Apache qpid AMQP develpment files
- Apache Qpid is a cross-platform Enterprise Messaging system which implements
+Description: enterprise messaging system - AMQP broker development files
+ Apache Qpid is a cross-platform enterprise messaging system which implements
  the Advanced Message Queuing Protocol (AMQP), providing message brokers
  written in C++ and Java, along with clients for C++, Java JMS, .Net, Python,
  and Ruby.
  .
- This package contains the AMQP development files.
+ This package provides the AMQP broker development files.
 
 Package: libqmfengine1
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Apache qpid AMQP libraries
- Apache Qpid is a cross-platform Enterprise Messaging system which implements
+Description: enterprise messaging system - QMF engine libraries
+ Apache Qpid is a cross-platform enterprise messaging system which implements
  the Advanced Message Queuing Protocol (AMQP), providing message brokers
  written in C++ and Java, along with clients for C++, Java JMS, .Net, Python,
  and Ruby.
  .
- This package contains the AMQP libraries.
+ This package provides the Qpid Management Framework libraries.
 
 Package: libqmfengine1-dev
 Architecture: any
 Section: libdevel
 Depends: ${misc:Depends}
-Description: Apache qpid AMQP develpment files
- Apache Qpid is a cross-platform Enterprise Messaging system which implements
+Description: enterprise messaging system - QMF engine development files
+ Apache Qpid is a cross-platform enterprise messaging system which implements
  the Advanced Message Queuing Protocol (AMQP), providing message brokers
  written in C++ and Java, along with clients for C++, Java JMS, .Net, Python,
  and Ruby.
  .
- This package contains the AMQP development files.
+ This package provides the Qpid Management Framework development files.
 
 Package: python-cqpid
 Architecture: any
 Section: python
 Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
 Provides: ${python:Provides}
-Description: Apache qpid AMQP Python cqpid module
- Apache Qpid is a cross-platform Enterprise Messaging system which implements
+Description: enterprise messaging system - Python cqpid module
+ Apache Qpid is a cross-platform enterprise messaging system which implements
  the Advanced Message Queuing Protocol (AMQP), providing message brokers
  written in C++ and Java, along with clients for C++, Java JMS, .Net, Python,
  and Ruby.
  .
- This package contains the AMQP Python cqpid module.
+ This package provides the Python cqpid module.
 
 Package: python-qmf2
 Architecture: any
 Section: python
 Depends: ${python:Depends}, ${misc:Depends}
 Provides: ${python:Provides}
-Description: Apache qpid AMQP Python qmf2 module
- Apache Qpid is a cross-platform Enterprise Messaging system which implements
+Description: enterprise messaging system - Python qmf2 module
+ Apache Qpid is a cross-platform enterprise messaging system which implements
  the Advanced Message Queuing Protocol (AMQP), providing message brokers
  written in C++ and Java, along with clients for C++, Java JMS, .Net, Python,
  and Ruby.
  .
- This package contains the AMQP Python qmf2 module.
+ This package provides the Python qmf2 module.
 
 Package: python-cqmf2
 Architecture: any
 Section: python
 Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
 Provides: ${python:Provides}
-Description: Apache qpid AMQP Python cqmf2 module
- Apache Qpid is a cross-platform Enterprise Messaging system which implements
+Description:  enterprise messaging system - Python cqmf2 module
+ Apache Qpid is a cross-platform enterprise messaging system which implements
  the Advanced Message Queuing Protocol (AMQP), providing message brokers
  written in C++ and Java, along with clients for C++, Java JMS, .Net, Python,
  and Ruby.
  .
- This package contains the AMQP Python cqmf2 module.
+ This package provides the Python cqmf2 module.
 
 Package: python-qmf
 Architecture: any
 Section: python
 Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
 Provides: ${python:Provides}
-Description: Apache qpid AMQP Python qmf module
- Apache Qpid is a cross-platform Enterprise Messaging system which implements
+Description: enterprise messaging system - Python qmf module
+ Apache Qpid is a cross-platform enterprise messaging system which implements
  the Advanced Message Queuing Protocol (AMQP), providing message brokers
  written in C++ and Java, along with clients for C++, Java JMS, .Net, Python,
  and Ruby.
  .
- This package contains the AMQP Python qmf module.
+ This package provides the Python qmf module.
 
 #Package: qpid-doc
 #Architecture: all
 #Section: doc
 #Depends: ${misc:Depends}
-#Description: Apache qpid AMQP documentation and examples
-# Apache Qpid is a cross-platform Enterprise Messaging system which implements
+#Description: enterprise messaging system - documentation and examples
+# Apache Qpid is a cross-platform enterprise messaging system which implements
 # the Advanced Message Queuing Protocol (AMQP), providing message brokers
 # written in C++ and Java, along with clients for C++, Java JMS, .Net, Python,
 # and Ruby.
 # .
-# This package contains the AMQP documentation.
+# This package provides the documentation.
 
 Package: libqpid-ruby1.8
 Architecture: any
 Section: ruby
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Apache qpid Ruby bindings
- Apache Qpid is a cross-platform Enterprise Messaging system which implements
+Description: enterprise messaging system - Ruby bindings
+ Apache Qpid is a cross-platform enterprise messaging system which implements
  the Advanced Message Queuing Protocol (AMQP), providing message brokers
  written in C++ and Java, along with clients for C++, Java JMS, .Net, Python,
  and Ruby.
  .
- This package contains the AMQP Ruby support.
+ This package provides the Ruby support.
 
 #Package: libqpid-perl
 #Architecture: any
 #Depends: ${shlibs:Depends}, ${misc:Depends}
 #Section: perl
-#Description: Apache qpid Perl bindings
-# Apache Qpid is a cross-platform Enterprise Messaging system which implements
+#Description: enterprise messaging system - Perl bindings
+# Apache Qpid is a cross-platform enterprise messaging system which implements
 # the Advanced Message Queuing Protocol (AMQP), providing message brokers
 # written in C++ and Java, along with clients for C++, Java JMS, .Net, Python,
 # and Ruby.
 # .
-# This package contains the Qpid perl bindings.
+# This package provides the Perl bindings.
diff -ru old/qpidd.templates new/qpidd.templates
--- old/qpidd.templates	2011-10-13 07:20:17.456553493 +0100
+++ new/qpidd.templates	2011-10-19 21:15:38.540548036 +0100
@@ -1,15 +1,15 @@
 Template: qpidd/password1
 Type: password
 _Description: Administrator password:
- Please enter the password for the QPID daemon administrator.
+ Please enter the password for the Qpid daemon administrator.
 
 Template: qpidd/password2
 Type: password
-_Description: Confirm password:
- Please enter the password for the QPID daemon administrator again to verify
- that you have typed it correctly.
+_Description: Re-enter password to verify:
+ Please enter the same Qpid daemon administrator password again to verify that you have typed it
+ correctly.
 
 Template: qpidd/password_mismatch
 Type: note
-_Description: Password mismatch
+_Description: Password input error
  The two passwords you entered were not the same. Please try again.

Reply to: