Your message dated Thu, 25 Jun 2015 21:22:42 +0000
with message-id <[email protected]>
and subject line Bug#780930: fixed in pkg-php-tools 1.30
has caused the Debian Bug report #780930,
regarding Please, drop excessive spaces from substvar
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)


-- 
780930: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=780930
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: pkg-php-tools
Version: 1.28
Severity: wishlist
Tags: patch

The package.xml file from php-services-weather contains:

 <summary>This class acts as an interface to various online 
weather-services.</summary>
 <description>Services_Weather searches for given locations and retrieves 
current
        weather data and, dependent on the used service, also forecasts. Up to
        now, GlobalWeather from CapeScience, Weather XML from EJSE (US only),
[…]

pkg-php-tools currently translates

Description: ${phppear:summary}
 ${phppear:description}

as:

Description: This class acts as an interface to various online weather-services
 Services_Weather searches for given locations and retrieves current
         weather data and, dependent on the used service, also forecasts. Up to
         now, GlobalWeather from CapeScience, Weather XML from EJSE (US only),
[…]

After applying the proposed patch, the long description looks more
conventional:

Description: This class acts as an interface to various online weather-services
 Services_Weather searches for given locations and retrieves current
 weather data and, dependent on the used service, also forecasts. Up to
 now, GlobalWeather from CapeScience, Weather XML from EJSE (US only),
[…]

Regards

David
From 231e74fcf43d871a689df1b109c9e04a18f18ac8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Pr=C3=A9vot?= <[email protected]>
Date: Sat, 21 Mar 2015 14:56:43 -0400
Subject: [PATCH] Drop excessive spaces from substvar

---
 share/php/pkgtools/base/utils.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/share/php/pkgtools/base/utils.php b/share/php/pkgtools/base/utils.php
index acc35ef..0d77ae2 100644
--- a/share/php/pkgtools/base/utils.php
+++ b/share/php/pkgtools/base/utils.php
@@ -44,8 +44,9 @@ class Utils {
 
     /**
      * Format string to substvar format:
+     * - Replace tabs and drop excessive spaces
+     * - Drop starting spaces
      * - Indent bullets
-     * - Replace tabs
      * - Wrap to 80 chars
      * - Convert new lines to ${Newline}
      * - Split paragraphs
@@ -53,10 +54,12 @@ class Utils {
      * @param bool $force If true, reload even if already loaded
      */
     static public function substvar($input) {
+        // Replace tabs and drop excessive spaces
+        $tmp = preg_replace('/\h+/', ' ', $input);
+        // Drop starting spaces
+        $tmp = preg_replace('/^ /m', '', $tmp);
         // Indent bullets
-        $tmp = preg_replace('/^\*/', ' *', $input);
-        // Replace tabs
-        $tmp = preg_replace('/\t+/', ' ', $tmp);
+        $tmp = preg_replace('/^\*/', ' *', $tmp);
         // Wrap to 80 chars
         $tmp = wordwrap($tmp, 78);
         // Convert new lines to ${Newline}
-- 
2.1.4

Attachment: signature.asc
Description: Digital signature


--- End Message ---
--- Begin Message ---
Source: pkg-php-tools
Source-Version: 1.30

We believe that the bug you reported is fixed in the latest version of
pkg-php-tools, which is due to be installed in the Debian FTP archive.

A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Mathieu Parent <[email protected]> (supplier of updated pkg-php-tools package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Format: 1.8
Date: Thu, 25 Jun 2015 21:45:12 +0200
Source: pkg-php-tools
Binary: pkg-php-tools
Architecture: source all
Version: 1.30
Distribution: unstable
Urgency: medium
Maintainer: Debian PHP PEAR Maintainers <[email protected]>
Changed-By: Mathieu Parent <[email protected]>
Description:
 pkg-php-tools - various packaging tools and scripts for PHP packages
Closes: 780537 780930 785446 789943
Changes:
 pkg-php-tools (1.30) unstable; urgency=medium
 .
   [ Mathieu Parent ]
   * PEAR:
     - consider sourceforge.net like a TLD (Closes: #785446)
     - tests for "Drop excessive spaces from substvar"
   * Base: Make help output deterministic
 .
   [ David Prévot ]
   * PEAR:
     - Drop excessive spaces from substvar (Closes: #780930)
     - pcntl is built-in (Closes: #780537)
   * Composer: Spaces are now equivalent to comma in constraints and mean AND
     (Closes: #789943)
Checksums-Sha1:
 72cc2644af5fca3b853fa7dab1a6bbd45241e622 1768 pkg-php-tools_1.30.dsc
 fe0732f54bd78335b1be7887bd34e46f5a088440 37408 pkg-php-tools_1.30.tar.xz
 101079fce0dc3429e27144722f9ae39b66ff945e 37538 pkg-php-tools_1.30_all.deb
Checksums-Sha256:
 813a482c84be2184f994edf4300a5d3503dcfd85dc3b6b38c404a7de570e52ea 1768 
pkg-php-tools_1.30.dsc
 c4226aff875886dab0f9a5dadd145af725c03f9ecf4509129a76fe50bf3d06a5 37408 
pkg-php-tools_1.30.tar.xz
 da375e723561e9e140a9ab3dafb0e59245f495ddd33c87357d2566fa8759e9b9 37538 
pkg-php-tools_1.30_all.deb
Files:
 5e4191121e61dbdef8a6a14a28fbc3b6 1768 php extra pkg-php-tools_1.30.dsc
 470d884eeaba4bbe23c5444fcc0ce560 37408 php extra pkg-php-tools_1.30.tar.xz
 21e4ca7567b8b874f22a962394b03662 37538 php extra pkg-php-tools_1.30_all.deb

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iQIcBAEBCAAGBQJVjGM8AAoJEK4DmARmaB+lTDIP/i2ZvwcPHA/7KykgXyI3NLea
3cx0OenoQgQINjYUjXMvM/vqxZyIRLRw4S79cknexVR8Hm3oGBDZ52xr/0l1XRA8
o7WmuCy5ZY5Crf7Gw5DxKT9Fm5Cn4wtQ4m3b269DkdlDTG/6diIzufnhG2M7N7gB
u+0CGMi+mq2Y0CKo2duDcq3y91jCTMNUNfFN/d283DdxSeCcMcD158LdFjlQZkMO
KdFE0XBS+LTbuVmeo56aISQscX1mCNKbGk1X2zTZPeSCWQD4W7F8aBxgwv3HMKdI
qTwKtDBt6cd5llAWDSxISmmaK5p81JYbeHMTALs24aLjw1gl5VzUW9Ng+SHygR18
KSHjhMZ6NWlSJ8rk1wkm+9f53xfToonhSWp8qoNUH7HJ8mwxDhXnYmD/dAOMG8SY
ym18AZLxGRITUVjDPwaXSjXogQHyElXa0O6i3JOkcYe7hqmUSo2VjbpeQX4NzWrR
CxqtVTiizdY0Dphmbk+vv7/4cosRluu0eItLBEV6qlwtdFzBugDyNGWFXl41lrn+
0SsjTWnqPXSfJW+N+CZWnKEpmCTTMRPnIKWSRyUuossn5varHOhi5qc3frOhMwcO
bYb7N0Tu5AnY6kpgBBwOSwXSPwnBHQVRtrqV0Wwzou24EPUg4HD+o2bichtDkU7F
NzLm1xHEmXP1Vt1/P+Z5
=LN1o
-----END PGP SIGNATURE-----

--- End Message ---

Reply via email to