[SCM] mpd-sima/upstream: Imported Upstream version 0.12.0

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

The following commit has been merged in the upstream branch:
commit d155ab6fc659e29165b21830208a20a260fe39e0
Author: Geoffroy Youri Berret <kaliko at azylum.org>
Date:   Mon Jun 16 10:53:10 2014 +0200

    Imported Upstream version 0.12.0

diff --git a/data/man/mpd_sima.cfg.5 b/data/man/mpd_sima.cfg.5
index c281c9d..49a9408 100644
--- a/data/man/mpd_sima.cfg.5
+++ b/data/man/mpd_sima.cfg.5
@@ -2,12 +2,12 @@
 .\"     Title: mpd_sima.cfg
 .\"    Author: Jack Kaliko <kaliko at azylum.org>
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 06/12/2014
+.\"      Date: 06/16/2014
 .\"    Manual: mpd-sima 0.12.0 User Manual
 .\"    Source: mpd-sima
 .\"  Language: English
 .\"
-.TH "MPD_SIMA\&.CFG" "5" "06/12/2014" "mpd-sima" "mpd-sima 0.12.0 User Manual"
+.TH "MPD_SIMA\&.CFG" "5" "06/16/2014" "mpd-sima" "mpd-sima 0.12.0 User Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -127,6 +127,23 @@ Logging verbosity among
 \fIwarning\fR,
 \fIerror\fR\&.
 .RE
+.SS "Process daemonization"
+.PP
+Configure process daemon\&.
+.PP
+\fB[daemon]\fR
+.RS 4
+.RE
+.PP
+\fBdaemon=false\fR
+.RS 4
+whether to daemonize process or not\&.
+.RE
+.PP
+\fBpidfile=\fR
+.RS 4
+Where to store process ID\&.
+.RE
 .SS "sima section"
 .PP
 Core mpd_sima\&.cfg configuration\&.
diff --git a/data/man/mpd_sima.cfg.5.xml b/data/man/mpd_sima.cfg.5.xml
index 97018d8..9ef63de 100644
--- a/data/man/mpd_sima.cfg.5.xml
+++ b/data/man/mpd_sima.cfg.5.xml
@@ -129,8 +129,8 @@ man(1), man(7), http://www.tldp.org/HOWTO/Man-Page/
             </variablelist>
         </refsect2>
         <refsect2 id="log">
-            <para>Configure logging.</para>
             <title>log section</title>
+            <para>Configure logging.</para>
             <variablelist>
                 <varlistentry> <!-- LOG -->
                     <term><option>[log]</option></term>
@@ -155,6 +155,28 @@ man(1), man(7), http://www.tldp.org/HOWTO/Man-Page/
                 </varlistentry>
             </variablelist>
         </refsect2>
+        <refsect2 id="daemon">
+            <title>Process daemonization</title>
+            <para>Configure process daemon.</para>
+            <variablelist>
+                <varlistentry> <!-- DAEMON -->
+                    <term><option>[daemon]</option></term>
+                    <listitem><para></para></listitem>
+                </varlistentry>
+                <varlistentry> <!-- daemon.daemon -->
+                    <term><option>daemon=false</option></term>
+                    <listitem>
+                        <para>whether to daemonize process or not.</para>
+                    </listitem>
+                </varlistentry>
+                <varlistentry> <!-- daemon.pidfile -->
+                    <term><option>pidfile=</option></term>
+                    <listitem>
+                        <para>Where to store process ID.</para>
+                    </listitem>
+                </varlistentry>
+            </variablelist>
+        </refsect2>
         <refsect2 id="sima">
             <title>sima section</title>
             <para>Core &dhutils; configuration.</para>
diff --git a/doc/Changelog b/doc/Changelog
index d5f3d26..f9d4feb 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -11,7 +11,7 @@ sima v0.12.0
  * Base artist for similarity is the last track queued
  * Persistent http caching
 
--- kaliko jack <kaliko at azylum.org> UNRELEASED
+-- kaliko jack <kaliko at azylum.org> Mon, 16 Jun 2014 10:37:14 +0200
 
 
 sima v0.11.0
diff --git a/sima/info.py b/sima/info.py
index 71fca98..60d1139 100644
--- a/sima/info.py
+++ b/sima/info.py
@@ -11,7 +11,7 @@ queue is getting short.
 """
 
 
-__version__ = '0.12.0pr5'
+__version__ = '0.12.0'
 __author__ = 'kaliko jack'
 __email__ = 'kaliko at azylum.org'
 __url__ = 'git://git.kaliko.me/sima.git'

-- 
mpd-sima packaging