[SCM] VLC media player packaging branch, experimental, updated. debian/0.9.9a-1-36-g4dae45f

[xtophe-guest at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 610ea1fc357c3d5858ec32ac1e414845d8b49a45
Author: Christophe Mutricy <xtophe at videolan.org>
Date:   Wed May 13 12:50:12 2009 +0200

    Use vlc-wrapper manpage from upstream

diff --git a/debian/rules b/debian/rules
index 7ea121c..5b47920 100755
--- a/debian/rules
+++ b/debian/rules
@@ -184,6 +184,7 @@ endif
 	rm -f debian/tmp/usr/share/vlc/skins2/fonts/FreeSansBold.ttf
 	ln -s /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf debian/tmp/usr/share/vlc/skins2/fonts/FreeSans.ttf
 	ln -s /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf debian/tmp/usr/share/vlc/skins2/fonts/FreeSansBold.ttf
+	rm -rf debian/tmp/usr/share/man/man1
 	# Move stuff around
 	mkdir -p debian/tmp/$(PIXDIR)
 	mv debian/tmp/$(VIDDIR)/vlc48x48.png debian/tmp/$(PIXDIR)/vlc.png
@@ -237,7 +238,7 @@ binary-arch: build install
 	dh_installmenu -s
 	dh_installmime -s
 	dh_installman doc/vlc.1 -p vlc-nox
-	dh_installman debian/vlc-wrapper.1 -p vlc-nox
+	dh_installman doc/vlc-wrapper.1 -p vlc-nox
 	dh_installchangelogs ChangeLog -p vlc
 	dh_installchangelogs ChangeLog -p vlc-nox
 	dh_desktop
diff --git a/debian/vlc-wrapper.1 b/debian/vlc-wrapper.1
deleted file mode 100644
index e7d4d8f..0000000
--- a/debian/vlc-wrapper.1
+++ /dev/null
@@ -1,54 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH VLC\-WRAPPER 1 "Aug 31, 2008"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-vlc-wrapper \- a wrapper to drop priviledges with VLC
-.SH SYNOPSIS
-.B vlc-wrapper
-.RI [ OPTIONS ]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B VLC
-wrapper to open priviledged network ports.
-The ports it can open are 80, 443 and 554.
-
-.SH OPTIONS
-They will be passed to
-.B VLC
-with no modification.
-
-.SH USAGE
-.PP
-The preferred way is to use
-.B sudo
-:
-.PP
-\& $ sudo vlc-wrapper \-\-option1 \-\-option2
-.PP
-You can also set the SUDO_UID environement variable:
-.PP
-\& # SUDO_UID=1000 vlc-wrapper \-\-option1 \-\-option2
-.PP
-
-
-.SH SEE ALSO
-.BR vlc (1),
-.BR sudo (8)
-
-.PP
-.SH AUTHOR
-This manual page was written by Christophe Mutricy.

-- 
VLC media player packaging