Ubuntu
pulseaudio package

Merge lp:~ubuntu-branches/ubuntu/lucid/pulseaudio/lucid-201002221140 into lp:ubuntu/lucid/pulseaudio

  1. Lucid (10.04)
  2. lucid-201002221140
  3. Merge into lucid
Proposed by James Westby
Status: Needs review
Proposed branch: lp:~ubuntu-branches/ubuntu/lucid/pulseaudio/lucid-201002221140
Merge into: lp:ubuntu/lucid/pulseaudio
Diff against target: 146 lines (+125/-0) (has conflicts)
2 files modified
debian/changelog (+10/-0)
debian/patches/0094-add-missing-mixer-paths-and-rerun-automake.patch (+115/-0)
Text conflict in debian/changelog
Conflict adding file debian/patches/0094-add-missing-mixer-paths-and-rerun-automake.patch.  Moved existing file to debian/patches/0094-add-missing-mixer-paths-and-rerun-automake.patch.moved.
To merge this branch: bzr merge lp:~ubuntu-branches/ubuntu/lucid/pulseaudio/lucid-201002221140
To post a comment you must log in.
Revision history for this message
James Westby (james-w) wrote :

The package history in the archive and the history in the bzr branch differ. As the archive is authoritative the history of lp:ubuntu/lucid/pulseaudio now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/lucid/pulseaudio/lucid-201002221140. A merge should be performed if necessary.

Reply

Unmerged revisions

116. By Daniel T Chen

0094-add-missing-mixer-paths-and-rerun-automake.patch: Fix missing paths
elements that broke volume control.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2010-02-21 22:37:37 +0000
3+++ debian/changelog 2010-02-22 11:43:17 +0000
4@@ -1,3 +1,4 @@
5+<<<<<<< TREE
6 pulseaudio (1:0.9.22~0.9.21+stable-queue-32-g8478-0ubuntu10) lucid; urgency=low
7
8 * 0093-backport-fixes-stable-queue-head.patch: Backport the following
9@@ -28,6 +29,15 @@
10
11 -- Daniel T Chen <crimsun@ubuntu.com> Thu, 18 Feb 2010 23:56:42 -0500
12
13+=======
14+pulseaudio (1:0.9.22~0.9.21+stable-queue-32-g8478-0ubuntu9) lucid; urgency=low
15+
16+ * 0094-add-missing-mixer-paths-and-rerun-automake.patch: Fix missing paths
17+ elements that broke volume control.
18+
19+ -- Daniel T Chen <crimsun@ubuntu.com> Thu, 18 Feb 2010 23:56:42 -0500
20+
21+>>>>>>> MERGE-SOURCE
22 pulseaudio (1:0.9.22~0.9.21+stable-queue-32-g8478-0ubuntu8) lucid; urgency=low
23
24 * Back out 307bd1 until we can roll a new tarball. Applying it to the
25
26=== added file 'debian/patches/0094-add-missing-mixer-paths-and-rerun-automake.patch'
27--- debian/patches/0094-add-missing-mixer-paths-and-rerun-automake.patch 1970-01-01 00:00:00 +0000
28+++ debian/patches/0094-add-missing-mixer-paths-and-rerun-automake.patch 2010-02-22 11:43:17 +0000
29@@ -0,0 +1,115 @@
30+Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/Makefile.am
31+===================================================================
32+--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/Makefile.am 2010-02-18 22:47:49.000000000 -0500
33++++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/Makefile.am 2010-02-18 23:28:42.000000000 -0500
34+@@ -109,6 +109,7 @@
35+
36+ ALSA_PROFILES = \
37+ modules/alsa/mixer/profile-sets/default.conf \
38++ modules/alsa/mixer/profile-sets/maudio-fasttrack-pro.conf \
39+ modules/alsa/mixer/profile-sets/native-instruments-audio4dj.conf \
40+ modules/alsa/mixer/profile-sets/native-instruments-audio8dj.conf
41+
42+@@ -117,6 +118,7 @@
43+ modules/alsa/mixer/paths/analog-input.conf \
44+ modules/alsa/mixer/paths/analog-input.conf.common \
45+ modules/alsa/mixer/paths/analog-input-fm.conf \
46++ modules/alsa/mixer/paths/analog-input-internal-mic.conf \
47+ modules/alsa/mixer/paths/analog-input-linein.conf \
48+ modules/alsa/mixer/paths/analog-input-mic.conf \
49+ modules/alsa/mixer/paths/analog-input-mic.conf.common \
50+@@ -126,6 +128,7 @@
51+ modules/alsa/mixer/paths/analog-output.conf \
52+ modules/alsa/mixer/paths/analog-output-speaker.conf \
53+ modules/alsa/mixer/paths/analog-output.conf.common \
54++ modules/alsa/mixer/paths/analog-output-desktop-speaker.conf \
55+ modules/alsa/mixer/paths/analog-output-headphones.conf \
56+ modules/alsa/mixer/paths/analog-output-headphones-2.conf \
57+ modules/alsa/mixer/paths/analog-output-lfe-on-mono.conf \
58+Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/Makefile.in
59+===================================================================
60+--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/Makefile.in 2010-02-18 22:47:49.000000000 -0500
61++++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/Makefile.in 2010-02-18 23:28:42.000000000 -0500
62+@@ -1,4 +1,4 @@
63+-# Makefile.in generated by automake 1.11 from Makefile.am.
64++# Makefile.in generated by automake 1.11.1 from Makefile.am.
65+ # @configure_input@
66+
67+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
68+@@ -290,16 +290,7 @@
69+ DIST_COMMON = $(am__pulseinclude_HEADERS_DIST) $(srcdir)/Makefile.am \
70+ $(srcdir)/Makefile.in
71+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
72+-am__aclocal_m4_deps = $(top_srcdir)/m4/acx_libwrap.m4 \
73+- $(top_srcdir)/m4/acx_lirc.m4 $(top_srcdir)/m4/acx_pthread.m4 \
74+- $(top_srcdir)/m4/attributes.m4 \
75+- $(top_srcdir)/m4/check_define.m4 $(top_srcdir)/m4/iconv.m4 \
76+- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/lib-ld.m4 \
77+- $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
78+- $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
79+- $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
80+- $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
81+- $(top_srcdir)/m4/tls.m4 $(top_srcdir)/configure.ac
82++am__aclocal_m4_deps = $(top_srcdir)/configure.ac
83+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
84+ $(ACLOCAL_M4)
85+ mkinstalldirs = $(install_sh) -d
86+@@ -336,7 +327,7 @@
87+ LTLIBRARIES = $(lib_LTLIBRARIES) $(modlibexec_LTLIBRARIES) \
88+ $(noinst_LTLIBRARIES)
89+ am__DEPENDENCIES_1 =
90+-am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
91++am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
92+ @HAVE_HAL_TRUE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1)
93+ @HAVE_UDEV_TRUE@am__DEPENDENCIES_4 = $(am__DEPENDENCIES_1)
94+ @HAVE_DBUS_TRUE@am__DEPENDENCIES_5 = $(am__DEPENDENCIES_1)
95+@@ -2369,7 +2360,6 @@
96+ JACK_LIBS = @JACK_LIBS@
97+ LD = @LD@
98+ LDFLAGS = @LDFLAGS@
99+-LDFLAGS_NOUNDEFINED = @LDFLAGS_NOUNDEFINED@
100+ LIBASYNCNS_CFLAGS = @LIBASYNCNS_CFLAGS@
101+ LIBASYNCNS_LIBS = @LIBASYNCNS_LIBS@
102+ LIBICONV = @LIBICONV@
103+@@ -2437,9 +2427,6 @@
104+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
105+ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
106+ PREOPEN_MODS = @PREOPEN_MODS@
107+-PTHREAD_CC = @PTHREAD_CC@
108+-PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
109+-PTHREAD_LIBS = @PTHREAD_LIBS@
110+ RANLIB = @RANLIB@
111+ SED = @SED@
112+ SET_MAKE = @SET_MAKE@
113+@@ -2461,7 +2448,6 @@
114+ abs_top_srcdir = @abs_top_srcdir@
115+ ac_ct_CC = @ac_ct_CC@
116+ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
117+-acx_pthread_config = @acx_pthread_config@
118+ am__include = @am__include@
119+ am__leading_dot = @am__leading_dot@
120+ am__quote = @am__quote@
121+@@ -2581,6 +2567,7 @@
122+ ###################################
123+ ALSA_PROFILES = \
124+ modules/alsa/mixer/profile-sets/default.conf \
125++ modules/alsa/mixer/profile-sets/maudio-fasttrack-pro.conf \
126+ modules/alsa/mixer/profile-sets/native-instruments-audio4dj.conf \
127+ modules/alsa/mixer/profile-sets/native-instruments-audio8dj.conf
128+
129+@@ -2589,6 +2576,7 @@
130+ modules/alsa/mixer/paths/analog-input.conf \
131+ modules/alsa/mixer/paths/analog-input.conf.common \
132+ modules/alsa/mixer/paths/analog-input-fm.conf \
133++ modules/alsa/mixer/paths/analog-input-internal-mic.conf \
134+ modules/alsa/mixer/paths/analog-input-linein.conf \
135+ modules/alsa/mixer/paths/analog-input-mic.conf \
136+ modules/alsa/mixer/paths/analog-input-mic.conf.common \
137+@@ -2598,6 +2586,7 @@
138+ modules/alsa/mixer/paths/analog-output.conf \
139+ modules/alsa/mixer/paths/analog-output-speaker.conf \
140+ modules/alsa/mixer/paths/analog-output.conf.common \
141++ modules/alsa/mixer/paths/analog-output-desktop-speaker.conf \
142+ modules/alsa/mixer/paths/analog-output-headphones.conf \
143+ modules/alsa/mixer/paths/analog-output-headphones-2.conf \
144+ modules/alsa/mixer/paths/analog-output-lfe-on-mono.conf \
145
146=== renamed file 'debian/patches/0094-add-missing-mixer-paths-and-rerun-automake.patch' => 'debian/patches/0094-add-missing-mixer-paths-and-rerun-automake.patch.moved'

Subscribers

People subscribed via source and target branches

to all changes: