Bug#645160: [RFR] templates://qpid-cpp/{qpidd.templates}

2011-10-24 Thread Cajus Pollmeier

Am 21.10.2011 10:05, schrieb Cajus Pollmeier:

Am 21.10.2011 06:00, schrieb Christian PERRIER:

Quoting Cajus Pollmeier (ca...@naasa.net):


But, ok. Its now lowercase. Not adding the diff this time. The
latest and greatest version is here:

https://github.com/cajus/qpid-cpp-debian/blob/master/debian/control


I'd just suggest s/This package contains/This package provides (we
tend to standardize on this over all reviews).

Ok. I've fixed that.

Here are the current patch/infos.
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.0 
+0200
+++ qpid-cpp-debian/debian/changelog2011-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.0 +0200
+++ qpid-cpp-debian/debian/control  2011-10-21 10:04:56.496957757 +0200
@@ -12,362 +12,362 @@
 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.
  .
- 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 QMF2 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

Bug#645160: [RFR] templates://qpid-cpp/{qpidd.templates}

2011-10-21 Thread Cajus Pollmeier

Am 21.10.2011 06:00, schrieb Christian PERRIER:

Quoting Cajus Pollmeier (ca...@naasa.net):


But, ok. Its now lowercase. Not adding the diff this time. The
latest and greatest version is here:

https://github.com/cajus/qpid-cpp-debian/blob/master/debian/control


I'd just suggest s/This package contains/This package provides (we
tend to standardize on this over all reviews).

Ok. I've fixed that.



--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#645160: [RFR] templates://qpid-cpp/{qpidd.templates}

2011-10-20 Thread Cajus Pollmeier

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.0 +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
--- 

Bug#645160: [RFR] templates://qpid-cpp/{qpidd.templates}

2011-10-20 Thread Justin B Rye
Cajus Pollmeier wrote:
 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.
[...]
 +Description: Enterprise messaging system - AMQP broker
^
No need to capitalise the first word of a synopsis - it isn't a
sentence.  Unless of course it's a Star Trek reference.
-- 
JBR with qualifications in linguistics, experience as a Debian
sysadmin, and probably no clue about this particular package



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#645160: [RFR] templates://qpid-cpp/{qpidd.templates}

2011-10-20 Thread Cajus Pollmeier

Am 20.10.2011 11:04, schrieb Justin B Rye:

Cajus Pollmeier wrote:

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.

[...]

+Description: Enterprise messaging system - AMQP broker

 ^
No need to capitalise the first word of a synopsis - it isn't a
sentence.  Unless of course it's a Star Trek reference.


LOL. I *thought* that I remembered that lintian was picky about that 
some time ago ;-)


But, ok. Its now lowercase. Not adding the diff this time. The latest 
and greatest version is here:


https://github.com/cajus/qpid-cpp-debian/blob/master/debian/control

Best,
Cajus



--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#645160: [RFR] templates://qpid-cpp/{qpidd.templates}

2011-10-20 Thread Christian PERRIER
Quoting Cajus Pollmeier (ca...@naasa.net):

 But, ok. Its now lowercase. Not adding the diff this time. The
 latest and greatest version is here:
 
 https://github.com/cajus/qpid-cpp-debian/blob/master/debian/control


I'd just suggest s/This package contains/This package provides (we
tend to standardize on this over all reviews).




signature.asc
Description: Digital signature


Bug#645160: [RFR] templates://qpid-cpp/{qpidd.templates}

2011-10-19 Thread Christian PERRIER
Please find, for review, the debconf templates and packages descriptions for 
the qpid-cpp source package.

Please note that I gave up in the middle of debian/control
review. Apparently, there has been some massive copy/paste in this
file, but parts specific to each package have not been changed
afterwards.

Not being the maintainer, it is hard ofr me to figure out what exactly
is provided by packages like libqmfengine1-dev and the like


This review will last from Wednesday, October 19, 2011 to Saturday, October 29, 
2011.

Please send reviews as unified diffs (diff -u) against the original
files. Comments about your proposed changes will be appreciated.

Your review should be sent as an answer to this mail.

When appropriate, I will send intermediate requests for review, with
[RFRn] (n=2) as a subject tag.

When we will reach a consensus, I send a Last Chance For
Comments mail with [LCFC] as a subject tag.

Finally, a summary will be sent to the review bug report,
and a mail will be sent to this list with [BTS] as a subject tag.

Rationale:
--- qpid-cpp.old/debian/qpidd.templates 2011-10-13 07:39:54.897641213 +0200
+++ qpid-cpp/debian/qpidd.templates 2011-10-17 07:52:14.296392842 +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.

I actually re-used the exact same wording than the one used in Debian
Installerr, for consistency.


--- qpid-cpp.old/debian/control 2011-10-13 07:39:54.897641213 +0200
+++ qpid-cpp/debian/control 2011-10-19 15:01:59.073249023 +0200
@@ -12,277 +12,278 @@
 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: cross-platform 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.

.../...

All other descriptiosn have similar changes (except for synopsis as I
gave up as already explained).

1) use a more detailed synopsis
2) use a general - specific layout in synopsis
3) uncapitalize EnterpriseMessaging

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.
--- qpid-cpp.old/debian/qpidd.templates 2011-10-13 07:39:54.897641213 +0200
+++ qpid-cpp/debian/qpidd.templates 2011-10-17 07:52:14.296392842 +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.
--- qpid-cpp.old/debian/control 2011-10-13 07:39:54.897641213 +0200
+++ qpid-cpp/debian/control 2011-10-19 15:05:40.243665853 +0200
@@ -12,277 +12,278 @@
 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: cross-platform 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: 

Bug#645160: [RFR] templates://qpid-cpp/{qpidd.templates}

2011-10-19 Thread 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™!)

  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 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
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