[SCM] Debian package checker branch, master, updated. 2.2.7-15-g38553cc
The following commit has been merged in the master branch:
commit 38553cc8e48abc6e5222aa7d5c7e2bb0960630a7
Author: Russ Allbery <rra@debian.org>
Date: Wed Mar 11 22:14:52 2009 -0700
Exclude dh_gencontrol from misc:Depends scripts
* private/refresh-debhelper-data:
+ [RA] Exclude dh_gencontrol from debhelper commands that set
${misc:Depends} since it only sets it to empty when not already
set.
diff --git a/data/debhelper/miscDepends_commands b/data/debhelper/miscDepends_commands
index 66f91ae..0afb23c 100644
--- a/data/debhelper/miscDepends_commands
+++ b/data/debhelper/miscDepends_commands
@@ -1,5 +1,4 @@
dh_gconf
-dh_gencontrol
dh_gtkmodules
dh_installcatalogs
dh_installdebconf
diff --git a/debian/changelog b/debian/changelog
index ea4bc59..8ea3b90 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -55,6 +55,9 @@ lintian (2.2.8) unstable; urgency=low
* private/refresh-debhelper-data:
+ [RA] Remove symlinks as a (possibly temporary) workaround to
packages that contain broken links to dh_* commands.
+ + [RA] Exclude dh_gencontrol from debhelper commands that set
+ ${misc:Depends} since it only sets it to empty when not already
+ set.
* private/refresh-fonts-data:
+ [RA] Correctly handle not specifying a Contents file on the command
line.
diff --git a/private/refresh-debhelper-data b/private/refresh-debhelper-data
index 94e11b0..1ab76dd 100755
--- a/private/refresh-debhelper-data
+++ b/private/refresh-debhelper-data
@@ -132,7 +132,8 @@ else
grep -lr autoscript */ \
| sed 's,.*/usr/bin/,,g' | sort -u > maint_commands
grep -lr misc:Depends */ \
- | sed 's,.*/usr/bin/,,g' | sort -u > miscDepends_commands
+ | sed 's,.*/usr/bin/,,g' | sort -u | grep -v dh_gencontrol \
+ > miscDepends_commands
for f in maint miscDepends; do
rf="$lintian_data/debhelper/${f}_commands"
--
Debian package checker
Reply to: