diff -Nru alsa-utils-1.0.25/debian/alsa-utils-udeb.install alsa-utils-1.0.25/debian/alsa-utils-udeb.install --- alsa-utils-1.0.25/debian/alsa-utils-udeb.install 2012-02-08 08:11:17.000000000 +0000 +++ alsa-utils-1.0.25/debian/alsa-utils-udeb.install 2012-02-14 05:45:14.000000000 +0000 @@ -1 +1,5 @@ + +debian/S37alsa-utils-udeb lib/debian-installer-startup.d debian/utils.sh /usr/share/alsa +usr/bin/amixer +debian/tmp/usr/sbin/alsactl sbin diff -Nru alsa-utils-1.0.25/debian/alsa-utils-udeb.start alsa-utils-1.0.25/debian/alsa-utils-udeb.start --- alsa-utils-1.0.25/debian/alsa-utils-udeb.start 2012-02-08 08:11:17.000000000 +0000 +++ alsa-utils-1.0.25/debian/alsa-utils-udeb.start 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -#!/bin/sh - -. /usr/share/alsa/utils.sh - - -preinit_levels all -sanify_levels all diff -Nru alsa-utils-1.0.25/debian/changelog alsa-utils-1.0.25/debian/changelog --- alsa-utils-1.0.25/debian/changelog 2012-02-08 08:45:05.000000000 +0000 +++ alsa-utils-1.0.25/debian/changelog 2012-02-14 05:46:28.000000000 +0000 @@ -1,4 +1,33 @@ -alsa-utils (1.0.25-0ubuntu1~precise1) precise; urgency=low +alsa-utils (1.0.25-1ubuntu1~precise1) precise; urgency=low + + * Merge from debian unstable. Remaining changes: + - Move alsactl to sbin + - Move init script volume settings to new alsactl database: + + Set sane level for 'Speaker' and 'Headphone', needed for Dell Mini 9 + and Dell E series + + ute PC Beep on hda cards that support it during initial volume setup + + Mute *Analog/Digital Control for Creative cards by default + + Default Digital Input Source to be Digital Mic 1 so that users + with digital mic will be able to use it out of the box + + Mute "IEC958 Optical Raw" by default + + Set sane level for headphone 1 for Dell Studio XPS with 2.6.30 + + Prefer built-in digital mics on newer Dells + + Unmute 'Line HP Swap' for Dove boards + - ship udev rules file in /lib/udev/rules.d + - debian/README.init.cs4236: Include in /usr/share/doc/alsa-utils so that + users of snd-cs4236 (e.g., ThinkPad 600) can have audible sound + - debian/patches/unset_pulse_internal.patch: We don't want alsamixer to + show the pulse mixer by default, since it can be controlled from + pulseaudio itself + - Use upstart jobs for storing/restoring card settings + - Add udev rule to apply UCM profiles for panda and equivalent hardware + - Install alsa udev rules, at the least they are needed for hotplugged + devices + - Add Vcs-Bzr field + + -- Luke Yelavich Tue, 14 Feb 2012 16:46:24 +1100 + +alsa-utils (1.0.25-0ubuntu1) UNRELEASED; urgency=low * New upstream release * Updated changelog.ALSA @@ -12,7 +41,34 @@ * Refreshed remaining patches. * debian/control: Bump libasound2 dependency to >= 1.0.25. - -- Luke Yelavich Wed, 08 Feb 2012 19:43:10 +1100 + -- Luke Yelavich Wed, 08 Feb 2012 19:09:33 +1100 + +alsa-utils (1.0.25-1) unstable; urgency=low + + * New upstream release. + * Update debian/changelog.ALSA. + * Drop alsamixer_libxch1.patch, accepted upstream. + * Drop speaker-test.1_improvements.patch, applied upstream. + * Drop aplay_interactive.patch, applied upstream. + * Build-Depend on libasound2-dev (>= 1.0.25). + * Remove obsolete PATCHES.Debian. + * Use watch file version 3, and don't uupdate. + * Run source package through wrap-and-sort. + * Bump to debhelper 9. + * Rewrite rules using dh. + * Remove shebang from utils.sh. It is meant to be sourced. + * Update spelling_fixes.patch with new fix. + * Fix override file. + + -- Jordi Mallach Sun, 12 Feb 2012 02:10:57 +0100 + +alsa-utils (1.0.24.2-5) unstable; urgency=low + + [ Elimar Riesebieter ] + * Introduce alsamixer_libxch1.patch from upstream to fix a linking + clash for shutdown(). (Closes: #657342, #657538) + + -- Jordi Mallach Sat, 28 Jan 2012 15:37:07 +0100 alsa-utils (1.0.24.2-4ubuntu3) precise; urgency=low diff -Nru alsa-utils-1.0.25/debian/changelog.ALSA alsa-utils-1.0.25/debian/changelog.ALSA --- alsa-utils-1.0.25/debian/changelog.ALSA 2012-02-08 08:11:17.000000000 +0000 +++ alsa-utils-1.0.25/debian/changelog.ALSA 2012-02-14 05:45:14.000000000 +0000 @@ -5,49 +5,58 @@ * alsa-utils + Core - Release v1.0.25 - alsactl: add support for recreating enumerated user controls - fix use of $(SED) - Updated COPYING with the recent FSF address - Release v1.0.24.2 - Release v1.0.24.1 + Release v1.0.25 + alsactl: add support for recreating enumerated user controls + fix use of $(SED) + Updated COPYING with the recent FSF address + Release v1.0.24.2 + Release v1.0.24.1 + + ALSA Control (alsactl) - Alsa-utils: Fix typo causing some volumes not to be initialized - alsactl: Initialize Front Speaker, etc - alsactl: add support for recreating enumerated user controls - fix use of $(SED) - Revert "alsactl - Display help for names command" - alsactl init: Mute CD Playback volume by default + Alsa-utils: Fix typo causing some volumes not to be initialized + alsactl: Initialize Front Speaker, etc + alsactl: add support for recreating enumerated user controls + fix use of $(SED) + Revert "alsactl - Display help for names command" + alsactl init: Mute CD Playback volume by default + + Speaker Test - speaker-test.1: Clarify man page by giving examples + speaker-test.1: Clarify man page by giving examples + + alsaconf - fix use of $(SED) + fix use of $(SED) + + alsaloop - alsaloop: Use AM_CFLAGS in Makefile.am - alsaloop: another try to force correct formats for libsamplerate - alsaloop: libsamplerate requires specific formats, force them for slave mode + alsaloop: Use AM_CFLAGS in Makefile.am + alsaloop: another try to force correct formats for libsamplerate + alsaloop: libsamplerate requires specific formats, force them for slave mode + + alsamixer - alsamixer: Fix X-win related crash for PulseAudio plugin (bad linking) - alsamixer: Fix 64bit issues - alsamixer: fix build on uClibc - alsamixer: fix display of active/inactive controls + alsamixer: Fix X-win related crash for PulseAudio plugin (bad linking) + alsamixer: Fix 64bit issues + alsamixer: fix build on uClibc + alsamixer: fix display of active/inactive controls + + alsaucm - alsaucm: Don't double-free empty lists - alsaucm: Add list1 command for non-tuple lists - alsaucm: do not bail out in the interactive mode upon error - alsaucm: fix interactive mode, add batch mode - alsaucm: fix list command and output + alsaucm: Don't double-free empty lists + alsaucm: Add list1 command for non-tuple lists + alsaucm: do not bail out in the interactive mode upon error + alsaucm: fix interactive mode, add batch mode + alsaucm: fix list command and output + + amixer - alsa-utils: amixer: Fix SND_CTL_TLVT_DB_RANGE handling + alsa-utils: amixer: Fix SND_CTL_TLVT_DB_RANGE handling + + aplay/arecord - aplay: Fix spelling error - aplay: increase channel limit to 256 - aplay: Use standard endian convesions - aplay: Add include files for mkdir() - aplay: Avoid recursive signal handling - aplay: Add -i option for interactive mode + aplay: Fix spelling error + aplay: increase channel limit to 256 + aplay: Use standard endian convesions + aplay: Add include files for mkdir() + aplay: Avoid recursive signal handling + aplay: Add -i option for interactive mode + + aplaymidi/arecordmidi - aplaymidi: clarify multi-port documentation + aplaymidi: clarify multi-port documentation Changelog between 1.0.23 and 1.0.24 releases (http://www.alsa-project.org/main/index.php/Changes_v1.0.23_v1.0.24) diff -Nru alsa-utils-1.0.25/debian/compat alsa-utils-1.0.25/debian/compat --- alsa-utils-1.0.25/debian/compat 2012-02-08 08:11:17.000000000 +0000 +++ alsa-utils-1.0.25/debian/compat 2012-02-14 05:45:14.000000000 +0000 @@ -1 +1 @@ -8 +9 diff -Nru alsa-utils-1.0.25/debian/control alsa-utils-1.0.25/debian/control --- alsa-utils-1.0.25/debian/control 2012-02-08 08:11:17.000000000 +0000 +++ alsa-utils-1.0.25/debian/control 2012-02-14 05:45:14.000000000 +0000 @@ -1,13 +1,15 @@ Source: alsa-utils Section: sound Priority: optional -Maintainer: Ubuntu Core Developers +Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Debian ALSA Maintainers -Uploaders: Jordi Mallach , Elimar Riesebieter , Martin Pitt -Build-Depends: debhelper (>= 8), - libncursesw5-dev, - autotools-dev, +Uploaders: Jordi Mallach , + Elimar Riesebieter , + Martin Pitt +Build-Depends: autotools-dev, + debhelper (>= 9), libasound2-dev (>= 1.0.25), + libncursesw5-dev, libsamplerate-dev, xmlto Standards-Version: 3.9.2 @@ -19,7 +21,12 @@ Package: alsa-utils Architecture: linux-any Provides: audio-mixer -Depends: ${shlibs:Depends}, ${misc:Depends}, whiptail | dialog, module-init-tools, lsb-base (>= 3.0-9), linux-sound-base (>= 1.0.15-1) +Depends: linux-sound-base (>= 1.0.15-1), + lsb-base (>= 3.0-9), + module-init-tools, + whiptail | dialog, + ${misc:Depends}, + ${shlibs:Depends} Recommends: alsa-base (>= 1.0.15-1), pciutils Conflicts: udev (<< 0.060), alsa-base (<< 1.0.9b-3) Description: Utilities for configuring and using ALSA @@ -37,7 +44,7 @@ Architecture: linux-any Section: debian-installer Provides: audio-mixer -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: ${misc:Depends}, ${shlibs:Depends} Package-Type: udeb Description: Utilities for configuring and using ALSA (udeb) This is a selection of alsa utilities for use in Debian Installer. diff -Nru alsa-utils-1.0.25/debian/docs alsa-utils-1.0.25/debian/docs --- alsa-utils-1.0.25/debian/docs 1970-01-01 00:00:00.000000000 +0000 +++ alsa-utils-1.0.25/debian/docs 2012-02-14 05:45:14.000000000 +0000 @@ -0,0 +1 @@ +debian/README.init.cs4236 diff -Nru alsa-utils-1.0.25/debian/install alsa-utils-1.0.25/debian/install --- alsa-utils-1.0.25/debian/install 1970-01-01 00:00:00.000000000 +0000 +++ alsa-utils-1.0.25/debian/install 2012-02-14 05:45:14.000000000 +0000 @@ -0,0 +1,5 @@ +usr/bin +debian/tmp/usr/sbin/alsactl sbin +usr/share +lib/udev +debian/90-alsa-ucm.rules lib/udev/rules.d diff -Nru alsa-utils-1.0.25/debian/lintian-overrides alsa-utils-1.0.25/debian/lintian-overrides --- alsa-utils-1.0.25/debian/lintian-overrides 2012-02-08 08:11:17.000000000 +0000 +++ alsa-utils-1.0.25/debian/lintian-overrides 2012-02-14 05:45:14.000000000 +0000 @@ -1 +1 @@ -alsa-utils: spelling-error-in-binary ./usr/sbin/alsactl ressize resize +alsa-utils: spelling-error-in-binary usr/sbin/alsactl ressize resize diff -Nru alsa-utils-1.0.25/debian/patches/add_extra_volume_defaults.patch alsa-utils-1.0.25/debian/patches/add_extra_volume_defaults.patch --- alsa-utils-1.0.25/debian/patches/add_extra_volume_defaults.patch 2012-02-08 08:11:17.000000000 +0000 +++ alsa-utils-1.0.25/debian/patches/add_extra_volume_defaults.patch 2012-02-14 05:45:14.000000000 +0000 @@ -1,8 +1,8 @@ -Index: alsa-utils-1.0.25/alsactl/init/default +Index: alsa-utils-1.0.24.2/alsactl/init/default =================================================================== ---- alsa-utils-1.0.25.orig/alsactl/init/default 2012-02-08 18:39:06.509480476 +1100 -+++ alsa-utils-1.0.25/alsactl/init/default 2012-02-08 18:42:38.801478452 +1100 -@@ -196,6 +196,12 @@ +--- alsa-utils-1.0.24.2.orig/alsactl/init/default 2011-02-21 12:43:29.374811231 +0100 ++++ alsa-utils-1.0.24.2/alsactl/init/default 2011-02-21 13:26:42.762810505 +0100 +@@ -126,6 +126,12 @@ CTL{values}="on" CTL{reset}="mixer" @@ -15,7 +15,7 @@ CTL{name}="Synth Playback Volume",CTL{do_search}=="1", \ CTL{values}="$env{pvolume}",RESULT!="0",CTL{values}="$env{ppercent}" CTL{name}="Synth Playback Switch",CTL{do_search}=="1", \ -@@ -237,6 +243,81 @@ +@@ -174,6 +180,81 @@ CTL{name}="AC97 Playback Switch",CTL{do_search}=="1", \ CTL{values}="on" @@ -97,7 +97,7 @@ # # Powermacs # -@@ -262,11 +343,13 @@ +@@ -199,11 +280,13 @@ CTL{name}="Input Source",PROGRAM!="__ctl_search", GOTO="" CTL{enums}=="*|Internal Mic|*",CTL{values}="Internal Mic", GOTO="" diff -Nru alsa-utils-1.0.25/debian/patches/alsactl_sbin.patch alsa-utils-1.0.25/debian/patches/alsactl_sbin.patch --- alsa-utils-1.0.25/debian/patches/alsactl_sbin.patch 2012-02-08 08:11:17.000000000 +0000 +++ alsa-utils-1.0.25/debian/patches/alsactl_sbin.patch 2012-02-14 05:45:14.000000000 +0000 @@ -1,7 +1,7 @@ -Index: alsa-utils-1.0.25/alsactl/90-alsa-restore.rules.in +Index: alsa-utils-1.0.24.2/alsactl/90-alsa-restore.rules.in =================================================================== ---- alsa-utils-1.0.25.orig/alsactl/90-alsa-restore.rules.in 2012-02-08 18:39:06.129480480 +1100 -+++ alsa-utils-1.0.25/alsactl/90-alsa-restore.rules.in 2012-02-08 18:42:38.785478452 +1100 +--- alsa-utils-1.0.24.2.orig/alsactl/90-alsa-restore.rules.in 2011-02-09 15:29:31.204340223 +0100 ++++ alsa-utils-1.0.24.2/alsactl/90-alsa-restore.rules.in 2011-02-09 15:29:50.928340221 +0100 @@ -1,2 +1,2 @@ ACTION=="add", SUBSYSTEM=="sound", KERNEL=="controlC*", KERNELS=="card*", \ - RUN+="@sbindir@/alsactl restore $attr{number}" diff -Nru alsa-utils-1.0.25/debian/patches/aseqnet_manpage_errors.patch alsa-utils-1.0.25/debian/patches/aseqnet_manpage_errors.patch --- alsa-utils-1.0.25/debian/patches/aseqnet_manpage_errors.patch 2012-02-08 08:11:17.000000000 +0000 +++ alsa-utils-1.0.25/debian/patches/aseqnet_manpage_errors.patch 2012-02-14 05:45:14.000000000 +0000 @@ -1,10 +1,10 @@ From: Jordi Mallach Description: Remove an unknown "LO" section from the manpage to avoid man errors. -Index: alsa-utils-1.0.25/seq/aseqnet/aseqnet.1 +Index: alsa-utils-1.0.21/seq/aseqnet/aseqnet.1 =================================================================== ---- alsa-utils-1.0.25.orig/seq/aseqnet/aseqnet.1 2012-02-08 18:39:06.345480478 +1100 -+++ alsa-utils-1.0.25/seq/aseqnet/aseqnet.1 2012-02-08 18:42:38.721478453 +1100 +--- alsa-utils-1.0.21.orig/seq/aseqnet/aseqnet.1 2009-08-31 17:13:36.000000000 +0200 ++++ alsa-utils-1.0.21/seq/aseqnet/aseqnet.1 2009-09-04 22:19:32.000000000 +0200 @@ -1,5 +1,4 @@ .TH aseqnet 1 "January 1, 2000" -.LO 1 diff -Nru alsa-utils-1.0.25/debian/patches/fix_misspelling_speaker-test_man_page.patch alsa-utils-1.0.25/debian/patches/fix_misspelling_speaker-test_man_page.patch --- alsa-utils-1.0.25/debian/patches/fix_misspelling_speaker-test_man_page.patch 2012-02-08 08:11:17.000000000 +0000 +++ alsa-utils-1.0.25/debian/patches/fix_misspelling_speaker-test_man_page.patch 2012-02-14 05:45:14.000000000 +0000 @@ -1,11 +1,11 @@ From: Elimar Riesebieter Subject: Fix typo in speaker-test manpage -Index: alsa-utils-1.0.25/speaker-test/speaker-test.1 +Index: alsa-utils-1.0.18/speaker-test/speaker-test.1 =================================================================== ---- alsa-utils-1.0.25.orig/speaker-test/speaker-test.1 2012-02-08 18:39:06.173480480 +1100 -+++ alsa-utils-1.0.25/speaker-test/speaker-test.1 2012-02-08 18:42:38.773478452 +1100 -@@ -86,7 +86,7 @@ +--- alsa-utils-1.0.18.orig/speaker-test/speaker-test.1 2009-02-01 16:56:12.000000000 -0500 ++++ alsa-utils-1.0.18/speaker-test/speaker-test.1 2009-02-01 16:56:46.000000000 -0500 +@@ -51,7 +51,7 @@ The default value is 0. .TP diff -Nru alsa-utils-1.0.25/debian/patches/spelling_fixes.patch alsa-utils-1.0.25/debian/patches/spelling_fixes.patch --- alsa-utils-1.0.25/debian/patches/spelling_fixes.patch 2012-02-08 08:11:17.000000000 +0000 +++ alsa-utils-1.0.25/debian/patches/spelling_fixes.patch 2012-02-14 05:45:14.000000000 +0000 @@ -1,9 +1,8 @@ From: Elimar Riesebieter -Subject: Fix typos in aplay.c and aseqnet.c -Index: alsa-utils-1.0.25/aplay/aplay.c -=================================================================== ---- alsa-utils-1.0.25.orig/aplay/aplay.c 2012-02-08 18:39:06.217480479 +1100 -+++ alsa-utils-1.0.25/aplay/aplay.c 2012-02-08 18:42:38.757478452 +1100 +Subject: Fix typos in aplay.c, aseqnet.c and iecbits.c + +--- a/aplay/aplay.c 2012-01-25 10:43:38.000000000 +0100 ++++ b/aplay/aplay.c 2012-02-11 20:00:10.000000000 +0100 @@ -232,7 +232,7 @@ printf(" %s", s); } @@ -13,10 +12,8 @@ printf(_("-f cd (16 bit little endian, 44100, stereo)\n")); printf(_("-f cdr (16 bit big endian, 44100, stereo)\n")); printf(_("-f dat (16 bit little endian, 48000, stereo)\n")); -Index: alsa-utils-1.0.25/seq/aseqnet/aseqnet.c -=================================================================== ---- alsa-utils-1.0.25.orig/seq/aseqnet/aseqnet.c 2012-02-08 18:39:06.233480479 +1100 -+++ alsa-utils-1.0.25/seq/aseqnet/aseqnet.c 2012-02-08 18:42:38.757478452 +1100 +--- a/seq/aseqnet/aseqnet.c 2012-01-25 10:43:38.000000000 +0100 ++++ b/seq/aseqnet/aseqnet.c 2012-02-11 20:00:10.000000000 +0100 @@ -167,7 +167,7 @@ printf(_(" server mode: aseqnet [-options]\n")); printf(_(" client mode: aseqnet [-options] server_host\n")); @@ -26,3 +23,14 @@ printf(_(" -s,--source addr : read from given addr (client:port)\n")); printf(_(" -d,--dest addr : write to given addr (client:port)\n")); printf(_(" -v, --verbose : print verbose messages\n")); +--- a/iecset/iecbits.c 2012-01-25 10:43:38.000000000 +0100 ++++ b/iecset/iecbits.c 2012-02-12 01:07:33.951015893 +0100 +@@ -218,7 +218,7 @@ + printf("user-defined\n"); + break; + default: +- printf("unkown\n"); ++ printf("unknown\n"); + break; + } + printf("Sample Bits: "); diff -Nru alsa-utils-1.0.25/debian/patches/unset_pulse_internal.patch alsa-utils-1.0.25/debian/patches/unset_pulse_internal.patch --- alsa-utils-1.0.25/debian/patches/unset_pulse_internal.patch 2012-02-08 08:11:17.000000000 +0000 +++ alsa-utils-1.0.25/debian/patches/unset_pulse_internal.patch 2012-02-14 05:45:14.000000000 +0000 @@ -1,7 +1,6 @@ -Index: alsa-utils-1.0.25/alsamixer/cli.c -=================================================================== ---- alsa-utils-1.0.25.orig/alsamixer/cli.c 2012-02-08 18:39:06.305480478 +1100 -+++ alsa-utils-1.0.25/alsamixer/cli.c 2012-02-08 18:42:38.737478453 +1100 +diff -urN alsa-utils-1.0.21/alsamixer/cli.c alsa-utils-1.0.21.new/alsamixer/cli.c +--- alsa-utils-1.0.21/alsamixer/cli.c 2009-09-01 01:13:36.000000000 +1000 ++++ alsa-utils-1.0.21.new/alsamixer/cli.c 2009-11-05 15:58:15.000000000 +1100 @@ -120,6 +120,10 @@ textdomain(PACKAGE); #endif @@ -13,11 +12,10 @@ parse_options(argc, argv); create_mixer_object(&selem_regopt); -Index: alsa-utils-1.0.25/amixer/amixer.c -=================================================================== ---- alsa-utils-1.0.25.orig/amixer/amixer.c 2012-02-08 18:39:06.289480479 +1100 -+++ alsa-utils-1.0.25/amixer/amixer.c 2012-02-08 18:42:38.737478453 +1100 -@@ -1915,6 +1915,11 @@ +diff -urN alsa-utils-1.0.21/amixer/amixer.c alsa-utils-1.0.21.new/amixer/amixer.c +--- alsa-utils-1.0.21/amixer/amixer.c 2009-09-01 01:13:36.000000000 +1000 ++++ alsa-utils-1.0.21.new/amixer/amixer.c 2009-11-05 15:57:21.000000000 +1100 +@@ -1892,6 +1892,11 @@ { int morehelp, level = 0; int read_stdin = 0; @@ -29,10 +27,9 @@ static const struct option long_option[] = { {"help", 0, NULL, 'h'}, -Index: alsa-utils-1.0.25/iecset/iecset.c -=================================================================== ---- alsa-utils-1.0.25.orig/iecset/iecset.c 2012-02-08 18:39:06.277480479 +1100 -+++ alsa-utils-1.0.25/iecset/iecset.c 2012-02-08 18:42:38.741478452 +1100 +diff -urN alsa-utils-1.0.21/iecset/iecset.c alsa-utils-1.0.21.new/iecset/iecset.c +--- alsa-utils-1.0.21/iecset/iecset.c 2009-09-01 01:13:36.000000000 +1000 ++++ alsa-utils-1.0.21.new/iecset/iecset.c 2009-11-05 15:57:22.000000000 +1100 @@ -324,6 +324,10 @@ char tmpname[32]; int parms[IDX_LAST]; diff -Nru alsa-utils-1.0.25/debian/PATCHES.Debian alsa-utils-1.0.25/debian/PATCHES.Debian --- alsa-utils-1.0.25/debian/PATCHES.Debian 2012-02-08 08:11:17.000000000 +0000 +++ alsa-utils-1.0.25/debian/PATCHES.Debian 1970-01-01 00:00:00.000000000 +0000 @@ -1,32 +0,0 @@ -Patches applied in the Debian version of : - -debian/patches/move_asound_state_to_var.patch (David B. Harris): - Move asound.state location to /var/lib/alsa/ - -debian/patches/alsaconf_safe_tmp.patch (Thomas Hood): - Create alsaconf.cards temporary file safely - Always run in modinfo mode - -debian/patches/debian_alsaconf_paths.patch (Thomas Hood): - Don't precompute paths for lspci and lsmod - -debian/patches/debian_alsaconf_idmode.patch (Thomas Hood): - Use Debian-specified GID and mode for ALSA devices. - -debian/patches/debian_alsaconf_noclear.patch (Thomas Hood): - Don't clear the screen. (Let the user see error messages.) - -debian/patches/debian_alsaconf_unload_modules.patch (Thomas Hood): - Run initscript force-unload method rather than stop - and do it after the intro rather than before - -debian/patches/debian_alsaconf_improve_intro.patch (Thomas Hood): - Improve introductory message - -debian/patches/debian_alsaconf_nodup.patch (Thomas Hood): - Do not put any lines into /etc/mod{utils,probe.d}/sound that are - already present in /etc/mod{utils,probe.d}/alsa-base - -debian/patches/debian_alsaconf_modprobe_ignoreinstall.patch (Thomas Hood): - Use modprobe --ignore-install when modprobing legacy card drivers with args - diff -Nru alsa-utils-1.0.25/debian/rules alsa-utils-1.0.25/debian/rules --- alsa-utils-1.0.25/debian/rules 2012-02-08 08:11:17.000000000 +0000 +++ alsa-utils-1.0.25/debian/rules 2012-02-14 05:45:14.000000000 +0000 @@ -1,38 +1,8 @@ #!/usr/bin/make -f +%: + dh $@ -#include /usr/share/quilt/quilt.make - -CFLAGS = -Wall -g -D_GNU_SOURCE - -INSTALL_UAG := -o root -g audio - -# These are used for cross-compiling and for saving the configure script -# from having to guess our platform (since we know it already) -DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) - -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif - -clean: - dh_testdir - dh_clean - [ ! -f Makefile ] || $(MAKE) distclean - -rm -f version - -rm -f configure-stamp build-stamp - -rm -f config.cache config.log config.status Makefile.conf - -rm -f config.sub config.guess - -rm -f aplay/arecord - -configure: configure-stamp -configure-stamp: - dh_testdir - -rm -f config.sub config.guess - ln -s /usr/share/misc/config.sub config.sub - ln -s /usr/share/misc/config.guess config.guess +override_dh_auto_configure: ./configure --prefix=/usr \ --mandir=\$${prefix}/share/man \ --infodir=\$${prefix}/share/info \ @@ -40,75 +10,18 @@ --disable-alsaconf \ --host=$(DEB_HOST_GNU_TYPE) \ --build=$(DEB_BUILD_GNU_TYPE) - touch configure-stamp -build-arch: build -build-indep: build -build: configure build-stamp -build-stamp: - $(MAKE) CFLAGS='$(CFLAGS)' - touch build-stamp +override_dh_auto_install: + dh_auto_install --destdir=debian/tmp -install: DH_OPTIONS= -install: build - dh_testdir - dh_testroot - dh_prep - $(MAKE) install DESTDIR=$(CURDIR)/debian/alsa-utils - - # move alsactl to /sbin - mkdir debian/alsa-utils/sbin - mv debian/alsa-utils/usr/sbin/alsactl debian/alsa-utils/sbin - -rm -f debian/alsa-utils/usr/share/man/fr/man8/alsaconf.8 - -rmdir debian/alsa-utils/usr/share/man/fr/man8 - -rmdir debian/alsa-utils/usr/share/man/fr - - # Don't install alsaconf - # Not needed since 1.0.24.2 as we configure with --disable-alsaconf. - #-rm -f debian/alsa-utils/usr/sbin/alsaconf - #-rm -f debian/alsa-utils/usr/share/man/man8/alsaconf* - #-rm -f debian/alsa-utils/usr/share/locale/*/LC_MESSAGES/alsaconf* - - # Don't install alsactl's udev rules - #-rm -rf debian/alsa-utils/lib - -binary-indep: -binary-arch: build install - dh_testdir - dh_testroot - dh_installdirs - # We've moved the old initscript to /sbin, because now we have - # an upstart job to save the sound card state +# Kill *.la files, and make sure we install everything else +override_dh_install: + dh_install -Xusr/share/man/fr --fail-missing dh_installinit -n --name=alsa-store --upstart-only --no-start - dh_installinit -n --name=alsa-restore --upstart - dh_install - #install $(INSTALL_UAG) -m644 debian/udev.rules \ - # debian/alsa-utils/lib/udev/rules.d/80-alsa.rules - #install $(INSTALL_UAG) -m755 debian/udev.script \ - # debian/alsa-utils/lib/udev/alsa-utils - install $(CURDIR)/debian/alsa-utils/usr/bin/amixer $(CURDIR)/debian/alsa-utils-udeb/usr/bin/ - install $(CURDIR)/debian/alsa-utils/sbin/alsactl $(CURDIR)/debian/alsa-utils-udeb/sbin/ - install $(CURDIR)/debian/alsa-utils-udeb.start $(CURDIR)/debian/alsa-utils-udeb/lib/debian-installer-startup.d/S37alsa-utils-udeb - dh_link - dh_installdocs - dh_installman - cp debian/PATCHES.Debian \ - debian/alsa-utils/usr/share/doc/alsa-utils/ - cp debian/README.init.cs4236 \ - debian/alsa-utils/usr/share/doc/alsa-utils/ - install --mode=644 debian/90-alsa-ucm.rules \ - debian/alsa-utils/lib/udev/rules.d/ + dh_installinit -n --name=alsa-restore --upstart-only + +override_dh_installchangelogs: dh_installchangelogs debian/changelog.ALSA - dh_installmenu - dh_strip - dh_compress - dh_fixperms - dh_makeshlibs - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb -binary: binary-indep binary-arch -.PHONY: build clean binary binary-arch binary-indep install configure +override_dh_installinit: + DH_OPTIONS= dh_installinit --no-start -- start 50 S . stop 50 0 1 6 . diff -Nru alsa-utils-1.0.25/debian/S37alsa-utils-udeb alsa-utils-1.0.25/debian/S37alsa-utils-udeb --- alsa-utils-1.0.25/debian/S37alsa-utils-udeb 1970-01-01 00:00:00.000000000 +0000 +++ alsa-utils-1.0.25/debian/S37alsa-utils-udeb 2012-02-14 05:45:14.000000000 +0000 @@ -0,0 +1,7 @@ +#!/bin/sh + +. /usr/share/alsa/utils.sh + + +preinit_levels all +sanify_levels all diff -Nru alsa-utils-1.0.25/debian/utils.sh alsa-utils-1.0.25/debian/utils.sh --- alsa-utils-1.0.25/debian/utils.sh 2012-02-08 08:11:17.000000000 +0000 +++ alsa-utils-1.0.25/debian/utils.sh 2012-02-14 05:45:14.000000000 +0000 @@ -1,4 +1,4 @@ -#!/bin/sh +# Shell snippet. bugout() { echo "${MYNAME}: Programming error" >&2 ; exit 123 ; } diff -Nru alsa-utils-1.0.25/debian/watch alsa-utils-1.0.25/debian/watch --- alsa-utils-1.0.25/debian/watch 2012-02-08 08:11:17.000000000 +0000 +++ alsa-utils-1.0.25/debian/watch 2012-02-14 05:45:14.000000000 +0000 @@ -1,2 +1,2 @@ -version=2 -ftp://ftp.alsa-project.org/pub/utils/alsa-utils-(.*).tar.bz2 debian uupdate +version=3 +ftp://ftp.alsa-project.org/pub/utils/alsa-utils-(.*).tar.bz2