Am 19.10.2011 23:10, schrieb Justin B Rye:
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™!")

Yes, you're right. I've unified that over the control file.

  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

On the one hand "Apache Qpid" is shorter and gives a reference to what is packaged. On the other hand "Enterprise messaging system" tells more about what it is - but it's more generic. I'm not sure how the short description should be in this case.

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.

I've unified the support/module/binding information to be "binding" and tried to fix most of the comments above. Thanks for reviewing.

Cajus
diff -u qpid-cpp-debian.orig/debian/changelog qpid-cpp-debian/debian/changelog
--- qpid-cpp-debian.orig/debian/changelog	2011-09-29 08:28:53.000000000 +0200
+++ qpid-cpp-debian/debian/changelog	2011-10-20 09:19:02.984957927 +0200
@@ -1,3 +1,18 @@
+qpid-cpp (0.12-2) unstable; urgency=low
+
+  [ Cajus Pollmeier ]
+  * Updated valgrind dependencies to allow builds on architectures
+    not supported by valgrind.
+  * Fixed compilation error on armel.
+  * Added accidently missing qpid-doc package.
+
+  [ Christian Perrier ]
+  * Debconf templates and debian/control reviewed by the debian-l10n-
+    english team as part of the Smith review project. Closes: #645160
+  * [Debconf translation updates]
+
+ -- Cajus Pollmeier <ca...@debian.org>  Mon, 10 Oct 2011 16:25:38 +0200
+
 qpid-cpp (0.12-1) unstable; urgency=low
 
   * Initial release. (Closes: #640497)
diff -u qpid-cpp-debian.orig/debian/control qpid-cpp-debian/debian/control
--- qpid-cpp-debian.orig/debian/control	2011-10-05 15:58:52.000000000 +0200
+++ qpid-cpp-debian/debian/control	2011-10-20 09:54:32.804959936 +0200
@@ -2,7 +2,7 @@
 Section: misc
 Priority: extra
 Maintainer: Cajus Pollmeier <ca...@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
+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, 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 [any-i386 any-amd64 arm], zip, procps
 X-Python-Version: 2.7
 Standards-Version: 3.9.2
 Homepage: http://qpid.apache.org
@@ -12,8 +12,8 @@
 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 - AMQP 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.
@@ -23,8 +23,8 @@
 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.
@@ -34,31 +34,31 @@
 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 contains 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 contains 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.
@@ -69,8 +69,8 @@
 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.
@@ -80,31 +80,31 @@
 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 contains the QMF console library.
 
 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 contains the QMF 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 messaging 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.
@@ -115,8 +115,8 @@
 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.
@@ -126,54 +126,54 @@
 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 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 contains the AMQP SSL libraries.
 
 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 contains the AMQP 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 contains the AMQP 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 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 contains the AMQP 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.
@@ -184,8 +184,8 @@
 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.
@@ -195,179 +195,179 @@
 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 contains the common AMQP 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 contains the common AMQP 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 - 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 contains 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 - client 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 contains 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 - 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 contains 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 - 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 contains 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 contains the QMF engine 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 contains the QMF engine 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: Apache Qpid Python cqpid 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 Python cqpid module.
+ This package contains the Python cqpid bindings.
 
 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: Apache Qpid Python qmf2 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 Python qmf2 module.
+ This package contains the Python QMF2 bindings.
 
 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: Apache Qpid Python cqmf2 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 Python cqmf2 module.
+ This package contains the Python QMF2 bindings.
 
 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: Apache Qpid 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 contains the Apache Qpid Python QMF bindings.
 
-#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
-# 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.
+Package: qpid-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}
+Description: Apache Qpid 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 Apache Qpid 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: Apache Qpid 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 contains the Apache Qpid Ruby bindings.
 
 #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: Apache Qpid 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 contains the Apache Qpid Perl bindings.
Common subdirectories: qpid-cpp-debian.orig/debian/patches and qpid-cpp-debian/debian/patches
Common subdirectories: qpid-cpp-debian.orig/debian/po and qpid-cpp-debian/debian/po
diff -u qpid-cpp-debian.orig/debian/qpidd.templates qpid-cpp-debian/debian/qpidd.templates
--- qpid-cpp-debian.orig/debian/qpidd.templates	2011-09-29 08:28:53.000000000 +0200
+++ qpid-cpp-debian/debian/qpidd.templates	2011-10-20 09:48:52.944958149 +0200
@@ -5,11 +5,11 @@
 
 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.
Common subdirectories: qpid-cpp-debian.orig/debian/rsyslog and qpid-cpp-debian/debian/rsyslog
Common subdirectories: qpid-cpp-debian.orig/debian/source and qpid-cpp-debian/debian/source
Source: qpid-cpp
Section: misc
Priority: extra
Maintainer: Cajus Pollmeier <ca...@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, 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 [any-i386 any-amd64 arm], 
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 - AMQP 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.

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 contains 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 contains 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 contains 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 contains the QMF2 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 contains the QMF2 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 contains the QMF console library.

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 contains the QMF console development files.

Package: libqpidmessaging2
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Enterprise messaging system - AMQP messaging 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.

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 contains the AMQP messaging development files.

Package: libsslcommon2
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Enterprise messaging system - common SSL 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 SSL libraries.

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 contains the AMQP 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 contains the AMQP Remote Direct Memory Access libraries.

Package: librdmawrap2-dev
Architecture: any
Section: libdevel
Depends: ${misc:Depends}
Description: Enterprise messaging system - RDMA 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 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 contains the AMQP 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 contains the AMQP 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 contains the common AMQP 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 contains the common AMQP development files.

Package: libqpidclient2
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Enterprise messaging system - 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 client libraries.

Package: libqpidclient2-dev
Architecture: any
Section: libdevel
Depends: ${misc:Depends}
Description: Enterprise messaging system - client 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 client development files.

Package: libqpidbroker2
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Enterprise messaging system - 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 broker libraries.

Package: libqpidbroker2-dev
Architecture: any
Section: libdevel
Depends: ${misc:Depends}
Description: Enterprise messaging system - 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 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 contains the QMF engine 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 contains the QMF engine development files.

Package: python-cqpid
Architecture: any
Section: python
Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
Provides: ${python:Provides}
Description: Apache Qpid Python cqpid 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 Python cqpid bindings.

Package: python-qmf2
Architecture: any
Section: python
Depends: ${python:Depends}, ${misc:Depends}
Provides: ${python:Provides}
Description: Apache Qpid Python qmf2 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 Python QMF2 bindings.

Package: python-cqmf2
Architecture: any
Section: python
Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
Provides: ${python:Provides}
Description: Apache Qpid Python cqmf2 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 Python QMF2 bindings.

Package: python-qmf
Architecture: any
Section: python
Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
Provides: ${python:Provides}
Description: Apache Qpid 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 Apache Qpid Python QMF bindings.

Package: qpid-doc
Architecture: all
Section: doc
Depends: ${misc:Depends}
Description: Apache Qpid 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 Apache Qpid 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
 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 Apache Qpid Ruby bindings.

#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
# 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 Apache Qpid Perl bindings.
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.

Reply via email to