tags 508510 + patch
thanks
Dear maintainer,
I've prepared an NMU for debget (versioned as 1.6+nmu1) and is
ready for upload. I'm not yet uploading it, please reply asking
for upload or do one yourself.
Regards,
David Paleino
diff -Nru debget-1.6/debget debget-1.6+nmu1/debget
--- debget-1.6/debget 2005-07-11 23:22:33.000000000 +0200
+++ debget-1.6+nmu1/debget 2008-12-12 12:37:07.000000000 +0100
@@ -63,7 +63,7 @@
'build' => undef,
'debug' => 0,
'dir' => 'debian',
- 'dist' => 'unstable',
+ 'dist' => 'sid',
'host' => 'ftp.debian.org',
'install' => undef,
'no' => 0,
diff -Nru debget-1.6/debian/changelog debget-1.6+nmu1/debian/changelog
--- debget-1.6/debian/changelog 2006-11-19 04:04:04.000000000 +0100
+++ debget-1.6+nmu1/debian/changelog 2008-12-12 12:39:09.000000000 +0100
@@ -1,3 +1,10 @@
+debget (1.6+nmu1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Support new packages.debian.org (Closes: #508510)
+
+ -- David Paleino <d.pale...@gmail.com> Fri, 12 Dec 2008 12:38:14 +0100
+
debget (1.6) unstable; urgency=low
* Add do-nothing binary-arch target (closes: #395588).
diff -Nru debget-1.6/lib/Debian/Debget.pm debget-1.6+nmu1/lib/Debian/Debget.pm
--- debget-1.6/lib/Debian/Debget.pm 2005-07-11 23:25:17.000000000 +0200
+++ debget-1.6+nmu1/lib/Debian/Debget.pm 2008-12-12 12:38:05.000000000
+0100
@@ -92,7 +92,7 @@
our $Pdo_uri_source ||= "$Pdo_uri_base/src:%s";
# XXX can LWP get a page in a different language?
-our $Pdo_re_no_package = qr/Can't find that package./;
+our $Pdo_re_no_package = qr/Sorry, your search gave no results/;
(our $Me = $0) =~ s|.*/||;
our $Debug ||= 0;
@@ -302,13 +302,19 @@
# </ul>
my %dist_arch_ver;
- while ($content =~ m|^<li><a[^>]+>(\w+)</a>.+\n
- ((?:<br>.+\n)+)
- </li>\n|xmg) {
- my ($dist, $version_lines) = ($1, $2);
+ while ($content =~ m|^\s*<li[^>]+><a[^>]+>([\w-]+)( \((.*)\))?</a>.+\n
+ \s*\w+.*\n
+ \s*\n
+ \s*<br>(.+)\n
+ \s*</li>\n|xmg) {
+ # $1 = "sid"
+ # $2 = " (unstable)"
+ # $3 = "unstable"
+ # $4 = "1.6: all"
+ my ($dist, $version_lines) = ($1, $4);
debug_nonl "dist=$dist version_lines:\n", $version_lines;
- while ($version_lines =~ m|^<br>(\S+):((?:\s+\w+)+)\n|mg) {
+ while ($version_lines =~ m|^\s*(\S+):((?:\s+\w+)+)|mg) {
my ($ver, $arch_list) = ($1, $2);
my @arch = split ' ', $arch_list;
@@ -375,11 +381,10 @@
# </div>
my %d;
- while ($content =~ m|^<li><a[^>]+>(\w+)</a>
- \s+\(\S+\):
- \s+(\S+)
- \s+<br>Binary\s+packages:\s+(.+)
- </li>\s*\n|xmg) {
+ while ($content =~ m|^\s*<li><a[^>]+>([\w\(\)\ -]+)</a>
+ \s+\(.*\):\s+(.*)\n
+
\s+<br>Binary\s+packages:\s+<span[^>]+></span>
+
\s+<span[^>]+>(<a[^>]+>.*</a>)</span>|xmg) {
my ($dist, $ver, $binary_links) = ($1, $2, $3);
debug "dist=$dist ver=$ver binary_links=$binary_links";
@@ -390,13 +395,13 @@
my $binary_links_orig = $binary_links;
my @binary_packages;
while ($binary_links =~ s%^\s*
- (?: <a[^>]+>(\S+)</a> | ([^\s,]+) )
+ (?:<a[^>]+>(\S+)</a>)
,?%%x) {
- push @binary_packages, defined $1 ? $1 : $2;
+ push @binary_packages, defined $1 ? $1 : "";
}
- if ($binary_links =~ /\S/) {
- xdie $p, "data left after bin parse: $binary_links";
- }
+ #if ($binary_links =~ /\S/) {
+ # xdie $p, "data left after bin parse: $binary_links";
+ # }
if (!...@binary_packages) {
xdie $p, "no binary packages parsed for dist=$dist ver=$ver
from:\n",
$binary_links_orig;
--
To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
