← Back to branch summary

~ubuntu-branches/ubuntu/trusty/alsa-utils/trusty

« back to all changes in this revision

Viewing changes to debian/patches/vmware_audio_volume.patch

  • Committer: Package Import Robot
  • Author(s): Luke Yelavich
  • Date: 2014-01-17 15:08:13 UTC
  • mfrom: (1.2.18) (94.1.2 trusty-proposed)
  • Revision ID: package-import@ubuntu.com-20140117150813-v2rqw7ynuhs4m60a
Tags: 1.0.27.2-1ubuntu2
https://launchpad.net/bugs/1269731
* Forgot to add an env declaration for an environment variable to the
  upstart files. (LP: #1269731)
* debian/patches/work_around_ncurses_weirdness.patch:
  - Work around some ncurses pkg-config changes for now, not sure if ncurses
    upstream intended the include dir changes, or whether its a bug. Fixes
    FTBFs.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/vmware_audio_volume.patch
1
 
Index: alsa-utils-1.0.27/alsactl/init/Makefile.am
 
1
Index: alsa-utils-1.0.27.2/alsactl/init/Makefile.am
2
2
===================================================================
3
 
--- alsa-utils-1.0.27.orig/alsactl/init/Makefile.am     2013-04-30 15:45:55.548984877 +1000
4
 
+++ alsa-utils-1.0.27/alsactl/init/Makefile.am  2013-04-30 15:45:55.544984877 +1000
 
3
--- alsa-utils-1.0.27.2.orig/alsactl/init/Makefile.am   2013-10-25 10:13:15.072144276 +1100
 
4
+++ alsa-utils-1.0.27.2/alsactl/init/Makefile.am        2013-10-25 10:13:28.656144623 +1100
5
5
@@ -1,7 +1,7 @@
6
6
 
7
7
 init_files = \
8
8
        00main default help info test \
9
 
-       hda
10
 
+       hda ens1371
 
9
-       hda ca0106
 
10
+       hda ca0106 ens1371
11
11
 EXTRA_DIST = $(init_files)
12
12
 alsainitdir = $(datadir)/alsa/init
13
13
 alsainit_DATA = $(init_files)
14
 
Index: alsa-utils-1.0.27/alsactl/init/Makefile.in
 
14
Index: alsa-utils-1.0.27.2/alsactl/init/Makefile.in
15
15
===================================================================
16
 
--- alsa-utils-1.0.27.orig/alsactl/init/Makefile.in     2013-04-30 15:45:55.548984877 +1000
17
 
+++ alsa-utils-1.0.27/alsactl/init/Makefile.in  2013-04-30 15:45:55.544984877 +1000
18
 
@@ -243,7 +243,7 @@
 
16
--- alsa-utils-1.0.27.2.orig/alsactl/init/Makefile.in   2013-10-25 10:13:15.072144276 +1100
 
17
+++ alsa-utils-1.0.27.2/alsactl/init/Makefile.in        2013-10-25 10:13:40.360144923 +1100
 
18
@@ -244,7 +244,7 @@
19
19
 xmlto = @xmlto@
20
20
 init_files = \
21
21
        00main default help info test \
22
 
-       hda
23
 
+       hda ens1371
 
22
-       hda ca0106
 
23
+       hda ca0106 ens1371
24
24
 
25
25
 EXTRA_DIST = $(init_files)
26
26
 alsainitdir = $(datadir)/alsa/init
27
 
Index: alsa-utils-1.0.27/alsactl/init/00main
 
27
Index: alsa-utils-1.0.27.2/alsactl/init/00main
28
28
===================================================================
29
 
--- alsa-utils-1.0.27.orig/alsactl/init/00main  2013-04-30 15:45:55.548984877 +1000
30
 
+++ alsa-utils-1.0.27/alsactl/init/00main       2013-04-30 15:45:55.544984877 +1000
 
29
--- alsa-utils-1.0.27.2.orig/alsactl/init/00main        2013-10-25 10:13:15.072144276 +1100
 
30
+++ alsa-utils-1.0.27.2/alsactl/init/00main     2013-10-25 10:13:15.064144275 +1100
31
31
@@ -32,6 +32,7 @@
32
32
 # real ALSA configuration database
33
33
 CARDINFO{driver}=="HDA-Intel", INCLUDE="hda", GOTO="init_end"
36
36
 CARDINFO{driver}=="Test", INCLUDE="test", GOTO="init_end"
37
37
 
38
38
 LABEL="init_end"
39
 
Index: alsa-utils-1.0.27/alsactl/init/ens1371
 
39
Index: alsa-utils-1.0.27.2/alsactl/init/ens1371
40
40
===================================================================
41
41
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
42
 
+++ alsa-utils-1.0.27/alsactl/init/ens1371      2013-04-30 15:45:55.544984877 +1000
 
42
+++ alsa-utils-1.0.27.2/alsactl/init/ens1371    2013-10-25 10:13:15.064144275 +1100
43
43
@@ -0,0 +1,15 @@
44
44
+# Configuration for ensoniq based cards
45
45
+