This is an automated email from the git hooks/post-receive script. fsateler pushed a commit to branch master in repository pulseaudio.
commit 76726a096b39bf914e8ac37a8b21bf586365b715 Author: Felipe Sateler <fsate...@debian.org> Date: Thu Jul 3 10:16:19 2014 -0400 Revert "Add udev rule for Asus P5K-SE motherboard" Upstream does not think this is the correct fix This reverts commit c612a6276d8ac92390f083a27a2bfea64bda08e9. Conflicts: debian/patches/series --- debian/changelog | 1 - debian/patches/asus-P5K-SE-udev-rules.patch | 15 --------------- debian/patches/series | 1 - 3 files changed, 17 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0ca2c13..9e4c04b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,6 @@ pulseaudio (5.0-3) UNRELEASED; urgency=medium [ Felipe Sateler ] * Drop workaround for ARM < v6, upstream now conditionally compiles it. - * Add udev rule for Asus P5K-SE motherboard. Closes: #744831 * Drop special patches rule, not used anymore * debian/patches/0003-exit-with-X-session.patch - Kill pulseaudio on session exit with kde too diff --git a/debian/patches/asus-P5K-SE-udev-rules.patch b/debian/patches/asus-P5K-SE-udev-rules.patch deleted file mode 100644 index d2d4ab4..0000000 --- a/debian/patches/asus-P5K-SE-udev-rules.patch +++ /dev/null @@ -1,15 +0,0 @@ -Description: Add support for Asus P5K-SE motherboard -Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=744831#5 -Bug-Debian: http://bugs.debian.org/744831 -Forwarded: https://bugs.freedesktop.org/show_bug.cgi?id=77487 ---- a/src/modules/alsa/mixer/profile-sets/90-pulseaudio.rules -+++ b/src/modules/alsa/mixer/profile-sets/90-pulseaudio.rules -@@ -75,6 +75,8 @@ ATTRS{subsystem_vendor}=="0x1028", ATTRS - ATTRS{subsystem_vendor}=="0x1043", ATTRS{subsystem_device}=="0x831a", ENV{PULSE_PROFILE_SET}="force-speaker-and-int-mic.conf" - # Asus T101MT - ATTRS{subsystem_vendor}=="0x1043", ATTRS{subsystem_device}=="0x83ce", ENV{PULSE_PROFILE_SET}="force-speaker-and-int-mic.conf" -+# Asus P5K-SE -+ATTRS{subsystem_vendor}=="0x1043", ATTRS{subsystem_device}=="0x829f", ENV{PULSE_PROFILE_SET}="force-speaker-and-int-mic.conf" - # Sony Vaio VGN-SR21M - ATTRS{subsystem_vendor}=="0x104d", ATTRS{subsystem_device}=="0x9033", ENV{PULSE_PROFILE_SET}="force-speaker-and-int-mic.conf" - # Sony Vaio VPC-W115XG diff --git a/debian/patches/series b/debian/patches/series index e1ee714..4d371e1 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,6 +3,5 @@ 0003-exit-with-X-session.patch 0004-dont-start-when-already-running.patch kfreebsd_no_lock_and_threads_synchro.patch -asus-P5K-SE-udev-rules.patch only-autostart-kde-version.patch rtp-recv-fix-crash-on-empty-UDP-packets-CVE-2014-397.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-pulseaudio/pulseaudio.git _______________________________________________ pkg-pulseaudio-devel mailing list pkg-pulseaudio-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-pulseaudio-devel