summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNiels Thykier <niels@thykier.net>2019-08-20 14:17:28 +0000
committerNiels Thykier <niels@thykier.net>2019-08-20 14:17:28 +0000
commit80df1602a61bf92c57b09b8a4a26f116ba39e5f9 (patch)
tree5a2040bfcda04a5491d057a4f27410dc10d4c6c3
parent038efd099e142aea043d128c6cd3bc6a93e68fc1 (diff)
downloaddebhelper-80df1602a61bf92c57b09b8a4a26f116ba39e5f9.tar.gz
dh_installxfonts: Remove unnecessary constraint in misc:Depends
Signed-off-by: Niels Thykier <niels@thykier.net>
-rw-r--r--debian/changelog8
-rwxr-xr-xdh_installxfonts10
2 files changed, 10 insertions, 8 deletions
diff --git a/debian/changelog b/debian/changelog
index 7e47108c..a32b3bc4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+debhelper (12.5.4) UNRELEASED; urgency=medium
+
+ * dh_installxfonts: Remove version in dependency on xfonts-utils
+ added to ${misc:Depends}. The version requirement has been
+ satisfied for the past 3-4 releases.
+
+ -- Niels Thykier <niels@thykier.net> Tue, 20 Aug 2019 14:14:47 +0000
+
debhelper (12.5.3) unstable; urgency=medium
* Dh_Getopt.pm: Skip compat call if d/control cannot be found
diff --git a/dh_installxfonts b/dh_installxfonts
index 91887728..c16659f7 100755
--- a/dh_installxfonts
+++ b/dh_installxfonts
@@ -65,9 +65,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
if (@fontdirs) {
# Figure out what commands the postinst and postrm will need
# to call.
- my @cmds;
- my @cmds_postinst;
- my @cmds_postrm;
+ my (@cmds, @cmds_postinst, @cmds_postrm);
# Sort items for reproducible binary package contents.
foreach my $f (sort @fontdirs) {
# This must come before update-fonts-dir.
@@ -85,11 +83,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
autoscript($package, "postrm", "postrm-xfonts",
{ 'CMDS' => join(";", @cmds, @cmds_postrm) });
- if (@cmds_postrm) {
- addsubstvar($package, "misc:Depends", "xfonts-utils", ">= 1:7.5+2");
- } else {
- addsubstvar($package, "misc:Depends", "xfonts-utils");
- }
+ addsubstvar($package, "misc:Depends", "xfonts-utils");
}
}