[SCM] Soprano RDF Framework packaging branch, master, updated. debian/2.6.0+dfsg.1-2

[Modestas Vainius]

The following commit has been merged in the master branch:
commit cebeda0e10a442a05390487d5b36436bec16510a
Author: Modestas Vainius <modax at debian.org>
Date:   Tue Mar 22 20:24:04 2011 +0200

    Add support for raptor V2 to the redland backend and enable it.
    
    (patch redland_raptor2_support.h)
    (Closes: #615487)
---
 debian/changelog                         |    3 +
 debian/control                           |    3 +-
 debian/patches/redland_raptor2_support.h |   67 ++++++++++++++++++++++++++++++
 debian/patches/series                    |    1 +
 debian/rules                             |    3 +-
 debian/soprano-daemon.install            |    2 +
 6 files changed, 76 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 09cbabd..3f9337b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 soprano (2.6.0+dfsg.1-2) UNRELEASED; urgency=low
 
   * Remove debian/README.source: not necessary as of 3.0 (quilt).
+  * Add support for raptor V2 to the redland backend.
+    (patch redland_raptor2_support.h) and start building it again
+    (Closes: #615487)
 
  -- Modestas Vainius <modax at debian.org>  Sun, 13 Mar 2011 17:38:10 +0200
 
diff --git a/debian/control b/debian/control
index ad0eac1..1323a9a 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,8 @@ Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Sune Vuorela <debian at pusling.com>, Armin Berres <armin+debian at space-based.de>, Fathi Boudra <fabo at debian.org>, Modestas Vainius <modax at debian.org>
 Build-Depends: debhelper (>= 7.4.15), cmake (>= 2.6.2), pkg-kde-tools (>= 0.11),
- dpkg-dev (>= 1.15.5), libclucene-dev (>= 0.9.21b), libqt4-dev (>= 4.5.3), libraptor1-dev (>= 1.4.16),
+ dpkg-dev (>= 1.15.5), libclucene-dev (>= 0.9.21b), libqt4-dev (>= 4.5.3),
+ libraptor1-dev (>= 1.4.16), librdf0-dev (>= 1.0.13),
  doxygen (>= 1.7.1), graphviz, libiodbc2-dev
 Standards-Version: 3.9.1
 Homepage: http://soprano.sourceforge.net
diff --git a/debian/patches/redland_raptor2_support.h b/debian/patches/redland_raptor2_support.h
new file mode 100644
index 0000000..8eb8891
--- /dev/null
+++ b/debian/patches/redland_raptor2_support.h
@@ -0,0 +1,67 @@
+From: Luigi Toscano <luigi.toscano at tiscali.it>
+Subject: Add support for raptor V2 to the redland backend
+Acked-By: Modestas Vainius <modax at debian.org>
+Forwarded: no
+Origin: other
+Last-Update: 2011-03-22
+
+--- a/backends/redland/redlandbackend.cpp
++++ b/backends/redland/redlandbackend.cpp
+@@ -24,6 +24,7 @@
+ 
+ #include "redlandbackend.h"
+ 
++#include <raptor2/raptor.h>
+ #include <redland.h>
+ 
+ #include "redlandworld.h"
+--- a/backends/redland/redlandmodel.h
++++ b/backends/redland/redlandmodel.h
+@@ -28,6 +28,7 @@
+ #include <QtCore/QtGlobal>
+ #include <QtCore/QTextStream>
+ 
++#include <raptor2/raptor.h>
+ #include <redland.h>
+ 
+ #include "storagemodel.h"
+--- a/backends/redland/redlandnodeiteratorbackend.h
++++ b/backends/redland/redlandnodeiteratorbackend.h
+@@ -24,6 +24,7 @@
+ 
+ #include "iteratorbackend.h"
+ 
++#include <raptor2/raptor.h>
+ #include <redland.h>
+ 
+ #include <QtCore/QSharedDataPointer>
+--- a/backends/redland/redlandqueryresult.h
++++ b/backends/redland/redlandqueryresult.h
+@@ -23,6 +23,7 @@
+ #ifndef SOPRANO_BACKEND_REDLAND_QUERY_RESULT_H
+ #define SOPRANO_BACKEND_REDLAND_QUERY_RESULT_H
+ 
++#include <raptor2/raptor.h>
+ #include <redland.h>
+ #include <QString>
+ 
+--- a/backends/redland/redlandstatementiterator.h
++++ b/backends/redland/redlandstatementiterator.h
+@@ -23,6 +23,7 @@
+ #ifndef SOPRANO_BACKEND_REDLAND_STATEMENT_ITERATOR_H
+ #define SOPRANO_BACKEND_REDLAND_STATEMENT_ITERATOR_H
+ 
++#include <raptor2/raptor.h>
+ #include <redland.h>
+ 
+ #include "iteratorbackend.h"
+--- a/backends/redland/redlandworld.h
++++ b/backends/redland/redlandworld.h
+@@ -23,6 +23,7 @@
+ #ifndef SOPRANO_BACKEND_REDLAND_WORLD_H
+ #define SOPRANO_BACKEND_REDLAND_WORLD_H
+ 
++#include <raptor2/raptor.h>
+ #include <redland.h>
+ 
+ #include "error.h"
diff --git a/debian/patches/series b/debian/patches/series
index 355772c..270e0fb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 x11_not_required.diff
 disable_usr_lib_install_rpath.diff
 doxyfile_generate_tagfile.diff
+redland_raptor2_support.h
diff --git a/debian/rules b/debian/rules
index a034456..eab3900 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,8 +7,7 @@ dh = --builddirectory=$(builddir)
 include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
 
 override_dh_auto_configure:
-	$(overriden_command) -- -DSOPRANO_BUILD_API_DOCS=ON \
-	    -DSOPRANO_DISABLE_REDLAND_BACKEND=TRUE
+	$(overriden_command) -- -DSOPRANO_BUILD_API_DOCS=ON
 
 override_dh_install:
 	$(overriden_command) -plibsoprano-doc --sourcedir=$(builddir)
diff --git a/debian/soprano-daemon.install b/debian/soprano-daemon.install
index 8366739..ccfe7de 100644
--- a/debian/soprano-daemon.install
+++ b/debian/soprano-daemon.install
@@ -5,11 +5,13 @@ usr/lib/soprano/libsoprano_nquadparser.so
 usr/lib/soprano/libsoprano_nquadserializer.so
 usr/lib/soprano/libsoprano_raptorparser.so
 usr/lib/soprano/libsoprano_raptorserializer.so
+usr/lib/soprano/libsoprano_redlandbackend.so
 usr/lib/soprano/libsoprano_virtuosobackend.so
 usr/share/soprano/plugins/nquadparser.desktop
 usr/share/soprano/plugins/nquadserializer.desktop
 usr/share/soprano/plugins/raptorparser.desktop
 usr/share/soprano/plugins/raptorserializer.desktop
+usr/share/soprano/plugins/redlandbackend.desktop
 usr/share/soprano/plugins/virtuosobackend.desktop
 usr/share/soprano/rules/nrl.rules
 usr/share/soprano/rules/rdfs.rules

-- 
Soprano RDF Framework packaging