Author: adam-guest
Date: 2008-04-12 18:07:33 +0000 (Sat, 12 Apr 2008)
New Revision: 1333
Modified:
trunk/debian/changelog
trunk/scripts/debchange.pl
Log:
* debchange:
+ Correctly handle control files containing comments when checking
for NMUs (Closes: #475750)
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2008-04-11 21:30:02 UTC (rev 1332)
+++ trunk/debian/changelog 2008-04-12 18:07:33 UTC (rev 1333)
@@ -1,8 +1,11 @@
devscripts (2.10.26) UNRELEASED; urgency=low
- * debchange: Allow a changelog with no entries to be created. (Note that
- such a changelog will cause a warning from dpkg-parsehchangelog the
- next time debchange is used with it) (Closes: #475578)
+ * debchange:
+ + Allow a changelog with no entries to be created. (Note that
+ such a changelog will cause a warning from dpkg-parsehchangelog the
+ next time debchange is used with it) (Closes: #475578)
+ + Correctly handle control files containing comments when checking
+ for NMUs (Closes: #475750)
* debcommit: Modify the "strip message" functionality so that:
- Changelog lines beginning with any of *, + or - are considered to
indicate a "change" for the purposes of deciding whether to strip
Modified: trunk/scripts/debchange.pl
===================================================================
--- trunk/scripts/debchange.pl 2008-04-11 21:30:02 UTC (rev 1332)
+++ trunk/scripts/debchange.pl 2008-04-12 18:07:33 UTC (rev 1333)
@@ -681,7 +681,7 @@
unless have_lpdc();
my $parser = new Parse::DebControl;
- my $deb822 = $parser->parse_file('debian/control', { });
+ my $deb822 = $parser->parse_file('debian/control', {stripComments =>
'true'});
my $uploader = decode_utf8($deb822->[0]->{'Uploaders'}) || '';
my $maintainer = decode_utf8($deb822->[0]->{'Maintainer'});
my @uploaders = split(/,\s+/, $uploader);
--
To unsubscribe, send mail to [EMAIL PROTECTED]
