I'd like a freeze exception for debhelper 8.0.0. The minimum change needed from version 7.9.4 is to set the version number to 8.0.0 and make a minor documentation update to finalize v8 mode (see debhelper-patch-1). My plan for v8 was to put in as many good things as possible before the freeze, and call it finished when the freeze happened. This will avoid needing to backport debhelper when backporting packages that use v8, after the release. The only real impact of this change is that lintian may also need an update, in order to stop warning on v8 use. I also have two code changes that I made some time ago and didn't get around to uploading, which I'd *prefer* to also include in debhelper 8.0.0. The first of these is a minor permissions fix for files in /etc/sudoers.d/ for #589574 (see debhelper-patch-2). The other patch (debhelper-patch-3) is the riskiest, passing --force to setup.py could conceivably cause breakage. One option would be to only enable this in v8 mode, which would make sure it doesn't break any existing packages. -- see shy jo
commit 5ade9075ad0fedee986d8aa08a1d4c4d3965356a
Author: Joey Hess <joey@kitenet.net>
Date: Sat Aug 7 07:20:20 2010 -0400
Finalized v8 mode, which is the new recommended default.
diff --git a/debhelper.pod b/debhelper.pod
index 554b7f7..b2f130b 100644
--- a/debhelper.pod
+++ b/debhelper.pod
@@ -337,9 +337,9 @@ introduced. You tell debhelper which compatibility level it should use, and
it modifies its behavior in various ways.
Tell debhelper what compatibility level to use by writing a number to
-debian/compat. For example, to turn on v7 mode:
+debian/compat. For example, to turn on v8 mode:
- % echo 7 > debian/compat
+ % echo 8 > debian/compat
Unless otherwise indicated, all debhelper documentation assumes that you
are using the most recent compatibility level, and in most cases does not
@@ -477,8 +477,6 @@ directory. In previous compatibility levels it silently refuses to do this.
=item v7
-This is the recommended mode of operation.
-
Changes from v6 are:
=over 8
@@ -507,8 +505,7 @@ none is specified.
=item v8
-This mode is still under development. Using it in packages will cause them
-to probably break later.
+This is the recommended mode of operation.
Changes from v7 are:
diff --git a/debian/changelog b/debian/changelog
index 6a1ca77..2516ce7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-debhelper (7.9.4) UNRELEASED; urgency=low
+debhelper (8.0.0) UNRELEASED; urgency=low
[ Carsten Hey ]
* dh_fixperms: Ensure files in /etc/sudoers.d/ are mode 440. Closes: #589574
@@ -7,6 +7,7 @@ debhelper (7.9.4) UNRELEASED; urgency=low
* python_distutils: Pass --force to setup.py build, to ensure that when
python-dbg is run it does not win and result in scripts having it in
the shebang line. Closes: #589759
+ * Finalized v8 mode, which is the new recommended default.
-- Carsten Hey <carsten@debian.org> Sun, 18 Jul 2010 22:30:06 +0200
commit eb9464fb4bbea788f2703a9bb3314dcd9fe2e0d5
Author: Carsten Hey <carsten@debian.org>
Date: Sun Jul 18 22:36:11 2010 +0200
Bug#589574: [PATCH] dh_fixperms: Ensure files in /etc/sudoers.d/ are mode 440. Closes: #589574
Signed-off-by: Carsten Hey <carsten@debian.org>
diff --git a/debian/changelog b/debian/changelog
index 628b043..c895d78 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+debhelper (7.9.4) UNRELEASED; urgency=low
+
+ * dh_fixperms: Ensure files in /etc/sudoers.d/ are mode 440. Closes: #589574
+
+ -- Carsten Hey <carsten@debian.org> Sun, 18 Jul 2010 22:30:06 +0200
+
debhelper (7.9.3) unstable; urgency=low
* perl_makemaker: import compat(). Closes: #587654
diff --git a/dh_fixperms b/dh_fixperms
index 893ca56..65beac6 100755
--- a/dh_fixperms
+++ b/dh_fixperms
@@ -117,6 +117,13 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
"-type f $find_options -print0",
"2>/dev/null | xargs -0r chmod 644");
}
+
+ # Files in $tmp/etc/sudoers.d/ must be mode 440.
+ if (-d "$tmp/etc/sudoers.d") {
+ complex_doit("find $tmp/etc/sudoers.d",
+ "-type f ! -perm 440 $find_options -print0",
+ "2>/dev/null | xargs -0r chmod 440");
+ }
}
=head1 SEE ALSO
commit 865e6266a5eaae81004bf530bc23da1c3fdc10b1
Author: Joey Hess <joey@kitenet.net>
Date: Sun Jul 25 13:40:39 2010 -0400
python_distutils: Pass --force to setup.py build, to ensure that when python-dbg is run it does not win and result in scripts having it in the shebang line. Closes: #589759
diff --git a/Debian/Debhelper/Buildsystem/python_distutils.pm b/Debian/Debhelper/Buildsystem/python_distutils.pm
index 70307b0..5115a8a 100644
--- a/Debian/Debhelper/Buildsystem/python_distutils.pm
+++ b/Debian/Debhelper/Buildsystem/python_distutils.pm
@@ -163,7 +163,9 @@ sub setup_py {
sub build {
my $this=shift;
- $this->setup_py("build", @_);
+ $this->setup_py("build",
+ "--force",
+ @_);
}
sub install {
diff --git a/debian/changelog b/debian/changelog
index c895d78..6a1ca77 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,13 @@
debhelper (7.9.4) UNRELEASED; urgency=low
+ [ Carsten Hey ]
* dh_fixperms: Ensure files in /etc/sudoers.d/ are mode 440. Closes: #589574
+ [ Joey Hess ]
+ * python_distutils: Pass --force to setup.py build, to ensure that when
+ python-dbg is run it does not win and result in scripts having it in
+ the shebang line. Closes: #589759
+
-- Carsten Hey <carsten@debian.org> Sun, 18 Jul 2010 22:30:06 +0200
debhelper (7.9.3) unstable; urgency=low
Attachment:
signature.asc
Description: Digital signature