[SCM] Git repository for pkg-virtuoso branch, master, updated. debian/6.1.3+dfsg1-2.1-24-g3062094

[José Manuel Santamar?==?UTF-8?Q?ía Lema]

The following commit has been merged in the master branch:
commit 9b8fee668739c302949fe99038f462b92ee6801a
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Mon May 28 22:37:37 2012 +0200

    Pass --user to start-stop-daemon in the init script.

diff --git a/debian/changelog b/debian/changelog
index 6ef2332..e14f01a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,10 @@ virtuoso-opensource (6.1.5+dfsg2-1) UNRELEASED; urgency=low
     - update repack-zlib.patch.
     - refresh other patches in order to make them apply without any offset.
   * Bump debhelper compatibility level to 9.
+  * Fix a bug in the init script, now uses start-stop-daemon with "--user",
+    this makes the script work when you are running it under Plasma (the KDE
+    workspace) with Nepomuk, which may already execute a /usr/bin/virtuoso-t
+    process making start-stop-daemon fail.
   * Add README.source explaining how the upstream tarball repacking was done.
     Just for the record the zlib removal is handled different compared to
     previous versions of this package, hence why repack-zlib.patch was updated.
diff --git a/debian/virtuoso-opensource-6.1.init b/debian/virtuoso-opensource-6.1.init
index fc02789..11a7b63 100644
--- a/debian/virtuoso-opensource-6.1.init
+++ b/debian/virtuoso-opensource-6.1.init
@@ -127,13 +127,14 @@ start_server() {
 # Start the process using the wrapper
         if [ -z "$DAEMONUSER" ] ; then
             start-stop-daemon --start --quiet \
+                        --user `id -un` \
                         --chdir $DBPATH --exec $DAEMON \
                         -- $DAEMON_OPTS
             errcode=$?
         else
 # if we are using a daemonuser then change the user id
             start-stop-daemon --start --quiet \
-                        --chuid $DAEMONUSER \
+                        --user $DAEMONUSER --chuid $DAEMONUSER \
                         --chdir $DBPATH --exec $DAEMON \
                         -- $DAEMON_OPTS
             errcode=$?

-- 
Git repository for pkg-virtuoso