diff -Nru libparse-debianchangelog-perl-1.1.1/Changes libparse-debianchangelog-perl-1.2.0/Changes
--- libparse-debianchangelog-perl-1.1.1/Changes 2007-09-01 02:04:46.000000000 +0000
+++ libparse-debianchangelog-perl-1.2.0/Changes 2011-04-04 16:41:06.000000000 +0000
@@ -1,3 +1,22 @@
+Parse-DebianChangelog (1.2.0) unstable; urgency=low
+
+ * DebianChangelog:
+ - Improve readability of regexes by using named captures
+ - Don't use $& or $` (Closes: #515018)
+ - Don't use "English" just for $.
+ - Allow '.' and '+' in distribution names. Patch by John Wright.
+ (Closes: #565238)
+ - Add Danish translation of bin.pot by Joe Dalton (Closes: #605820)
+ * ChangesFilters:
+ - Fix conversion of (Closes: #603341)
+ - Allow to omit # before closed bug numbers (Closes: 446798 ;)
+ - Update gnu.org URLs and add more FSF licenses to account for
+ license releases and additions to common-licenses.
+ * Require Perl 5.10. I'm pretty sure some of that regex stuff will
+ not work in 5.8.
+
+ -- Frank Lichtenheld Mon, 04 Apr 2011 16:43:54 +0200
+
Parse-DebianChangelog (1.1.1) unstable; urgency=low
* Bug fixes:
diff -Nru libparse-debianchangelog-perl-1.1.1/debian/changelog libparse-debianchangelog-perl-1.2.0/debian/changelog
--- libparse-debianchangelog-perl-1.1.1/debian/changelog 2011-05-06 19:12:27.000000000 +0000
+++ libparse-debianchangelog-perl-1.2.0/debian/changelog 2011-05-06 18:58:26.000000000 +0000
@@ -1,3 +1,28 @@
+libparse-debianchangelog-perl (1.2.0-1ubuntu1) oneiric; urgency=low
+
+ * Merge from debian unstable. Remaining changes:
+ - debian/control: Downgrade libhtml-parser-perl, libhtml-template-perl,
+ and libxml-simple-perl from Recommends to Suggests. This package
+ is installed in minimal systems due to aptitude's (reasonable) dependency
+ on it, but aptitude only uses rfc822 output.
+
+ -- Stéphane Graber Fri, 06 May 2011 14:56:58 -0400
+
+libparse-debianchangelog-perl (1.2.0-1) unstable; urgency=low
+
+ * New upstream release:
+ - Don't use $& or $` (Closes: #515018)
+ - Allow '.' and '+' in distribution names. Patch by John Wright.
+ (Closes: #565238)
+ - Add Danish translation of bin.pot by Joe Dalton (Closes: #605820)
+ - ChangesFilters:
+ + Fix conversion of (Closes: #603341)
+ + Allow to omit # before closed bug numbers (Closes: 446798 ;)
+ * Bump Standards-Version to 3.9.1 (no changes)
+ * Convert debian/rules to debhelper 7
+
+ -- Frank Lichtenheld Sun, 03 Apr 2011 23:25:41 +0200
+
libparse-debianchangelog-perl (1.1.1-2.1ubuntu1) natty; urgency=low
* Merge from debian unstable. Remaining changes: (LP: #707718)
diff -Nru libparse-debianchangelog-perl-1.1.1/debian/compat libparse-debianchangelog-perl-1.2.0/debian/compat
--- libparse-debianchangelog-perl-1.1.1/debian/compat 2011-05-06 19:12:27.000000000 +0000
+++ libparse-debianchangelog-perl-1.2.0/debian/compat 2011-04-03 20:58:42.000000000 +0000
@@ -1 +1 @@
-5
+7
diff -Nru libparse-debianchangelog-perl-1.1.1/debian/control libparse-debianchangelog-perl-1.2.0/debian/control
--- libparse-debianchangelog-perl-1.1.1/debian/control 2011-05-06 19:12:27.000000000 +0000
+++ libparse-debianchangelog-perl-1.2.0/debian/control 2011-05-06 18:59:18.000000000 +0000
@@ -1,11 +1,11 @@
Source: libparse-debianchangelog-perl
Section: perl
Priority: optional
-Build-Depends: debhelper (>= 5)
-Build-Depends-Indep: perl (>= 5.8.0-7), po4a, libtimedate-perl, libhtml-parser-perl, libhtml-template-perl, libclass-accessor-perl, liblocale-gettext-perl, tidy, libxml-simple-perl, libio-string-perl, libmodule-build-perl, libtest-pod-perl, libtest-pod-coverage-perl, perl (>= 5.10.1) | libtest-simple-perl (>= 0.88), libtest-exception-perl
+Build-Depends: debhelper (>= 7)
+Build-Depends-Indep: po4a, libtimedate-perl, libhtml-parser-perl, libhtml-template-perl, libclass-accessor-perl, liblocale-gettext-perl, tidy, libxml-simple-perl, libio-string-perl, libmodule-build-perl, libtest-pod-perl, libtest-pod-coverage-perl, perl (>= 5.10.1) | libtest-simple-perl (>= 0.88), libtest-exception-perl
Maintainer: Ubuntu Developers
XSBC-Original-Maintainer: Frank Lichtenheld
-Standards-Version: 3.7.3
+Standards-Version: 3.9.1
Vcs-git: git://source.djpig.de/git/Parse-DebianChangelog.git
Vcs-Browser: http://source.djpig.de/git/?p=Parse-DebianChangelog.git;a=summary
diff -Nru libparse-debianchangelog-perl-1.1.1/debian/docs libparse-debianchangelog-perl-1.2.0/debian/docs
--- libparse-debianchangelog-perl-1.1.1/debian/docs 1970-01-01 00:00:00.000000000 +0000
+++ libparse-debianchangelog-perl-1.2.0/debian/docs 2011-04-03 21:49:46.000000000 +0000
@@ -0,0 +1 @@
+TODO
diff -Nru libparse-debianchangelog-perl-1.1.1/debian/rules libparse-debianchangelog-perl-1.2.0/debian/rules
--- libparse-debianchangelog-perl-1.1.1/debian/rules 2011-05-06 19:12:27.000000000 +0000
+++ libparse-debianchangelog-perl-1.2.0/debian/rules 2011-04-03 21:44:34.000000000 +0000
@@ -1,74 +1,4 @@
#!/usr/bin/make -f
-# This debian/rules file is provided as a template for normal perl
-# packages. It was created by Marc Brockschmidt for
-# the Debian Perl Group (http://pkg-perl.alioth.debian.org/) but may
-# be used freely wherever it is useful.
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-# If set to a true value then MakeMaker's prompt function will
-# always return the default without waiting for user input.
-export PERL_MM_USE_DEFAULT=1
-
-PACKAGE=$(shell dh_listpackages)
-
-ifndef PERL
-PERL = /usr/bin/perl
-endif
-
-TMP =$(CURDIR)/debian/$(PACKAGE)
-
-build: build-stamp
-build-stamp:
- dh_testdir
-
- $(MAKE) installdirs=vendor
-
- touch build-stamp
-
-clean:
- dh_testdir
- dh_testroot
-
- # Add commands to clean up after the build process here
- $(MAKE) clean
-
- dh_clean build-stamp install-stamp
-
-install: build install-stamp
-install-stamp:
- dh_testdir
- dh_testroot
- dh_clean -k
-
- $(MAKE) test
- $(MAKE) install DESTDIR=$(TMP) PREFIX=/usr
-
- touch install-stamp
-
-binary-arch:
-# We have nothing to do by default.
-
-binary-indep: build install
- dh_testdir
- dh_testroot
- dh_install
-# dh_installexamples
- dh_installdocs TODO
- dh_installchangelogs Changes
- dh_perl
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-source diff:
- @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary
+%:
+ dh --buildsystem=perl_build $@
diff -Nru libparse-debianchangelog-perl-1.1.1/debian/source/format libparse-debianchangelog-perl-1.2.0/debian/source/format
--- libparse-debianchangelog-perl-1.1.1/debian/source/format 1970-01-01 00:00:00.000000000 +0000
+++ libparse-debianchangelog-perl-1.2.0/debian/source/format 2011-05-06 19:12:27.000000000 +0000
@@ -0,0 +1 @@
+3.0 (quilt)
diff -Nru libparse-debianchangelog-perl-1.1.1/lib/Parse/DebianChangelog/ChangesFilters.pm libparse-debianchangelog-perl-1.2.0/lib/Parse/DebianChangelog/ChangesFilters.pm
--- libparse-debianchangelog-perl-1.1.1/lib/Parse/DebianChangelog/ChangesFilters.pm 2011-05-06 19:12:27.000000000 +0000
+++ libparse-debianchangelog-perl-1.2.0/lib/Parse/DebianChangelog/ChangesFilters.pm 2011-04-04 16:41:06.000000000 +0000
@@ -1,7 +1,7 @@
#
# Parse::DebianChangelog::ChangesFilters
#
-# Copyright 2005 Frank Lichtenheld
+# Copyright 2005,2011 Frank Lichtenheld
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -34,6 +34,7 @@
package Parse::DebianChangelog::ChangesFilters;
+use 5.010;
use strict;
use warnings;
@@ -73,11 +74,11 @@
$text=~ s|<URL:([-\w\.\/:~_\@]+):([a-zA-Z0-9\'() ]+)>
|$cgi->a({ -href=>$1 }, $2)
|xego;
- $text=~ s|https?:[\w/\.:\@+\-~\%\#?=&;,]+[\w/]
- |$cgi->a({ -href=>$& }, $&)
+ $text=~ s|(<)?\K(https?:[\w/\.:\@+\-~\%\#?=&;,]+[\w/])(?(1)(?=>))
+ |$cgi->a({ -href=>$2 }, $2)
|xego;
- $text=~ s|ftp:[\w/\.:\@+\-~\%\#?=&;,]+[\w/]
- |$cgi->a({ -href=>$& }, $&)
+ $text=~ s|(ftp:[\w/\.:\@+\-~\%\#?=&;,]+[\w/])
+ |$cgi->a({ -href=>$1 }, $1)
|xego;
return $text;
@@ -86,16 +87,16 @@
sub email_to_ddpo {
my ($text, $cgi) = @_;
- $text =~ s|[a-zA-Z0-9_\+\-\.]+\@([a-zA-Z0-9][\w\.+\-]+\.[a-zA-Z]{2,})
- |$cgi->a({ -href=>"http://qa.debian.org/developer.php?login=$&" }, $&)
+ $text =~ s|([a-zA-Z0-9_\+\-\.]+\@(?:[a-zA-Z0-9][\w\.+\-]+\.[a-zA-Z]{2,}))
+ |$cgi->a({ -href=>"http://qa.debian.org/developer.php?login=$1" }, $1)
|xego;
return $text;
}
sub bugs_to_bts {
- (my $text = $_[0]) =~ s|Closes:\s*(?:Bug)?\#\d+(?:\s*,\s*(?:Bug)?\#\d+)*
- |my $tmp = $&; { no warnings;
- $tmp =~ s@(Bug)?\#(\d+)@$1\#$2@ig; }
+ (my $text = $_[0]) =~ s|(Closes:\s*(?:Bug)?\#?\d+(?:\s*,\s*(?:Bug)?\#?\d+)*)
+ |my $tmp = $1; { no warnings;
+ $tmp =~ s@(Bug)?\#?(\d+)@$1\#$2@ig; }
"$tmp"
|xiego;
return $text;
@@ -104,8 +105,8 @@
sub cve_to_mitre {
my ($text, $cgi) = @_;
- $text =~ s!\b(?:CVE|CAN)-\d{4}-\d{4}\b
- !$cgi->a({ -href=>"http://cve.mitre.org/cgi-bin/cvename.cgi?name=$&" }, $&)
+ $text =~ s!\b((?:CVE|CAN)-\d{4}-\d{4})\b
+ !$cgi->a({ -href=>"http://cve.mitre.org/cgi-bin/cvename.cgi?name=$1" }, $1)
!xego;
return $text;
}
@@ -129,20 +130,28 @@
return $text;
}
+my $fsf_lics = 'http://www.gnu.org/licenses';
+my $fsf_old_lics = $fsf_lics."/old-licenses";
sub common_licenses {
my ($text, $cgi) = @_;
- $text=~ s|/usr/share/common-licenses/GPL(?:-2)?
- |$cgi->a({ -href=>"http://www.gnu.org/copyleft/gpl.html" }, $&)
+ $text=~ s;(/usr/share/common-licenses/GPL(?:-([1-3]))?)
+ ;($2 && $2 < 3) ? $cgi->a({ -href=>"$fsf_old_lics/gpl-$2.0.html" }, $1)
+ : $cgi->a({ -href=>"$fsf_lics/gpl.html" }, $1)
+ ;xego;
+ $text=~ s;(/usr/share/common-licenses/LGPL(?:-(2\.[01]|3))?)
+ ;($2 && $2 < 3) ? $cgi->a({ -href=>"$fsf_old_lics/lgpl-$2.html" }, $1)
+ : $cgi->a({ -href=>"$fsf_lics/lgpl.html" }, $1)
+ ;xego;
+ $text=~ s;(/usr/share/common-licenses/GFDL(?:-1\.([1-3]))?)
+ ;($2 && $2 < 3) ? $cgi->a({ -href=>"$fsf_old_lics/fdl-1.$2.html" }, $1)
+ : $cgi->a({ -href=>"$fsf_lics/fdl.html" }, $1)
+ ;xego;
+ $text=~ s|(/usr/share/common-licenses/Artistic)
+ |$cgi->a({ -href=>"http://www.opensource.org/licenses/artistic-license.php" }, $1)
|xego;
- $text=~ s|/usr/share/common-licenses/LGPL(?:-2(?:\.1)?)?
- |$cgi->a({ -href=>"http://www.gnu.org/copyleft/lgpl.html" }, $&)
- |xego;
- $text=~ s|/usr/share/common-licenses/Artistic
- |$cgi->a({ -href=>"http://www.opensource.org/licenses/artistic-license.php" }, $&)
- |xego;
- $text=~ s|/usr/share/common-licenses/BSD
- |$cgi->a({ -href=>"http://www.debian.org/misc/bsd.license" }, $&)
+ $text=~ s|(/usr/share/common-licenses/BSD)
+ |$cgi->a({ -href=>"http://www.debian.org/misc/bsd.license" }, $1)
|xego;
return $text;
diff -Nru libparse-debianchangelog-perl-1.1.1/lib/Parse/DebianChangelog.pm libparse-debianchangelog-perl-1.2.0/lib/Parse/DebianChangelog.pm
--- libparse-debianchangelog-perl-1.1.1/lib/Parse/DebianChangelog.pm 2011-05-06 19:12:27.000000000 +0000
+++ libparse-debianchangelog-perl-1.2.0/lib/Parse/DebianChangelog.pm 2011-04-04 16:41:06.000000000 +0000
@@ -2,7 +2,7 @@
# Parse::DebianChangelog
#
# Copyright 1996 Ian Jackson
-# Copyright 2005 Frank Lichtenheld
+# Copyright 2005,2011 Frank Lichtenheld
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -93,17 +93,17 @@
package Parse::DebianChangelog;
+use 5.010;
use strict;
use warnings;
use Fcntl qw( :flock );
-use English;
use Locale::gettext;
use Date::Parse;
use Parse::DebianChangelog::Util qw( :all );
use Parse::DebianChangelog::Entry;
-our $VERSION = '1.1.1';
+our $VERSION = '1.2.0';
=pod
@@ -165,9 +165,9 @@
$file = substr $file, 0, 20;
unless ($self->{config}{quiet}) {
if ($line) {
- warn "WARN: $file(l$NR): $error\nLINE: $line\n";
+ warn "WARN: $file(l$.): $error\nLINE: $line\n";
} else {
- warn "WARN: $file(l$NR): $error\n";
+ warn "WARN: $file(l$.): $error\n";
}
}
}
@@ -313,10 +313,10 @@
while (<$fh>) {
s/\s*\n$//;
# printf(STDERR "%-39.39s %-39.39s\n",$expect,$_);
- if (m/^(\w[-+0-9a-z.]*) \(([^\(\) \t]+)\)((\s+[-0-9a-z]+)+)\;/i) {
+ if (m/^(?