Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
debtree 1.0.6 has been in unstable for 42 days
it has fixes for 573818 and 574647 by Frans Pop
please consider unbloking it
thank you
debdiff debtree_1.0.5.dsc debtree_1.0.6.dsc | diffstat
debian/changelog | 12 ++++++++++++
debian/control | 2 +-
debtree | 8 ++++----
debtree.1 | 6 +++---
4 files changed, 20 insertions(+), 8 deletions(-)
debdiff debtree_1.0.5.dsc debtree_1.0.6.dsc
diff -Nru debtree-1.0.5/debian/changelog debtree-1.0.6/debian/changelog
--- debtree-1.0.5/debian/changelog 2010-02-10 03:49:54.000000000 +1100
+++ debtree-1.0.6/debian/changelog 2010-09-04 23:18:08.000000000 +1000
@@ -1,3 +1,15 @@
+debtree (1.0.6) unstable; urgency=low
+
+ [ Frans Pop ]
+ * Fix typos in man page; thanks to A. Costa for the patch. Closes: #573818.
+ * Disable pattern meta characters for package names in regular expressions.
+ Closes: #574647.
+
+ [ Anibal Monsalve Salazar ]
+ * New maintainer. Frans, we'll miss you.
+
+ -- Anibal Monsalve Salazar <anibal@debian.org> Sat, 04 Sep 2010 23:18:01 +1000
+
debtree (1.0.5) unstable; urgency=low
* Remove ucf-handled config files on purge. With thanks to piuparts testing.
diff -Nru debtree-1.0.5/debian/control debtree-1.0.6/debian/control
--- debtree-1.0.5/debian/control 2010-02-10 03:50:27.000000000 +1100
+++ debtree-1.0.6/debian/control 2010-09-04 22:47:32.000000000 +1000
@@ -1,7 +1,7 @@
Source: debtree
Section: utils
Priority: optional
-Maintainer: Frans Pop <fjp@debian.org>
+Maintainer: Anibal Monsalve Salazar <anibal@debian.org>
Build-Depends: debhelper (>= 7)
Standards-Version: 3.8.4
Homepage: http://collab-maint.alioth.debian.org/debtree/
diff -Nru debtree-1.0.5/debtree debtree-1.0.6/debtree
--- debtree-1.0.5/debtree 2010-02-09 13:57:53.000000000 +1100
+++ debtree-1.0.6/debtree 2010-09-04 22:42:26.000000000 +1000
@@ -374,7 +374,7 @@
sub first_set_with_package {
my ($package, $set) = @_;
foreach my $s (sort keys %$set) {
- if ($$set{$s}{plist} =~ /(^|,)$package(,|$)/) {
+ if ($$set{$s}{plist} =~ /(^|,)\Q$package\E(,|$)/) {
return $s;
}
}
@@ -534,7 +534,7 @@
# Second or later dependency in alternatives: skip unless versioned (see also below)
# TODO: make this work better if only some of the alternatives have versioned deps
if ($OR_name && (! $with_versions || ! $pkgdep) &&
- $OR_dep_list{$OR_name}{plist} =~ /,$dep_package(,|$)/) {
+ $OR_dep_list{$OR_name}{plist} =~ /,\Q$dep_package\E(,|$)/) {
return
}
@@ -605,11 +605,11 @@
}
$pstatus{$rdep}{prov_rdeps} = 1;
- my $regex = join("|", @pset);
my $pinfo = get_apt_pinfo($rdep, "");
my $deps = get_apt_deps($pinfo, $dtype);
+ my $regex = "(\Q" . join("\E|\Q", @pset) . "\E)";
for my $dep_or (split(/,/, $deps)) {
- next unless $dep_or =~ /(^|\|)($regex)([| ]|$)/;
+ next unless $dep_or =~ /(^|\|)$regex([| ]|$)/;
my @dset;
my $cnt = 0;
diff -Nru debtree-1.0.5/debtree.1 debtree-1.0.6/debtree.1
--- debtree-1.0.5/debtree.1 2009-11-15 01:26:50.000000000 +1100
+++ debtree-1.0.6/debtree.1 2010-09-04 22:42:26.000000000 +1000
@@ -44,12 +44,12 @@
more of the dependencies are versioned. In that case a separate arrow (ending
at the relevant package) showing the version requirement is drawn. Arrows for
dependencies on a package in a set of alternatives will originate at the
-correct package in the set, though in some cases this may be on the seperation
+correct package in the set, though in some cases this may be on the separation
line between two alternatives.
.PP
If a package included in an alternative dependency also needs to be displayed
separately or is also part of some other alternative dependency set, its
-dependencies will only be included once, with the package's first occurence.
+dependencies will only be included once, with the package's first occurrence.
For the secondary occurences the package name will be shown between square
brackets: `[...]'.
.PP
@@ -131,7 +131,7 @@
Suggested packages will never be included in a build dependency graph.
If there are alternative packages to satisfy a dependency, normally only the
first alternative will be shown. However, when used in combination with the
-\-\-show\-installed option, all allready installed alternatives will be
+\-\-show\-installed option, all already installed alternatives will be
included for satisfied dependencies (unless the \-\-no\-alternatives option
is also given).
Attachment:
signature.asc
Description: Digital signature