[SCM] vlc/master: Drop backported man page patch.
bdrung at users.alioth.debian.org
bdrung at users.alioth.debian.org
Mon Apr 8 16:20:17 UTC 2013
The following commit has been merged in the master branch:
commit 6763a3ec4adfd7b6ee9316dff6297dfbf54e48f3
Author: Benjamin Drung <bdrung at debian.org>
Date: Mon Apr 8 15:49:21 2013 +0200
Drop backported man page patch.
diff --git a/debian/patches/bp-man-update-title-dvd-syntax.patch b/debian/patches/bp-man-update-title-dvd-syntax.patch
deleted file mode 100644
index 1366be3..0000000
--- a/debian/patches/bp-man-update-title-dvd-syntax.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 46100975d179a49147ac1ad2c383b0493a4cc3e9 Mon Sep 17 00:00:00 2001
-From: Jean-Baptiste Kempf <jb at videolan.org>
-Date: Thu, 9 Aug 2012 16:02:34 +0200
-Subject: [PATCH] Man: Update title dvd syntax
-
-Close #7133
-(cherry picked from commit 23a04c6aaf6d4d8f63c3afc5b782c5723fb60a5d)
-
-Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
----
- doc/vlc.1 | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/doc/vlc.1 b/doc/vlc.1
-index a82523e..6324770 100644
---- a/doc/vlc.1
-+++ b/doc/vlc.1
-@@ -45,7 +45,7 @@ recognizes several URL-style items:
- .B *.mpg, *.vob, *.avi, *.mp3, *.ogg, *.opus
- Various multimedia file formats
- .TP
--.B dvd://[<device>][@<raw device>][@[<title>][:[<chapter>][:<angle>]]]
-+.B dvd://[<device>][@<raw device>][#[<title>][:[<chapter>][:<angle>]]]
- DVD device (for instance dvd:///dev/dvd). The raw device is optional and
- must have been prepared beforehand.
- .TP
---
-1.7.10.4
diff --git a/debian/patches/series b/debian/patches/series
index 474a8fe..55abf38 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
v4l-kfreebsd.patch
link-binaries-with-c++.patch
-bp-man-update-title-dvd-syntax.patch
--
VLC media player packaging
More information about the pkg-multimedia-commits
mailing list