Remove all references to the removed KDE files

diff --git a/configure.ac b/configure.ac
index 48547115bd8ccca41dc6f39cab0fb0c78cbe9167..e75973f662280765a454633eb1532676f0bd9176 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1382,13 +1382,11 @@ man/pulse-daemon.conf.5.xml
 man/pulse-client.conf.5.xml
 man/default.pa.5.xml
 man/pulse-cli-syntax.5.xml
-man/start-pulseaudio-kde.1.xml
 man/start-pulseaudio-x11.1.xml
 ])
 
 AC_CONFIG_FILES([src/esdcompat:src/daemon/esdcompat.in], [chmod +x src/esdcompat])
 AC_CONFIG_FILES([src/start-pulseaudio-x11:src/daemon/start-pulseaudio-x11.in], [chmod +x src/start-pulseaudio-x11])
-AC_CONFIG_FILES([src/start-pulseaudio-kde:src/daemon/start-pulseaudio-kde.in], [chmod +x src/start-pulseaudio-kde])
 AC_CONFIG_FILES([src/client.conf:src/pulse/client.conf.in])
 AC_CONFIG_FILES([src/daemon.conf:src/daemon/daemon.conf.in],
     [m4 src/daemon.conf > src/daemon.conf.gen && mv src/daemon.conf.gen src/daemon.conf])

diff --git a/man/Makefile.am b/man/Makefile.am
index d0cc8e71ff6536bd553e00b33958c3cd5295207b..d80ba6ad1d10209add6b50fc54c196108fd6b10a 100644 (file)
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -32,7 +32,6 @@ noinst_DATA = \
        pulse-client.conf.5.xml \
        default.pa.5.xml \
        pulse-cli-syntax.5.xml \
-       start-pulseaudio-kde.1.xml \
        start-pulseaudio-x11.1.xml
 
 xmllint: $(noinst_DATA)
@@ -56,7 +55,6 @@ dist_man_MANS = \
        pulse-client.conf.5 \
        default.pa.5 \
        pulse-cli-syntax.5 \
-       start-pulseaudio-kde.1 \
        start-pulseaudio-x11.1
 
 CLEANFILES = \
@@ -81,7 +79,6 @@ EXTRA_DIST = \
        pulse-client.conf.5.xml.in \
        default.pa.5.xml.in \
        pulse-cli-syntax.5.xml.in \
-       start-pulseaudio-kde.1.xml.in \
        start-pulseaudio-x11.1.xml.in \
        xmltoman \
        xmltoman.css \

diff --git a/man/start-pulseaudio-kde.1.xml.in b/man/start-pulseaudio-kde.1.xml.in
deleted file mode 100644 (file)
index ef32906..0000000
--- a/man/start-pulseaudio-kde.1.xml.in
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0"?><!--*-nxml-*-->
-<!DOCTYPE manpage SYSTEM "xmltoman.dtd">
-<?xml-stylesheet type="text/xsl" href="xmltoman.xsl" ?>
-
-<!--
-This file is part of PulseAudio.
-
-PulseAudio is free software; you can redistribute it and/or modify it
-under the terms of the GNU Lesser General Public License as
-published by the Free Software Foundation; either version 2.1 of the
-License, or (at your option) any later version.
-
-PulseAudio is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-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.
--->
-
-<manpage name="start-pulseaudio-kde" section="1" desc="PulseAudio Sound Server KDE Startup Script">
-
-  <synopsis>
-    <cmd>start-pulseaudio-kde [<arg>pulseaudio options</arg>]</cmd>
-  </synopsis>
-
-  <description>
-    <p>This script starts pulseaudio (if not already running) and loads
-    module-device-manager to use KDE routing policies.</p>
-
-    <p>All arguments are directly passed to pulseaudio.</p>
-  </description>
-
-  <section name="Authors">
-    <p>The PulseAudio Developers &lt;@PACKAGE_BUGREPORT@&gt;;
-    PulseAudio is available from <url href="@PACKAGE_URL@"/></p>
-  </section>
-
-  <section name="See also">
-    <p>
-      <manref name="pulseaudio" section="1"/>
-    </p>
-  </section>
-
-</manpage>

diff --git a/po/POTFILES.in b/po/POTFILES.in
index d06932f71f5d627f16bfc2bc848ea8f5ccb02f82..f39abaee7a00c55873f3c12f4f22a0e5cc765bed 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -6,7 +6,6 @@ src/daemon/dumpmodules.c
 src/daemon/ltdl-bind-now.c
 src/daemon/main.c
 src/daemon/pulseaudio.desktop.in
-src/daemon/pulseaudio-kde.desktop.in
 src/modules/alsa/alsa-mixer.c
 src/modules/alsa/alsa-sink.c
 src/modules/alsa/alsa-source.c

diff --git a/src/.gitignore b/src/.gitignore
index 80f6f2ce5ed03d3fbecb5556487e7008eb113cda..2f92b4411063cbb33d82d540d073eb5309df1724 100644 (file)
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -22,7 +22,6 @@ pasuspender
 pax11publish
 pulseaudio
 start-pulseaudio-x11
-start-pulseaudio-kde
 *-symdef.h
 *-orc-gen.[ch]
 # tests

diff --git a/src/Makefile.am b/src/Makefile.am
index 59f0bcdbb218e2876f608c621504cf29a2d54267..99d76ce4c11d422b9d92e2883fb52934fbeed150 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -116,8 +116,7 @@ endif
 
 if HAVE_X11
 xdgautostart_in_files = \
-               daemon/pulseaudio.desktop.in \
-               daemon/pulseaudio-kde.desktop.in
+               daemon/pulseaudio.desktop.in
 xdgautostart_DATA = $(xdgautostart_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 endif
@@ -190,7 +189,7 @@ endif
 
 if HAVE_X11
 bin_PROGRAMS += pax11publish
-bin_SCRIPTS += start-pulseaudio-x11 start-pulseaudio-kde
+bin_SCRIPTS += start-pulseaudio-x11
 endif
 
 pacat_SOURCES = utils/pacat.c
@@ -2104,8 +2103,8 @@ module_rygel_media_server_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
 #        Some minor stuff         #
 ###################################
 
-CLEANFILES += daemon/pulseaudio.desktop daemon/pulseaudio-kde.desktop
-DISTCLEANFILES = esdcompat client.conf default.pa system.pa daemon.conf start-pulseaudio-x11 start-pulseaudio-kde
+CLEANFILES += daemon/pulseaudio.desktop
+DISTCLEANFILES = esdcompat client.conf default.pa system.pa daemon.conf start-pulseaudio-x11
 
 if OS_IS_WIN32
 SYMLINK_PROGRAM=cd $(DESTDIR)$(bindir) && cp

diff --git a/src/daemon/.gitignore b/src/daemon/.gitignore
index 54e4299bbf023ac2f19944a5f0ee613a8c6e6a0e..0efa55ba8e94c90c3e893d3e1e790285c639d96c 100644 (file)
--- a/src/daemon/.gitignore
+++ b/src/daemon/.gitignore
@@ -1,3 +1,2 @@
 org.pulseaudio.policy
 pulseaudio.desktop
-pulseaudio-kde.desktop