r20054 - in /trunk/dh-make-perl: debian/changelog dh-make-perl

[gregoa at users.alioth.debian.org]

Author: gregoa
Date: Sat May 17 13:08:24 2008
New Revision: 20054

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=20054
Log:
* Fix mangling of long description, which was broken in 0.44; thanks to
  Kevin Ryde for the bugreport (closes: #481560).
* Tighten regexp when checking for empty long description, avoids spurious
  warnings.

Modified:
    trunk/dh-make-perl/debian/changelog
    trunk/dh-make-perl/dh-make-perl

Modified: trunk/dh-make-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/debian/changelog?rev=20054&op=diff
==============================================================================
--- trunk/dh-make-perl/debian/changelog (original)
+++ trunk/dh-make-perl/debian/changelog Sat May 17 13:08:24 2008
@@ -1,3 +1,12 @@
+dh-make-perl (0.45) UNRELEASED; urgency=low
+
+  * Fix mangling of long description, which was broken in 0.44; thanks to
+    Kevin Ryde for the bugreport (closes: #481560).
+  * Tighten regexp when checking for empty long description, avoids spurious
+    warnings.
+
+ -- gregor herrmann <gregoa at debian.org>  Sat, 17 May 2008 14:59:49 +0200
+
 dh-make-perl (0.44) unstable; urgency=low
 
   [ gregor herrmann ]

Modified: trunk/dh-make-perl/dh-make-perl
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/dh-make-perl?rev=20054&op=diff
==============================================================================
--- trunk/dh-make-perl/dh-make-perl (original)
+++ trunk/dh-make-perl/dh-make-perl Sat May 17 13:08:24 2008
@@ -226,7 +226,7 @@
     unless $desc;
 print "Package does not provide a long description - " , 
     " Please fill it in manually.\n"
-    if (!defined $longdesc or $longdesc =~ /^\s*\.?\s*/);
+    if (!defined $longdesc or $longdesc =~ /^\s*\.?\s*$/);
 print "Using maintainer: $maintainer\n";
 print "Found changelog: $changelog\n" if defined $changelog;
 print "Found docs: @docs\n";
@@ -651,9 +651,9 @@
 	unless ($longdesc) {
 		$longdesc = $parser->get('DESCRIPTION')
 			|| $parser->get('DETAILS')
-			|| $desc
-			|| ''; # Just to avoid warnings...
-	} else {
+			|| $desc;
+	}
+	if (defined $longdesc && $longdesc !~ /^$/) {
 		$longdesc =~ s/^\s+//s;
 		$longdesc =~ s/\s+$//s;
 		$longdesc =~ s/^\t/ /mg;