Merge lp:~bilalakhtar/gnome-media-player/manpageadded into lp:gnome-media-player/0.1

[Bilal Akhtar]

I have done the following changes in this branch:-
1) Added a man page
2) Fixed a bug in the Makefile, which would raise an error if the command "sudo make uninstall" is run. The error was that it would try to delete the UI directory twice, and an error would be raised when it would try to cd into the non-existent directory.

=== modified file 'Makefile.am'
--- Makefile.am	2010-03-08 13:28:21 +0000
+++ Makefile.am	2010-03-17 13:50:34 +0000
@@ -10,6 +10,8 @@
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
+man1_MANS = gnome-media-player.1
+
 gnome_media_playerdocdir = ${prefix}/doc/gnome-media-player
 gnome_media_playerdoc_DATA = \
 	README\

=== added file 'gnome-media-player.1'
--- gnome-media-player.1	1970-01-01 00:00:00 +0000
+++ gnome-media-player.1	2010-03-17 13:50:34 +0000
@@ -0,0 +1,31 @@
+.TH GNOME\-MEDIA\-PLAYER 1 "MARCH 2010" GNOME
+.SH NAME
+gnome\-media\-player \- A simple media player for GNOME that supports libvlc and xine-lib
+.SH SYNOPSIS
+.B gnome-media-player [--help] [--engine-type=
+.I engine
+.B ] [
+.I file
+.B ] ...
+.SH DESCRIPTION
+.B gnome-media-player
+is a simple media player for GNOME that supports using the VLC and Xine engines for playing audio and video files
+.SH OPTIONS
+.TP
+.I file
+Plays the file specified in
+.I file
+when the player starts.
+.TP
+.B \--help
+Shows the available options
+.TP
+.B \-e <engine> , --engine-type=<engine>
+Forces GNOME Media Player to use
+.I <engine>
+as its engine type. Valid options are
+.B vlc, vlc_ffmpeg and xine.
+The default option is Xine.
+.SH AUTHOR
+Bilal Akhtar <[e-mail]>
+

=== modified file 'ltmain.sh'
--- ltmain.sh	2010-03-08 13:28:21 +0000
+++ ltmain.sh	2010-03-17 13:50:34 +0000
@@ -1,6 +1,6 @@
 # Generated from ltmain.m4sh.
 
-# ltmain.sh (GNU libtool) 2.2.6b
+# ltmain.sh (GNU libtool) 2.2.6
 # Written by Gordon Matzigkeit <[e-mail]>, 1996
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
@@ -65,7 +65,7 @@
 #       compiler:		$LTCC
 #       compiler flags:		$LTCFLAGS
 #       linker:		$LD (gnu? $with_gnu_ld)
-#       $progname:		(GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu1
+#       $progname:		(GNU libtool) 2.2.6 Debian-2.2.6a-4
 #       automake:		$automake_version
 #       autoconf:		$autoconf_version
 #
@@ -73,9 +73,9 @@
 
 PROGRAM=ltmain.sh
 PACKAGE=libtool
-VERSION="2.2.6b Debian-2.2.6b-2ubuntu1"
+VERSION="2.2.6 Debian-2.2.6a-4"
 TIMESTAMP=""
-package_revision=1.3017
+package_revision=1.3012
 
 # Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2010-01-30 11:39:15 +0000
+++ src/Makefile.am	2010-03-17 13:50:34 +0000
@@ -37,7 +37,4 @@
 
 EXTRA_DIST = $(ui_DATA)
 
-# Remove ui directory on uninstall
-uninstall-local:
-	-rm -r $(uidir)
-	-rm -r $(datadir)/gnome-media-player
+

=== modified file 'src/Makefile.in'
--- src/Makefile.in	2010-03-08 13:28:21 +0000
+++ src/Makefile.in	2010-03-17 13:50:34 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -601,7 +601,7 @@
 
 ps-am:
 
-uninstall-am: uninstall-binPROGRAMS uninstall-local uninstall-uiDATA
+uninstall-am: uninstall-binPROGRAMS uninstall-uiDATA
 
 .MAKE: install-am install-strip
 
@@ -617,14 +617,8 @@
 	installdirs maintainer-clean maintainer-clean-generic \
 	mostlyclean mostlyclean-compile mostlyclean-generic \
 	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-binPROGRAMS uninstall-local \
-	uninstall-uiDATA
-
-
-# Remove ui directory on uninstall
-uninstall-local:
-	-rm -r $(uidir)
-	-rm -r $(datadir)/gnome-media-player
+	uninstall-am uninstall-binPROGRAMS uninstall-uiDATA
+
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.