sb121: merged in DEV300_m75

4 files changed, 48 insertions, 6 deletions

diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk
index af0f34ab9431..fc9e93baaa6d 100644
--- a/redland/rasqal/makefile.mk
+++ b/redland/rasqal/makefile.mk
@@ -55,8 +55,7 @@ OOO_PATCH_FILES= \
     $(TARFILE_NAME).patch.autotools \
     $(TARFILE_NAME).patch.ooo_build \
     $(TARFILE_NAME).patch.dmake \
-    $(TARFILE_NAME).patch.win32 \
-
+    $(TARFILE_NAME).patch.win32
 
 PATCH_FILES=$(OOO_PATCH_FILES)
 
diff --git a/redland/rasqal/rasqal-0.9.16.patch.ooo_build b/redland/rasqal/rasqal-0.9.16.patch.ooo_build
index eb4d24bb9c45..827147995e6f 100644
--- a/redland/rasqal/rasqal-0.9.16.patch.ooo_build
+++ b/redland/rasqal/rasqal-0.9.16.patch.ooo_build
@@ -32,3 +32,25 @@
  fi
  if test "$echo_libtool_libs" = "yes"; then
    echo @libdir@/@RASQAL_LIBTOOLLIBS@
+--- misc/rasqal-0.9.16/Makefile.am	2010-02-12 08:43:21.000000000 +0000
++++ misc/build/rasqal-0.9.16/Makefile.am	2010-02-12 08:43:56.000000000 +0000
+@@ -22,7 +22,7 @@
+ 
+ noinst_SCRIPTS = rasqal-src-config
+ 
+-SUBDIRS=src utils tests docs data win32
++SUBDIRS=src tests docs data win32
+ 
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = rasqal.pc
+--- misc/rasqal-0.9.16/Makefile.in	2010-02-12 08:43:19.000000000 +0000
++++ misc/build/rasqal-0.9.16/Makefile.in	2010-02-12 08:44:03.000000000 +0000
+@@ -242,7 +242,7 @@
+ with_raptor = @with_raptor@
+ with_redland = @with_redland@
+ noinst_SCRIPTS = rasqal-src-config
+-SUBDIRS = src utils tests docs data win32
++SUBDIRS = src tests docs data win32
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = rasqal.pc
+ EXTRA_DIST = ChangeLog ChangeLog.1 ChangeLog.2 ChangeLog.3 ChangeLog.4 \
diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk
index 2808686420ce..c89724087dc9 100644
--- a/redland/redland/makefile.mk
+++ b/redland/redland/makefile.mk
@@ -54,14 +54,13 @@ OOO_PATCH_FILES= \
     $(TARFILE_NAME).patch.legal \
     $(TARFILE_NAME).patch.autotools \
     $(TARFILE_NAME).patch.dmake \
-    $(TARFILE_NAME).patch.win32 \
-
+    $(TARFILE_NAME).patch.ooo_build \
+    $(TARFILE_NAME).patch.win32
 
 PATCH_FILES=$(OOO_PATCH_FILES) \
     $(TARFILE_NAME).patch.free_null \
     $(TARFILE_NAME).patch.storage_hashes_context_serialize_get_statement \
-    $(TARFILE_NAME).patch.storage_hashes_list_duplicates \
-
+    $(TARFILE_NAME).patch.storage_hashes_list_duplicates
 
 .IF "$(OS)"=="OS2"
 BUILD_ACTION=dmake
diff --git a/redland/redland/redland-1.0.8.patch.ooo_build b/redland/redland/redland-1.0.8.patch.ooo_build
new file mode 100644
index 000000000000..805a88d49ea2
--- /dev/null
+++ b/redland/redland/redland-1.0.8.patch.ooo_build
@@ -0,0 +1,22 @@
+--- misc/redland-1.0.8/Makefile.am	2010-02-12 08:47:40.000000000 +0000
++++ misc/build/redland-1.0.8/Makefile.am	2010-02-12 08:47:51.000000000 +0000
+@@ -48,7 +48,7 @@
+ # to ensure that the raptor and rasqal subdirectories are called
+ # as CONFIG_SUBDIR directories.
+ #
+-SUBDIRS=@LOCAL_SUBDIRS@ librdf examples utils demos docs data
++SUBDIRS=@LOCAL_SUBDIRS@ librdf examples demos docs data
+ 
+ EXTRA_DIST=ChangeLog ChangeLog.1 ChangeLog.2 ChangeLog.3 ChangeLog.4 \
+ ChangeLog.5 ChangeLog.6 ChangeLog.7 \
+--- misc/redland-1.0.8/Makefile.in	2010-02-12 08:47:39.000000000 +0000
++++ misc/build/redland-1.0.8/Makefile.in	2010-02-12 08:47:55.000000000 +0000
+@@ -283,7 +283,7 @@
+ # to ensure that the raptor and rasqal subdirectories are called
+ # as CONFIG_SUBDIR directories.
+ #
+-SUBDIRS = @LOCAL_SUBDIRS@ librdf examples utils demos docs data
++SUBDIRS = @LOCAL_SUBDIRS@ librdf examples demos docs data
+ EXTRA_DIST = ChangeLog ChangeLog.1 ChangeLog.2 ChangeLog.3 ChangeLog.4 \
+ ChangeLog.5 ChangeLog.6 ChangeLog.7 \
+ README      NEWS      LICENSE.txt  TODO \