Bug#704729: unblock: alsa-base/1.0.25+3 (pre-approval)
Control: tags -1 + pending On Sat, 2013-04-27 at 15:30 +0100, Adam D. Barratt wrote: On Thu, 2013-04-25 at 14:35 +0200, Jordi Mallach wrote: I decided to upload the alsa-base patch in the minimal incarnation I posted here a few days ago. Just in case this dropped off your radar, or simply to get further instructions, I'm notifying this here. If you want to skip this for tpu but would want a pu upload, I can prepare another one for r1. Just say, I'll do. :) Apologies for not getting back to you about this sooner. At this point I think it might be better to revisit this after the release. and finally marked for acceptance. Regards, Adam -- To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/1370630862.26493.10.ca...@jacala.jungle.funky-badger.org
Processed: Re: Bug#704729: unblock: alsa-base/1.0.25+3 (pre-approval)
Processing control commands: tags -1 + pending Bug #704729 [release.debian.org] pu: alsa-base/1.0.25+3~deb7u1 Added tag(s) pending. -- 704729: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=704729 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems -- To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/handler.s.b704729.13706308697967.transcr...@bugs.debian.org
Bug#704729: unblock: alsa-base/1.0.25+3 (pre-approval)
user release.debian@packages.debian.org usertags 704729 = pu retitle 704729 pu: alsa-base/1.0.25+3~deb7u1 thanks On Thu, 2013-04-25 at 14:35 +0200, Jordi Mallach wrote: I decided to upload the alsa-base patch in the minimal incarnation I posted here a few days ago. Just in case this dropped off your radar, or simply to get further instructions, I'm notifying this here. If you want to skip this for tpu but would want a pu upload, I can prepare another one for r1. Just say, I'll do. :) Apologies for not getting back to you about this sooner. At this point I think it might be better to revisit this after the release. Regards, Adam -- To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/1367073009.13168.61.ca...@jacala.jungle.funky-badger.org
Processed: Re: Bug#704729: unblock: alsa-base/1.0.25+3 (pre-approval)
Processing commands for cont...@bugs.debian.org: user release.debian@packages.debian.org Setting user to release.debian@packages.debian.org (was a...@adam-barratt.org.uk). usertags 704729 = pu Usertags were: unblock. Usertags are now: pu. retitle 704729 pu: alsa-base/1.0.25+3~deb7u1 Bug #704729 [release.debian.org] unblock: alsa-base/1.0.25+3 (pre-approval) Changed Bug title to 'pu: alsa-base/1.0.25+3~deb7u1' from 'unblock: alsa-base/1.0.25+3 (pre-approval)' thanks Stopping processing here. Please contact me if you need assistance. -- 704729: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=704729 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems -- To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/handler.s.c.136707301719687.transcr...@bugs.debian.org
Bug#704729: unblock: alsa-base/1.0.25+3 (pre-approval)
On Fri, Apr 19, 2013 at 10:11:20AM +0200, Jordi Mallach wrote: The rough story is: alsa-base, until +1, was doing Weird Shit™ with its handling of /etc/default/alsa, which wasn't even a conffile. When I got rid of all of that in +2, I accidentally got the new conffile renamed to /e/d/alsa-base due to using debhelper to install it. The script that sources it wasn't updated to look in the new location, and of course users were left with the old conffile and the new one in the filesystem. The updated package tries to fix this for people upgrading from squeeze and also for current testing users which already have both files. In order to make this easier, I've reverted the MA and debhelper change. The only remaining changes are the Pre-Depends and the conffile dance. I decided to upload the alsa-base patch in the minimal incarnation I posted here a few days ago. Just in case this dropped off your radar, or simply to get further instructions, I'm notifying this here. If you want to skip this for tpu but would want a pu upload, I can prepare another one for r1. Just say, I'll do. :) Jordi -- Jordi Mallach Pérez -- Debian developer http://www.debian.org/ jo...@sindominio.net jo...@debian.org http://www.sindominio.net/ GnuPG public key information available at http://oskuro.net/ signature.asc Description: Digital signature
Bug#704729: unblock: alsa-base/1.0.25+3 (pre-approval)
Hello,
I'm aware it's probably too late, but I feel I need to try. Sorry for the
lack of reaction; I'm outstandingly busy lately. :(
On Fri, Apr 05, 2013 at 06:50:24AM +0200, Jordi Mallach wrote:
The rough story is: alsa-base, until +1, was doing Weird Shit™ with its
handling of /etc/default/alsa, which wasn't even a conffile. When I got
rid of all of that in +2, I accidentally got the new conffile renamed to
/e/d/alsa-base due to using debhelper to install it. The script that
sources it wasn't updated to look in the new location, and of course users
were left with the old conffile and the new one in the filesystem.
The updated package tries to fix this for people upgrading from squeeze
and also for current testing users which already have both files.
Additionally, it marks the package as MA: foreign. SVN also had two old
commits that add a missing pre-dependency on dpkg, and remove redundant
dirs from debian/alsa-base.dirs. If these two old commits are
unacceptable, I'll revert and rebuild, but I've checked that the package
contents are identical.
In order to make this easier, I've reverted the MA and debhelper change.
The only remaining changes are the Pre-Depends and the conffile dance.
I haven't had time to explore mbiebl's suggestion of going the other
route. I'm happy to accept a patch which should be fairly easy to write
based on what I'm attaching now. Needs to happen rsn though, if at all.
--
Jordi Mallach Pérez -- Debian developer http://www.debian.org/
jo...@sindominio.net jo...@debian.org http://www.sindominio.net/
GnuPG public key information available at http://oskuro.net/
diff -Nru alsa-base-1.0.25+2+nmu2/debian/alsa alsa-base-1.0.25+3/debian/alsa
--- alsa-base-1.0.25+2+nmu2/debian/alsa 2012-05-20 01:20:03.0 +0200
+++ alsa-base-1.0.25+3/debian/alsa 2013-04-01 07:05:11.0 +0200
@@ -15,10 +15,10 @@
MYNAME=/usr/sbin/alsa
PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-# Default values of variables in /etc/default/alsa
+# Default values of variables in /etc/default/alsa-base
force_unload_modules_before_suspend=
-[ -f /etc/default/alsa ] . /etc/default/alsa
+[ -f /etc/default/alsa-base ] . /etc/default/alsa-base
# $* MESSAGE
warn() { echo ${MYNAME}: Warning: $* 2 ; }
diff -Nru alsa-base-1.0.25+2+nmu2/debian/alsa-base.postrm alsa-base-1.0.25+3/debian/alsa-base.postrm
--- alsa-base-1.0.25+2+nmu2/debian/alsa-base.postrm 2012-05-20 14:23:19.0 +0200
+++ alsa-base-1.0.25+3/debian/alsa-base.postrm 2013-04-04 06:50:44.0 +0200
@@ -5,6 +5,9 @@
if [ $1 = purge ]; then
# Remove run time files
rm -rf /var/run/alsa
+
+ # Remove stray file
+ rm -f /etc/default/alsa
fi
#DEBHELPER#
diff -Nru alsa-base-1.0.25+2+nmu2/debian/alsa-base.preinst alsa-base-1.0.25+3/debian/alsa-base.preinst
--- alsa-base-1.0.25+2+nmu2/debian/alsa-base.preinst 2012-07-08 23:49:56.0 +0200
+++ alsa-base-1.0.25+3/debian/alsa-base.preinst 2013-04-19 09:53:15.0 +0200
@@ -12,4 +12,28 @@
[ -d /etc/apm ]rmdir --ignore-fail-on-non-empty /etc/apm
fi
+case $1 in
+install|upgrade)
+ # Handle upgrade of /etc/default/alsa → /etc/default/alsa-base
+ if [ -f /etc/default/alsa ]; then
+ OLDMD5SUM=b0f9824c2d4288aa89df3777668f0d99
+ CURMD5SUM=$(md5sum /etc/default/alsa | sed -e 's/ .*//')
+ # Upgrades prior to the file rename
+ if dpkg --compare-versions $2 lt 1.0.25+2; then
+ if [ $OLDMD5SUM = $CURMD5SUM ]; then
+rm -f /etc/default/alsa
+ # Don't overwrite the file if it already existed
+ elif [ ! -f /etc/default/alsa-base ]; then
+mv /etc/default/alsa /etc/default/alsa-base
+ fi
+ # Upgrades from current testing: both files exist
+ # If the old file was modified, just leave it there
+ elif dpkg --compare-versions $2 lt 1.0.25+3; then
+ if [ $OLDMD5SUM = $CURMD5SUM ]; then
+rm -f /etc/default/alsa
+ fi
+ fi
+ fi
+esac
+
#DEBHELPER#
diff -Nru alsa-base-1.0.25+2+nmu2/debian/changelog alsa-base-1.0.25+3/debian/changelog
--- alsa-base-1.0.25+2+nmu2/debian/changelog 2012-08-26 17:57:22.0 +0200
+++ alsa-base-1.0.25+3/debian/changelog 2013-04-19 09:51:08.0 +0200
@@ -1,3 +1,20 @@
+alsa-base (1.0.25+3) unstable; urgency=low
+
+ * Add Pre-Depends dpkg (= 1.15.7.2~), for dpkg-maintscript-helper.
+ * In 1.0.25+2, we started using dh_installinit to install the
+default file as /etc/default/alsa-base, and make it a proper conffile.
+However, the alsa script still expected to read defaults from
+/etc/default/alsa. Update it to use the new path (closes: #680914).
+Additionally, make sure that if we're upgrading from versions prior to
+this change, and a /etc/default/alsa file already exists and its
+md5sum isn't known, it'll get renamed to alsa-base in order to
+preserve user changes.
+For testing users, the old file will be removed if it was pristine,
+and otherwise it'll stay unused in the filesystem.
+ * Try to remove /etc/default/alsa
Bug#704729: unblock: alsa-base/1.0.25+3 (pre-approval)
Am 05.04.2013 06:50, schrieb Jordi Mallach: Package: release.debian.org Severity: normal User: release.debian@packages.debian.org Usertags: unblock I've prepared an update for alsa-base, to deal with a conffile fuckup that happened moths ago and unfortunately got unnoticed by me until recently. The rough story is: alsa-base, until +1, was doing Weird Shit™ with its handling of /etc/default/alsa, which wasn't even a conffile. When I got rid of all of that in +2, I accidentally got the new conffile renamed to /e/d/alsa-base due to using debhelper to install it. The script that sources it wasn't updated to look in the new location, and of course users were left with the old conffile and the new one in the filesystem. The updated package tries to fix this for people upgrading from squeeze and also for current testing users which already have both files. As briefly mentioned on IRC, the alternative to switching to /etc/default/alsa-base, is to keep the old /etc/default/alsa configuration file (which is used in squeeze) and simply remove /etc/default/alsa-base for sid users. Unless there is a good reason to switch to the new name, I'd just keep the old one. Jordi, is there a reason why this option was not considered? Cheers, Michael -- Why is it that all of the instruments seeking intelligent life in the universe are pointed away from Earth? signature.asc Description: OpenPGP digital signature
Bug#704729: unblock: alsa-base/1.0.25+3 (pre-approval)
(disclaimer: I am not part of the release team). On 05-04-13 06:50, Jordi Mallach wrote: Additionally, it marks the package as MA: foreign. SVN also had two old commits that add a missing pre-dependency on dpkg, and remove redundant dirs from debian/alsa-base.dirs. If these two old commits are unacceptable, I'll revert and rebuild, but I've checked that the package contents are identical. As I understand it, the release team really likes to see only the important changes, i.e. I suggest you only fix the conffile issue. By the way, what happens if people changed both the old and new file? They get the old one, wouldn't you say that the new one is better in that case (and maybe leave the old one as well)? Paul signature.asc Description: OpenPGP digital signature
Bug#704729: unblock: alsa-base/1.0.25+3 (pre-approval)
On Fri, Apr 05, 2013 at 07:36:09PM +0200, Paul Gevers wrote: Additionally, it marks the package as MA: foreign. SVN also had two old commits that add a missing pre-dependency on dpkg, and remove redundant dirs from debian/alsa-base.dirs. If these two old commits are unacceptable, I'll revert and rebuild, but I've checked that the package contents are identical. As I understand it, the release team really likes to see only the important changes, i.e. I suggest you only fix the conffile issue. Right. I'll wait for rt to say what they think, specially for the MA and the pre-dependency. By the way, what happens if people changed both the old and new file? They get the old one, wouldn't you say that the new one is better in that case (and maybe leave the old one as well)? Unless bug, testing users who have both files and both are modified will just get the new one, and the old one will stay in the directory until the package is purged. rJodi -- Jordi Mallach Pérez -- Debian developer http://www.debian.org/ jo...@sindominio.net jo...@debian.org http://www.sindominio.net/ GnuPG public key information available at http://oskuro.net/ signature.asc Description: Digital signature
Bug#704729: unblock: alsa-base/1.0.25+3 (pre-approval)
Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock
I've prepared an update for alsa-base, to deal with a conffile fuckup that
happened moths ago and unfortunately got unnoticed by me until recently.
The rough story is: alsa-base, until +1, was doing Weird Shit™ with its
handling of /etc/default/alsa, which wasn't even a conffile. When I got
rid of all of that in +2, I accidentally got the new conffile renamed to
/e/d/alsa-base due to using debhelper to install it. The script that
sources it wasn't updated to look in the new location, and of course users
were left with the old conffile and the new one in the filesystem.
The updated package tries to fix this for people upgrading from squeeze
and also for current testing users which already have both files.
Additionally, it marks the package as MA: foreign. SVN also had two old
commits that add a missing pre-dependency on dpkg, and remove redundant
dirs from debian/alsa-base.dirs. If these two old commits are
unacceptable, I'll revert and rebuild, but I've checked that the package
contents are identical.
Finally, plese note this is probably (and hopefully) the final upload of
alsa-base. Marco and I have agreed to transplant the modprobe.d bits in
kmod, and let the alsa script die, as it was useful 8 years ago, but
probably not so much today. In short, I think this bug needs fix now, or
it won't ever be.
unblock alsa-base/1.0.25+3
Thanks for considering,
Jordi
-- System Information:
Debian Release: 7.0
APT prefers unstable
APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 3.5-trunk-amd64 (SMP w/2 CPU cores)
Locale: LANG=ca_ES.UTF-8@valencia, LC_CTYPE=ca_ES.UTF-8@valencia (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru alsa-base-1.0.25+2+nmu2/debian/alsa alsa-base-1.0.25+3/debian/alsa
--- alsa-base-1.0.25+2+nmu2/debian/alsa 2012-05-20 01:20:03.0 +0200
+++ alsa-base-1.0.25+3/debian/alsa 2013-04-01 07:05:11.0 +0200
@@ -15,10 +15,10 @@
MYNAME=/usr/sbin/alsa
PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-# Default values of variables in /etc/default/alsa
+# Default values of variables in /etc/default/alsa-base
force_unload_modules_before_suspend=
-[ -f /etc/default/alsa ] . /etc/default/alsa
+[ -f /etc/default/alsa-base ] . /etc/default/alsa-base
# $* MESSAGE
warn() { echo ${MYNAME}: Warning: $* 2 ; }
diff -Nru alsa-base-1.0.25+2+nmu2/debian/alsa-base.dirs alsa-base-1.0.25+3/debian/alsa-base.dirs
--- alsa-base-1.0.25+2+nmu2/debian/alsa-base.dirs 2012-02-26 12:56:39.0 +0100
+++ alsa-base-1.0.25+3/debian/alsa-base.dirs 2013-04-01 07:02:21.0 +0200
@@ -1,5 +1 @@
-etc/modprobe.d
-usr/share/alsa-base
-usr/share/lintian/overrides
-usr/share/bug/alsa-base
usr/sbin
diff -Nru alsa-base-1.0.25+2+nmu2/debian/alsa-base.postrm alsa-base-1.0.25+3/debian/alsa-base.postrm
--- alsa-base-1.0.25+2+nmu2/debian/alsa-base.postrm 2012-05-20 14:23:19.0 +0200
+++ alsa-base-1.0.25+3/debian/alsa-base.postrm 2013-04-04 06:50:44.0 +0200
@@ -5,6 +5,9 @@
if [ $1 = purge ]; then
# Remove run time files
rm -rf /var/run/alsa
+
+ # Remove stray file
+ rm -f /etc/default/alsa
fi
#DEBHELPER#
diff -Nru alsa-base-1.0.25+2+nmu2/debian/alsa-base.preinst alsa-base-1.0.25+3/debian/alsa-base.preinst
--- alsa-base-1.0.25+2+nmu2/debian/alsa-base.preinst 2012-07-08 23:49:56.0 +0200
+++ alsa-base-1.0.25+3/debian/alsa-base.preinst 2013-04-05 06:24:05.0 +0200
@@ -12,4 +12,27 @@
[ -d /etc/apm ]rmdir --ignore-fail-on-non-empty /etc/apm
fi
+case $1 in
+install|upgrade)
+ # Handle upgrade of /etc/default/alsa → /etc/default/alsa-base
+ if [ -f /etc/default/alsa ]; then
+ OLDMD5SUM=b0f9824c2d4288aa89df3777668f0d99
+ CURMD5SUM=$(md5sum /etc/default/alsa | sed -e 's/ .*//')
+ # Upgrades prior to the file rename
+ if dpkg --compare-versions $2 lt 1.0.25+2; then
+ if [ $OLDMD5SUM = $CURMD5SUM ]; then
+rm -f /etc/default/alsa
+ else
+mv /etc/default/alsa /etc/default/alsa-base
+ fi
+ # Upgrades from current testing: both files exist
+ # If the old file was modified, just leave it there
+ elif dpkg --compare-versions $2 lt 1.0.25+3; then
+ if [ $OLDMD5SUM = $CURMD5SUM ]; then
+rm -f /etc/default/alsa
+ fi
+ fi
+ fi
+esac
+
#DEBHELPER#
diff -Nru alsa-base-1.0.25+2+nmu2/debian/changelog alsa-base-1.0.25+3/debian/changelog
--- alsa-base-1.0.25+2+nmu2/debian/changelog 2012-08-26 17:57:22.0 +0200
+++ alsa-base-1.0.25+3/debian/changelog 2013-04-05 06:28:30.0 +0200
@@ -1,3 +1,22 @@
+alsa-base (1.0.25+3) unstable; urgency=low
+
+ * Add Pre-Depends dpkg (= 1.15.7.2~), for dpkg-maintscript-helper.
+ * Drop all dirs but usr/sbin from alsa-base.dirs. dh will take care.
+ * Mark alsa-base Mult-Arch: foreign.
+ * In 1.0.25+2, we started using dh_installinit to install the
+default file as /etc/default/alsa-base, and make it a proper
