Only enable executable config files in v9. The quality of file permissions in debian...

diff --git a/Debian/Debhelper/Dh_Lib.pm b/Debian/Debhelper/Dh_Lib.pm
index a86688a2d6a3a80bf4075da8647a3c9817526fe6..3940c05f08829b1c5162d82303a0a66294ee9fe8 100644 (file)
--- a/Debian/Debhelper/Dh_Lib.pm
+++ b/Debian/Debhelper/Dh_Lib.pm
@@ -613,7 +613,8 @@ sub filedoublearray {
        my $file=shift;
        my $globdir=shift;
 
-       my $x=-x $file;
+       # executable confi files are a v9 thing.
+       my $x=! compat(8) && -x $file;
        if ($x) {
                require Cwd;
                my $cmd=Cwd::abs_path($file);

diff --git a/debhelper.pod b/debhelper.pod
index 72234ca7ef2f5c7c754a51511a50affbd1fa28f2..dc2295c14a561e9be099c0ff7d8f7b14fca215d3 100644 (file)
--- a/debhelper.pod
+++ b/debhelper.pod
@@ -514,6 +514,11 @@ F<Build.PL>
 B<dh_strip> puts separated debug symbols in a location based on their
 build-id.
 
+=item -
+
+Executable debconf config files are run and their output used as the
+configuration.
+
 =back
 
 =back

diff --git a/debian/changelog b/debian/changelog
index 43c9d4a6d1653e0b86474903960fdb5a0c2e4352..682700a5b4fa470816dd22fb77fbe6f5b383e714 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,13 @@
-debhelper (8.9.13) UNRELEASED; urgency=low
+debhelper (8.9.13) unstable; urgency=low
 
   * Pass CPPFLAGS to qmake. Closes: #646129 Thanks, Felix Geyert
   * dh_strip: Use build-id in /usr/lib/debug in v9.
     Closes: #642158 Thanks, Jakub Wilk
   * Spanish translation update. Closes: #636245 Thanks, Omar Campagne
+  * Only enable executable config files in v9. The quality of file permissions
+    in debian/ directories turns out to be atrocious; who knew?
 
- -- Joey Hess <joeyh@debian.org>  Thu, 08 Dec 2011 18:27:02 -0400
+ -- Joey Hess <joeyh@debian.org>  Fri, 09 Dec 2011 13:53:38 -0400
 
 debhelper (8.9.12) unstable; urgency=low