On Mon, 22 Sep 2014 23:53:32 +0200, Stephen Kitt <sk...@debian.org> wrote: > On Mon, 22 Sep 2014 22:49:52 +0100, "Adam D. Barratt" > <a...@adam-barratt.org.uk> wrote: > > On Sat, 2014-09-20 at 19:08 +0100, Adam D. Barratt wrote: > > > Apologies for the long delay in getting back to you. > > > > > > On Wed, 2013-10-02 at 22:59 +0200, Stephen Kitt wrote: > > > > On Wed, 02 Oct 2013 20:29:00 +0100, "Adam D. Barratt" > > > > <a...@adam-barratt.org.uk> wrote: > > > > > On Wed, 2013-10-02 at 07:52 +0200, Stephen Kitt wrote: > > > > > > oss-compat in stable suffers from two serious bugs: > > > > > > * 660803, related to changes in kmod (and causing issues when > > > > > > installing Debian Edu wheezy); > > > > > > * 718241, which was initially just a tracking bug for testing > > > > > > but also applies to wheezy. > > [...] > > > Removing your own conffiles is icky, but I don't have any better > > > solutions. Please go ahead, thanks. > > > > This was uploaded and I've flagged it for acceptance. > > Thanks!
And I still managed to mess this up :-(. The following patch fixes #762547
which was just filed against stable:
diff --git a/debian/changelog b/debian/changelog
index 57a79dd..c4b4e51 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+oss-compat (2+deb7u2) wheezy; urgency=medium
+
+ * Give the correct destination when copying the new configuration
+ file. (Closes: #762547.)
+
+ -- Stephen Kitt <sk...@debian.org> Tue, 23 Sep 2014 10:40:38 +0200
+
oss-compat (2+deb7u1) wheezy; urgency=low
* Use softdep directives in the modprobe configuration. (Closes:
diff --git a/debian/postinst b/debian/postinst
index c129818..bd98468 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -33,7 +33,7 @@ case "$1" in
# Cleanup stable configuration link
[ -L ${oldconffile} ] && rm -f ${oldconffile}
# Wheezy configuration file (using install directives)
- [ -f ${curconffile} ] && [ "$(md5sum ${curconffile} | cut -d\ -f1)" =
"88222606b0a3ba8b0825c5000c754e6f" ] && cp /lib/oss-compat/linux ${conffile}
+ [ -f ${curconffile} ] && [ "$(md5sum ${curconffile} | cut -d\ -f1)" =
"88222606b0a3ba8b0825c5000c754e6f" ] && cp /lib/oss-compat/linux ${curconffile}
if lsmod | grep -q "^snd " ; then
modprobe snd || true
Is it OK if I upload this?
Sorry about that,
Stephen
signature.asc
Description: PGP signature
