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

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

The following commit has been merged in the master branch:
commit b823a836c01f1ec65ac2460ef23e51e875df1b69
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Tue May 29 23:15:12 2012 +0200

    Update a couple of kfrebsd related patches.

diff --git a/debian/changelog b/debian/changelog
index 094b7b2..835f4da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ virtuoso-opensource (6.1.5+dfsg2-0r0) UNRELEASED; urgency=low
   * Update patches:
     - drop fix-wide-char-encoding.patch, applied upstream.
     - update repack-zlib.patch.
+    - extend build-short-timeout.patch.
     - refresh other patches in order to make them apply without any offset.
     - add ignore-netstat-failure.patch, to avoid FTBFS on various
       architectures, thanks to Steven Chamberlain (Closes: #663010).
diff --git a/debian/patches/build-short-timeout.patch b/debian/patches/build-short-timeout.patch
index 3bde8b5..e66adf3 100644
--- a/debian/patches/build-short-timeout.patch
+++ b/debian/patches/build-short-timeout.patch
@@ -1509,3 +1509,14 @@ Last-Update: 2012-05-23
      RUN $ISQL $PORT PROMPT=OFF VERBOSE=OFF  < tpc_back.sql
      if test $STATUS -ne 0
      then
+--- a/binsrc/dbpedia/make_vad.sh
++++ b/binsrc/dbpedia/make_vad.sh
+@@ -196,7 +196,7 @@ virtuoso_start() {
+   ddate=`date`
+   starth=`date | cut -f 2 -d :`
+   starts=`date | cut -f 3 -d :|cut -f 1 -d " "`
+-  timeout=600
++  timeout=60
+   $myrm -f *.lck
+   if [ "z$HOST_OS" != "z" ] 
+   then
diff --git a/debian/patches/ignore-netstat-failure.patch b/debian/patches/ignore-netstat-failure.patch
index 8c51ab7..d599531 100644
--- a/debian/patches/ignore-netstat-failure.patch
+++ b/debian/patches/ignore-netstat-failure.patch
@@ -414,3 +414,14 @@
      fi
    done
  }
+--- a/binsrc/dbpedia/make_vad.sh
++++ b/binsrc/dbpedia/make_vad.sh
+@@ -224,7 +224,7 @@ virtuoso_start() {
+     if test $nows -ge $timeout
+     then
+       LOG "***FAILED: Could not start Virtuoso Server within $timeout seconds"
+-      exit 1
++      return 1
+     fi
+   done
+ }

-- 
Git repository for pkg-virtuoso