Commit 516e8925 authored by Luke Yelavich's avatar Luke Yelavich

Merge tag 'upstream/5.99.3' into debian/experimental

Upstream version 5.99.3

Conflicts:
	.tarball-version
	.version
	configure
	po/zh_TW.po
	src/pulsecore/memblock.c
parents b5b3bb67 9a1fd064
......@@ -11,9 +11,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with PulseAudio; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
# USA.
# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
ACLOCAL_AMFLAGS = -I m4
......
......@@ -27,9 +27,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with PulseAudio; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
# USA.
# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
VPATH = @srcdir@
am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
......
......@@ -13,8 +13,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with PulseAudio; if not, write to the Free Software Foundation,
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
case $(uname) in
*Darwin*)
......
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for pulseaudio 5.99.2.
# Generated by GNU Autoconf 2.69 for pulseaudio 5.99.3.
#
# Report bugs to <pulseaudio-discuss (at) lists (dot) freedesktop (dot) org>.
#
......@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='pulseaudio'
PACKAGE_TARNAME='pulseaudio'
PACKAGE_VERSION='5.99.2'
PACKAGE_STRING='pulseaudio 5.99.2'
PACKAGE_VERSION='5.99.3'
PACKAGE_STRING='pulseaudio 5.99.3'
PACKAGE_BUGREPORT='pulseaudio-discuss (at) lists (dot) freedesktop (dot) org'
PACKAGE_URL='http://pulseaudio.org/'
......@@ -1733,7 +1733,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures pulseaudio 5.99.2 to adapt to many kinds of systems.
\`configure' configures pulseaudio 5.99.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
......@@ -1803,7 +1803,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of pulseaudio 5.99.2:";;
short | recursive ) echo "Configuration of pulseaudio 5.99.3:";;
esac
cat <<\_ACEOF
......@@ -1833,7 +1833,7 @@ Optional Features:
--disable-largefile omit support for large files
--disable-x11 Disable optional X11 support
--disable-tests Disable unit tests
--disable-samplerate Disable optional libsamplerate support
--enable-samplerate Enable optional libsamplerate support (DEPRECATED)
--disable-oss-output Disable optional OSS output support
--disable-oss-wrapper Disable optional OSS wrapper support
--disable-coreaudio-output
......@@ -2098,7 +2098,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
pulseaudio configure 5.99.2
pulseaudio configure 5.99.3
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
......@@ -2688,7 +2688,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by pulseaudio $as_me 5.99.2, which was
It was created by pulseaudio $as_me 5.99.3, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
......@@ -3640,7 +3640,7 @@ fi
# Define the identity of the package.
PACKAGE='pulseaudio'
VERSION='5.99.2'
VERSION='5.99.3'
cat >>confdefs.h <<_ACEOF
......@@ -24287,7 +24287,7 @@ if test "${enable_samplerate+set}" = set; then :
fi
if test "x$enable_samplerate" != "xno"; then :
if test "x$enable_samplerate" = "xyes"; then :
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBSAMPLERATE" >&5
......@@ -28693,7 +28693,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by pulseaudio $as_me 5.99.2, which was
This file was extended by pulseaudio $as_me 5.99.3, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
......@@ -28760,7 +28760,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
pulseaudio config.status 5.99.2
pulseaudio config.status 5.99.3
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
......
......@@ -17,8 +17,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with PulseAudio; if not, write to the Free Software Foundation,
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
AC_PREREQ(2.63)
......@@ -673,9 +672,9 @@ fi
#### Libsamplerate support (optional) ####
AC_ARG_ENABLE([samplerate],
AS_HELP_STRING([--disable-samplerate],[Disable optional libsamplerate support]))
AS_HELP_STRING([--enable-samplerate],[Enable optional libsamplerate support (DEPRECATED)]))
AS_IF([test "x$enable_samplerate" != "xno"],
AS_IF([test "x$enable_samplerate" = "xyes"],
[PKG_CHECK_MODULES(LIBSAMPLERATE, [ samplerate >= 0.1.0 ], HAVE_LIBSAMPLERATE=1, HAVE_LIBSAMPLERATE=0)],
HAVE_LIBSAMPLERATE=0)
......
......@@ -11,9 +11,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with PulseAudio; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
# USA.
# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
doxygen: doxygen.conf
doxygen $<
......
......@@ -27,9 +27,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with PulseAudio; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
# USA.
# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
VPATH = @srcdir@
am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
am__make_running_with_option = \
......
......@@ -15,9 +15,7 @@ scriptversion=2012-09-25.20
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
# 02110-1301, USA.
# along with this program; if not, see <http://www.gnu.org/licenses/>.
# This script is derived from GIT-VERSION-GEN from GIT: http://git.or.cz/.
# It may be run two ways:
......
......@@ -11,9 +11,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with PulseAudio; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
# USA.
# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
DISTCLEANFILES = \
$(noinst_DATA)
......
......@@ -27,9 +27,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with PulseAudio; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
# USA.
# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
VPATH = @srcdir@
am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
......
......@@ -16,9 +16,7 @@ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
USA.
License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
-->
<manpage name="default.pa" section="5" desc="PulseAudio Sound Server Startup Script">
......
......@@ -16,9 +16,7 @@ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
USA.
License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
-->
<manpage name="esdcompat" section="1" desc="PulseAudio ESD wrapper script">
......
......@@ -16,9 +16,7 @@ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
USA.
License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
-->
<manpage name="pacat" section="1" desc="Play back or record raw or encoded audio streams on a PulseAudio sound server">
......
......@@ -16,9 +16,7 @@ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
USA.
License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
-->
<manpage name="pacmd" section="1" desc="Reconfigure a PulseAudio sound server during runtime">
......
......@@ -16,9 +16,7 @@ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
USA.
License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
-->
<manpage name="pactl" section="1" desc="Control a running PulseAudio sound server">
......
......@@ -16,9 +16,7 @@ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
USA.
License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
-->
<manpage name="padsp" section="1" desc="PulseAudio OSS Wrapper">
......
......@@ -16,9 +16,7 @@ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
USA.
License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
-->
<manpage name="paplay" section="1" desc="Play back audio files on a PulseAudio sound server">
......
......@@ -16,9 +16,7 @@ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
USA.
License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
-->
<manpage name="pasuspender" section="1" desc="Temporarily suspend PulseAudio">
......
......@@ -16,9 +16,7 @@ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
USA.
License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
-->
<manpage name="pax11publish" section="1" desc="PulseAudio X11 Credential Utility">
......
......@@ -16,9 +16,7 @@ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
USA.
License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
-->
<manpage name="pulse-cli-syntax" section="5" desc="PulseAudio Command Line Interface Syntax">
......
......@@ -16,9 +16,7 @@ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
USA.
License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
-->
<manpage name="pulse-client.conf" section="5" desc="PulseAudio client configuration file">
......
......@@ -16,9 +16,7 @@ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
USA.
License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
-->
<manpage name="pulse-daemon.conf" section="5" desc="PulseAudio daemon configuration file">
......
......@@ -16,9 +16,7 @@ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
USA.
License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
-->
<manpage name="pulseaudio" section="1" desc="The PulseAudio Sound System">
......
......@@ -16,9 +16,7 @@ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
USA.
License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
-->
<manpage name="start-pulseaudio-x11" section="1" desc="PulseAudio Sound Server X11 Startup Script">
......
......@@ -15,8 +15,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# along with this program; if not, see <http://www.gnu.org/licenses/>.
use XML::Parser;
......
......@@ -12,8 +12,7 @@
for more details.
You should have received a copy of the GNU General Public License
along with PulseAudio; if not, write to the Free Software Foundation,
Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
***/
body { color: black; background-color: white; }
......
......@@ -12,8 +12,7 @@
for more details.
You should have received a copy of the GNU General Public License
along with PulseAudio; if not, write to the Free Software Foundation,
Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
-->
<!ELEMENT manpage (synopsis | description | section | options | seealso)*>
......
......@@ -15,8 +15,7 @@
for more details.
You should have received a copy of the GNU General Public License
along with PulseAudio; if not, write to the Free Software Foundation,
Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
-->
<xsl:output method="xml" version="1.0" encoding="iso-8859-15" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" indent="yes"/>
......
......@@ -31,6 +31,7 @@ sr
sv
ta
te
tr
uk
zh_CN
zh_TW
......@@ -397,13 +397,14 @@ msgid ""
"shouldn't be doing that.\n"
"If you do it nonetheless then it's your own fault if things don't work as "
"expected.\n"
"Please read http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode for an "
"explanation why system mode is usually a bad idea."
"Please read http://www.freedesktop.org/wiki/Software/PulseAudio/"
"Documentation/User/WhatIsWrongWithSystemWide/ for an explanation why system "
"mode is usually a bad idea."
msgstr ""
"আপনি সিস্টেম মোডে PA সঞ্চালিত কৰছেন এবং এটি না কৰাই বাঞ্ছনীয়।\n"
"এৰ ফলে প্ৰত্যাশামত ফলাফল না পাওয়াৰ সম্ভাবনা ৰয়েছে।\n"
"সিস্টেম মোডে ব্যৱহাৰেৰ সমস্যা সম্পৰ্কে জানতে হলে http://pulseaudio.org/wiki/"
"WhatIsWrongWithSystemMode দেখুন।"
"সিস্টেম মোডে ব্যৱহাৰেৰ সমস্যা সম্পৰ্কে জানতে হলে http://www.freedesktop.org/wiki/"
"Software/PulseAudio/Documentation/User/WhatIsWrongWithSystemWide/ দেখুন।"
#: ../src/daemon/main.c:981
msgid "pa_pid_file_create() failed."
......
......@@ -401,13 +401,14 @@ msgid ""
"shouldn't be doing that.\n"
"If you do it nonetheless then it's your own fault if things don't work as "
"expected.\n"
"Please read http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode for an "
"explanation why system mode is usually a bad idea."
"Please read http://www.freedesktop.org/wiki/Software/PulseAudio/"