← Back to branch summary

~ubuntu-branches/debian/squeeze/alsa-utils/squeeze

« back to all changes in this revision

Viewing changes to debian/patches/10_move_asound_state_to_var.dpatch

  • Committer: Bazaar Package Importer
  • Author(s): Jordi Mallach, Elimar Riesebieter
  • Date: 2008-06-25 10:14:09 UTC
  • mfrom: (1.2.7 upstream)
  • Revision ID: james.westby@ubuntu.com-20080625101409-uv0q00ftzk3tisex
Tags: 1.0.16-2
http://bugs.debian.org/476728
[ Elimar Riesebieter ]
Dropped udev recommendation (closes: 476728)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/10_move_asound_state_to_var.dpatch
1
 
#!/bin/sh -e
2
 
##
3
 
## 10_move_asound_state_to_var.dpatch by David B. Harris
4
 
##
5
 
## All lines beginning with `## DP:' are a description of the patch.
6
 
## DP: Move asound.state location to /var/lib/alsa/
7
 
 
8
 
if [ $# -lt 1 ]; then
9
 
    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
10
 
    exit 1
11
 
fi
12
 
 
13
 
[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
14
 
patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
15
 
 
16
 
case "$1" in
17
 
    -patch) patch -p1 ${patch_opts} < $0;;
18
 
    -unpatch) patch -R -p1 ${patch_opts} < $0;;
19
 
    *)
20
 
        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
21
 
        exit 1;;
22
 
esac
23
 
 
24
 
exit 0
25
 
 
26
 
@DPATCH@
27
 
diff -urNad alsa-utils-1.0.9a/alsaconf/alsaconf.in /tmp/foo/alsa-utils-1.0.9a/alsaconf/alsaconf.in
28
 
--- alsa-utils-1.0.9a/alsaconf/alsaconf.in      2005-03-24 09:24:52.000000000 +0100
29
 
+++ /tmp/foo/alsa-utils-1.0.9a/alsaconf/alsaconf.in     2005-06-03 16:01:48.000000000 +0200
30
 
@@ -936,8 +936,8 @@
31
 
          aplay -N $TESTSOUND
32
 
       fi
33
 
     fi
34
 
-    if [ ! -r /etc/asound.state ]; then
35
 
-       xecho "Saving the mixer setup used for this in /etc/asound.state."
36
 
+    if [ ! -r /var/lib/alsa/asound.state ]; then
37
 
+       xecho "Saving the mixer setup used for this in /var/lib/alsa/asound.state."
38
 
        $sbindir/alsactl store
39
 
     fi
40
 
     clear
41
 
diff -urNad alsa-utils-1.0.9a/alsactl/alsactl.c /tmp/foo/alsa-utils-1.0.9a/alsactl/alsactl.c
42
 
--- alsa-utils-1.0.9a/alsactl/alsactl.c 2005-06-03 16:02:46.000000000 +0200
43
 
+++ /tmp/foo/alsa-utils-1.0.9a/alsactl/alsactl.c        2005-06-03 16:02:14.000000000 +0200
44
 
@@ -30,7 +30,7 @@
45
 
 #include <alsa/asoundlib.h>
46
 
 #include "alsactl.h"
47
 
 
48
 
-#define SYS_ASOUNDRC "/etc/asound.state"
49
 
+#define SYS_ASOUNDRC "/var/lib/alsa/asound.state"
50
 
 #define SYS_ASOUNDNAMES "/etc/asound.names"
51
 
 
52
 
 int debugflag = 0;
53
 
diff -urNad alsa-utils-1.0.9a/alsactl/alsactl.1 /tmp/foo/alsa-utils-1.0.9a/alsactl/alsactl.1
54
 
--- alsa-utils-1.0.9a/alsactl/alsactl.1 2005-05-10 12:55:24.000000000 +0200
55
 
+++ /tmp/foo/alsa-utils-1.0.9a/alsactl/alsactl.1        2005-06-03 16:03:14.000000000 +0200
56
 
@@ -35,7 +35,7 @@
57
 
 
58
 
 .TP
59
 
 \fI\-f, \-\-file\fP
60
 
-Select the configuration file to use. The default is /etc/asound.state or
61
 
+Select the configuration file to use. The default is /var/lib/alsa/asound.state or
62
 
 /etc/asound.names (for the \fInames\fP command).
63
 
 
64
 
 .TP
65
 
@@ -52,7 +52,7 @@
66
 
 Print alsactl version number.
67
 
 
68
 
 .SH FILES
69
 
-\fI/etc/asound.state\fP (or whatever file you specify with the
70
 
+\fI/var/lib/alsa/asound.state\fP (or whatever file you specify with the
71
 
 \fB\-f\fP flag) is used to store current settings for your
72
 
 soundcards. The settings include all the usual soundcard mixer
73
 
 settings.  More importantly, alsactl is