[SCM] VLC media player packaging branch, experimental, updated. debian/1.0.6-1-68-gb19788e

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

The following commit has been merged in the experimental branch:
commit 19544c7afa81010caf190b1f3fcebbbde472bfcf
Author: Christophe Mutricy <xtophe at videolan.org>
Date:   Thu Jun 24 19:46:55 2010 +0100

    Don't advertise deprecated package

diff --git a/debian/patches/300_manpage_syntax.diff b/debian/patches/300_manpage_syntax.diff
deleted file mode 100644
index 05d2231..0000000
--- a/debian/patches/300_manpage_syntax.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-Add a note about the videolan-doc package (even if it's not really up-to-date)
-
-Index: vlc-debian/doc/vlc.1
-===================================================================
---- vlc-debian.orig/doc/vlc.1	2010-02-13 15:44:11.000000000 +0000
-+++ vlc-debian/doc/vlc.1	2010-02-13 15:44:27.000000000 +0000
-@@ -70,6 +70,11 @@
- (close VLC).
- 
- .SH SEE ALSO
-+The
-+.B videolan-doc
-+package contains comprehensive documents on how to use
-+.B VLC
-+both as a media player and as a streaming server.
- Online documentation: http://www.videolan.org/doc/
- .PP
- .SH AUTHOR
diff --git a/debian/patches/series b/debian/patches/series
index 1e529a4..b6bad6f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,6 +2,5 @@
 102_dejavu_font.diff
 104_notify.diff
 200_osdmenu_paths.diff
-300_manpage_syntax.diff
 501_decrease_alsa_buffer.diff
 502_xulrunner_191.diff

-- 
VLC media player packaging