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

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 84da2555da3d0b6f1a2a6c49d751582b1575c426
Author: Modestas Vainius <modax at debian.org>
Date:   Thu Jun 23 12:27:22 2011 +0300

    Use redland cflags (from redland-config) when building redland stuff.
    
    Fixes FTBFS due to missing /usr/include/raptor2 in the include path (patch
    redland_raptor2_support.h improved).
---
 debian/changelog                         |    3 +++
 debian/patches/redland_raptor2_support.h |   16 ++++++++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 93ffc3f..43ded63 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ soprano (2.6.0+dfsg.1-4) UNRELEASED; urgency=low
   * Bump Standards-Version to 3.9.2: no changes needed.
   * Replace $(overriden_command) with $(overridden_command) in debian/rules.
     Requires pkg-kde-tools 0.12.
+  * Use redland cflags (from redland-config) when building redland stuff. Fixes
+    FTBFS due to missing /usr/include/raptor2 in the include path (patch
+    redland_raptor2_support.h improved).
 
  -- Modestas Vainius <modax at debian.org>  Wed, 27 Apr 2011 15:39:56 +0300
 
diff --git a/debian/patches/redland_raptor2_support.h b/debian/patches/redland_raptor2_support.h
index 8eb8891..310e402 100644
--- a/debian/patches/redland_raptor2_support.h
+++ b/debian/patches/redland_raptor2_support.h
@@ -1,9 +1,11 @@
 From: Luigi Toscano <luigi.toscano at tiscali.it>
+From: Modestas Vainius <modax at debian.org>
 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
+Last-Update: 2011-06-23
+
+This patch should be considered as pretty dirty FTBFS fix.
 
 --- a/backends/redland/redlandbackend.cpp
 +++ b/backends/redland/redlandbackend.cpp
@@ -65,3 +67,13 @@ Last-Update: 2011-03-22
  #include <redland.h>
  
  #include "error.h"
+--- a/cmake/modules/FindRedland.cmake
++++ b/cmake/modules/FindRedland.cmake
+@@ -44,6 +44,7 @@ if(REDLAND_CONFIG_EXECUTABLE)
+     execute_process(
+       COMMAND ${REDLAND_CONFIG_EXECUTABLE} --cflags
+       OUTPUT_VARIABLE redland_LIBS_ARGS)
++    set(REDLAND_CFLAGS ${redland_LIBS_ARGS})
+     string( REPLACE " " ";" redland_LIBS_ARGS ${redland_LIBS_ARGS} )
+     foreach( _ARG ${redland_LIBS_ARGS} )
+       if(${_ARG} MATCHES "^-I")

-- 
Soprano RDF Framework packaging