Imported Upstream version 2.5.0

3 files changed, 17 insertions, 28 deletions

diff --git a/man/Makefile b/man/Makefile
index c06cade..1c5b754 100644
--- a/man/Makefile
+++ b/man/Makefile
@@ -1,16 +1,5 @@
-MAN = audacious2.1 audtool2.1
+MAN = audacious.1 audtool.1
 
-DISTCLEAN = audacious2.1 audtool2.1
+DISTCLEAN = audacious.1 audtool.1
 
 include ../buildsys.mk
-
-install-extra:
-	${MKDIR_P} "${DESTDIR}${mandir}/${mansubdir}"
-	if test -h "${DESTDIR}${mandir}/${mansubdir}/audacious.1" ; then ${RM} "${DESTDIR}${mandir}/${mansubdir}/audacious.1" ; fi
-	${LN_S} audacious2.1 "${DESTDIR}${mandir}/${mansubdir}/audacious.1"
-	if test -h "${DESTDIR}${mandir}/${mansubdir}/audtool.1" ; then ${RM} "${DESTDIR}${mandir}/${mansubdir}/audtool.1" ; fi
-	${LN_S} audtool2.1 "${DESTDIR}${mandir}/${mansubdir}/audtool.1"
-
-uninstall-extra:
-	if test -h "${DESTDIR}${mandir}/${mansubdir}/audacious.1" ; then ${RM} "${DESTDIR}${mandir}/${mansubdir}/audacious.1" ; fi
-	if test -h "${DESTDIR}${mandir}/${mansubdir}/audtool.1" ; then ${RM} "${DESTDIR}${mandir}/${mansubdir}/audtool.1" ; fi
diff --git a/man/audacious2.1.in b/man/audacious.1.in
index 72e1c2b..167d8f0 100644
--- a/man/audacious2.1.in
+++ b/man/audacious.1.in
@@ -1,10 +1,10 @@
-.TH AUDACIOUS2 "1" "April 2009" "Version @PACKAGE_VERSION@" "Audacious"
+.TH AUDACIOUS "1" "April 2009" "Version @PACKAGE_VERSION@" "Audacious"
 
 .SH NAME
-audacious2 \- an advanced audio player.
+audacious \- an advanced audio player.
 
 .SH SYNOPSIS
-.B audacious2
+.B audacious
 [OPTION] ... [FILE] ...
 
 .SH DESCRIPTION
@@ -232,7 +232,7 @@ unpacking gzip and bzip2 compressed skins.  Default is \fItar\fP.
 Command for decompressing zip files (skins).  Default is \fIunzip\fP.
 
 .SH "SEE ALSO"
-.BR audtool2 (1)
+.BR audtool (1)
 
 .SH WEBSITE
 .I http://audacious-media-player.org
diff --git a/man/audtool2.1.in b/man/audtool.1.in
index 2c59195..71cff5e 100644
--- a/man/audtool2.1.in
+++ b/man/audtool.1.in
@@ -1,12 +1,12 @@
-.TH AUDTOOL2 "1" "April 2009" "Version @VERSION@"
+.TH AUDTOOL "1" "April 2009" "Version @VERSION@"
 .SH NAME
-.B audtool2
+.B audtool
 - a small tool to modify behavior of a running audacious2 instance.
 .SH SYNOPSIS
-.B audtool2
+.B audtool
 [\-\-[[handler [parameters]] [...]
 .SH DESCRIPTION
-.B audtool2
+.B audtool
 is designed to send commands to a running audacious.
 .PP
 It can handle various things like jumping to the next track in playlist
@@ -259,15 +259,15 @@ Shows handlers list.
 .PP
 Handlers may be prefixed with `\-\-' (GNU\-style long\-options) or not, your choice.
 .SH BUGS
-There are no known bugs in audtool2 at this time; if you find any please
+There are no known bugs in audtool at this time; if you find any please
 report them on www.atheme.org in the Audacious issue tracker.
 .SH AUTHORS
-.B audtool2
-was written by George Averill <nhjm@nhjm.net> and William 
+.B audtool
+was written by George Averill <nhjm@nhjm.net> and William
 Pitcock <nenolod@atheme.org>.
 .PP
-This manual page was written by Adam Cecile <gandalf@le-vert.net> and 
-Kiyoshi Aman <kiyoshi@atheme.org>. Some additional tweaks were done by 
+This manual page was written by Adam Cecile <gandalf@le-vert.net> and
+Kiyoshi Aman <kiyoshi@atheme.org>. Some additional tweaks were done by
 William Pitcock <nenolod@atheme.org> and Tony Vroon <chainsaw@gentoo.org>.
 .PP
 Permission is granted to copy, distribute and/or modify this document
@@ -275,10 +275,10 @@ under the terms of the GNU General Public License, Version 2 or any
 later version published by the Free Software Foundation.
 .PP
 The complete text of the GNU General Public License is available in the
-sourcecode of Audacious, and is typically included with binary packages 
+sourcecode of Audacious, and is typically included with binary packages
 as well.
 .PP
-If installed with an operating system, see your Operating System's 
+If installed with an operating system, see your Operating System's
 documentation for licensing details.
 
 .SH "SEE ALSO"