Hi Mathieu, On Sat, Mar 21, 2015 at 08:50:59PM -0400, David Prévot wrote: > Package: pkg-php-tools > Version: 1.28
I used the /m switch so the beginning of a line could be detected in a
multiline context, but the (existing) replacement for bullets deserves
one too. Feel free to merge the attached patch with the previous one.
> + $tmp = preg_replace('/^ /m', '', $tmp);
The package.xml file from php-net-ldap2 contains:
<description>Net_LDAP2 is the successor of Net_LDAP which is a clone of Perls
Net::LDAP
object interface to directory servers. It does contain most of
Net::LDAPs
features but has some own too.
With Net_LDAP2 you have:
* A simple object-oriented interface to connections, searches
entries and filters.
* Support for TLS and LDAP v3.
[…]
pkg-php-tools currently translates
Description: ${phppear:summary}
${phppear:description}
as:
Description: Object oriented interface for searching and manipulating
LDAP-entries
Net_LDAP2 is the successor of Net_LDAP which is a clone of Perls Net::LDAP
object interface to directory servers. It does contain most of
Net::LDAPs
features but has some own too.
With Net_LDAP2 you have:
* A simple object-oriented interface to connections, searches
entries and filters.
* Support for TLS and LDAP v3.
[…]
After applying the proposed patch, the long description looks more
conventional:
Description: Object oriented interface for searching and manipulating
LDAP-entries
Net_LDAP2 is the successor of Net_LDAP which is a clone of Perls Net::LDAP
object interface to directory servers. It does contain most of Net::LDAPs
features but has some own too.
With Net_LDAP2 you have:
* A simple object-oriented interface to connections, searches entries and
filters.
* Support for TLS and LDAP v3.
[…]
Yet, the long line from the first bullet is wrapped, but the indentation
is not respected, so there is still room for improvement (of the
headache kind…). We may change the bullet handling by:
- split the input by lines
- handle the bullets (indent, and linewrap at 72 characters)
- merge back the input
Yet, that won’t handle correctly an original input like
* A very long line
that continues
on more than a line
Maybe there is already a Dpkg Perl library to handle such description
properly, if not, I may propose a patch to implement the above proposed
behaviour if you think it would still be an improvement.
Regards
David
From fd4fac655291f9172f37fd3440bdc5bc0b913e93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Pr=C3=A9vot?= <taf...@debian.org>
Date: Mon, 23 Mar 2015 12:43:22 -0400
Subject: [PATCH] Actually indent bullets
---
share/php/pkgtools/base/utils.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/share/php/pkgtools/base/utils.php b/share/php/pkgtools/base/utils.php
index 0d77ae2..d3c48aa 100644
--- a/share/php/pkgtools/base/utils.php
+++ b/share/php/pkgtools/base/utils.php
@@ -59,7 +59,7 @@ class Utils {
// Drop starting spaces
$tmp = preg_replace('/^ /m', '', $tmp);
// Indent bullets
- $tmp = preg_replace('/^\*/', ' *', $tmp);
+ $tmp = preg_replace('/^\*/m', ' *', $tmp);
// Wrap to 80 chars
$tmp = wordwrap($tmp, 78);
// Convert new lines to ${Newline}
--
2.1.4
signature.asc
Description: Digital signature
