Package: pkg-php-tools
Version: 1.12
Severity: normal
Tags: patch
Control: affects -1 php-texy

Hi,

Since the #717340, some newlines are not kept (e.g., in php-texy). The
attached workaround fixes the issue, maybe someone will propose
something less ugly.

Regards

David

-- System Information:
Debian Release: jessie/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (500, 'testing'), (500, 'stable'), (500, 
'oldstable'), (100, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.12-1-rt-amd64 (SMP w/1 CPU core; PREEMPT)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages pkg-php-tools depends on:
ii  debhelper  9.20131227
ii  php-pear   5.5.9+dfsg-1
ii  php5-cli   5.5.9+dfsg-1
ii  php5-json  1.3.3-1

pkg-php-tools recommends no packages.

Versions of packages pkg-php-tools suggests:
ii  dh-make  0.63

-- no debconf information
From 1d607bfec146237f2142e2a642160787c224ad20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Pr=C3=A9vot?= <[email protected]>
Date: Tue, 11 Feb 2014 21:22:38 -0400
Subject: [PATCH] dh_phppear: Keep newline in description

The tabs handling introduced in 5e34fee was a bit too overwhelming.
---
 bin/dh_phppear | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bin/dh_phppear b/bin/dh_phppear
index 257af94..acb7beb 100755
--- a/bin/dh_phppear
+++ b/bin/dh_phppear
@@ -119,7 +119,9 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 		$summary =~ s/\.$//;
 		addsubstvar($package, "phppear:summary", $summary);
 		my $description = _shell_exec('/usr/share/pkg-php-tools/scripts/phppkginfo -d description .');
+		$description =~ s/^$/—DELETEME—/mg;
 		$description =~ s/^\s*//mg;
+		$description =~ s/—DELETEME—//mg;
 		$description =~ s/^\*/ */mg;
 		local($Text::Wrap::separator) = '${Newline}';
 		# Wrap and replace empty lines with a dot
-- 
1.9.0.rc3

Attachment: signature.asc
Description: Digital signature

Reply via email to