[SCM] Soprano RDF Framework packaging branch, experimental, updated. debian/2.7.6+dfsg.1-3-18-g5365e50

[José Manuel Santamaría Lema]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-req/soprano.git;a=commitdiff;h=6e2ca44

The following commit has been merged in the experimental branch:
commit 6e2ca446e35be81c28a72b8dfaed38895f222a13
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Thu Feb 7 15:02:11 2013 +0100

    Remove dont_use_virtuoso_default_port.diff, applied upstream.
---
 debian/changelog                                   |    1 +
 debian/patches/dont_use_virtuoso_default_port.diff |   33 --------------------
 debian/patches/series                              |    1 -
 3 files changed, 1 insertions(+), 34 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c69e084..e567bd3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ soprano (2.9.0+dfsg.1-0r0) UNRELEASED; urgency=low
   [ José Manuel Santamaría Lema ]
   * Update symbols files.
   * Bump debhelper compatibility level to 9.
+  * Remove dont_use_virtuoso_default_port.diff, applied upstream.
 
   [ Daniele E. Domenichelli ]
   * Update disable_usr_lib_install_rpath.diff.
diff --git a/debian/patches/dont_use_virtuoso_default_port.diff b/debian/patches/dont_use_virtuoso_default_port.diff
deleted file mode 100644
index 8dd2780..0000000
--- a/debian/patches/dont_use_virtuoso_default_port.diff
+++ /dev/null
@@ -1,33 +0,0 @@
-Author: José Manuel Santamaría Lema <panfaust at gmail.com>
-Forwarded: https://projects.kde.org/projects/kdesupport/soprano/repository/revisions/3482b5fe
-Description: If possible, don't use the default virtuso port (1111)
- Soprano launches a Virtuoso server using an unix socket (/tmp/virt_XXXX where
- XXXX is the tcp port specified in the configuration file). It tries first with
- the /tmp/virt_1111 port if it's availaible, and if it's not, keeps trying with
- above ports one by one until it finds an usuable /tmp/virt_XXXX. Starting with
- 1111 is a very unfortunate choice, because if you start other virtuoso server
- configured to use the same port (note that 1111 is the default), then it would
- fail to start. It should fail and return, but currently it hangs.
- .
- When installing virtuoso-opensource-6.1, the postinst script will try to start
- Virtuoso using the default 1111 port in order to change the admin password. So
- the problem is the following: since the unix socket /tmp/virt_1111 is
- (probably) already being used by the Virtuoso instance started by Soprano, the
- Virtuoso instance started by the postinst script would hang (as explained in
- the paragraph above), breaking the installation.
---- a/backends/virtuoso/virtuosocontroller.cpp
-+++ b/backends/virtuoso/virtuosocontroller.cpp
-@@ -56,11 +56,11 @@ namespace {
- //         }
- #ifdef Q_OS_WIN
-         static QMutex portNumberMutex;
--        static quint16 p = 1111;
-+        static quint16 p = 1113;
-         QMutexLocker l(&portNumberMutex);
-         return p++;
- #else
--        int p = 1111;
-+        int p = 1113;
-         while ( QFile::exists( QString( "/tmp/virt_%1" ).arg( p ) ) ) {
-             ++p;
-         }
diff --git a/debian/patches/series b/debian/patches/series
index 647562a..a156756 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-dont_use_virtuoso_default_port.diff
 x11_not_required.diff
 doxyfile_generate_tagfile.diff
 redland_raptor2_support.h

-- 
Soprano RDF Framework packaging