[SCM] mpv/master: Add 02_fix-config-path.patch to update the manpage regarding config directories

ghedo at users.alioth.debian.org ghedo at users.alioth.debian.org
Sun Dec 15 18:49:12 UTC 2013


The following commit has been merged in the master branch:
commit 55edc743c362ecdfaf0ecc5046d7ccce1ab0a38b
Author: Alessandro Ghedini <alessandro at ghedini.me>
Date:   Sun Dec 15 19:24:33 2013 +0100

    Add 02_fix-config-path.patch to update the manpage regarding config directories

diff --git a/debian/patches/02_fix-config-path.patch b/debian/patches/02_fix-config-path.patch
new file mode 100644
index 0000000..fcec579
--- /dev/null
+++ b/debian/patches/02_fix-config-path.patch
@@ -0,0 +1,28 @@
+Description: System-wide config directory is /etc/mpv
+Origin: vendor
+Bug-Debian: http://bugs.debian.org/732214
+Forwarded: not-needed
+Author: Alessandro Ghedini <ghedo at debian.org>
+Last-Update: 2013-12-15
+
+--- a/DOCS/man/en/mpv.rst
++++ b/DOCS/man/en/mpv.rst
+@@ -331,8 +331,7 @@
+ 
+ You can put all of the options in configuration files which will be read every
+ time mpv is run. The system-wide configuration file 'mpv.conf' is in your
+-configuration directory (e.g. ``/etc/mpv`` or ``/usr/local/etc/mpv``), the
+-user-specific one is ``~/.mpv/config``.
++configuration directory (``/etc/mpv``), the user-specific one is ``~/.mpv/config``.
+ User-specific options override system-wide options and options given on the
+ command line override either. The syntax of the configuration files is
+ ``option=<value>``; everything after a *#* is considered a comment. Options
+@@ -575,7 +574,7 @@
+ FILES
+ =====
+ 
+-``/usr/local/etc/mpv/mpv.conf``
++``/etc/mpv/mpv.conf``
+     mpv system-wide settings (depends on ``--prefix`` passed to configure)
+ 
+ ``~/.mpv/config``
diff --git a/debian/patches/series b/debian/patches/series
index f5acdbc..240293f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 01_desktop-path.patch
+02_fix-config-path.patch

-- 
mpv packaging



More information about the pkg-multimedia-commits mailing list