diff -u virtuoso-opensource-6.1.3+dfsg1/debian/changelog virtuoso-opensource-6.1.3+dfsg1/debian/changelog
--- virtuoso-opensource-6.1.3+dfsg1/debian/changelog
+++ virtuoso-opensource-6.1.3+dfsg1/debian/changelog
@@ -1,3 +1,10 @@
+virtuoso-opensource (6.1.3+dfsg1-1ubuntu1.1) oneiric-proposed; urgency=low
+
+  * Add fix_nepomuk_encoding_error.diff to fix encoding issues in nepomuk
+    (LP: #858970, #958683)
+
+ -- Rohan Garg <rohangarg@kubuntu.org>  Sun, 18 Mar 2012 17:38:47 +0100
+
 virtuoso-opensource (6.1.3+dfsg1-1ubuntu1) oneiric; urgency=low
 
   * Merge from debian unstable.  Remaining changes:
diff -u virtuoso-opensource-6.1.3+dfsg1/debian/patches/series virtuoso-opensource-6.1.3+dfsg1/debian/patches/series
--- virtuoso-opensource-6.1.3+dfsg1/debian/patches/series
+++ virtuoso-opensource-6.1.3+dfsg1/debian/patches/series
@@ -1,3 +1,4 @@
+fix_nepomuk_encoding_error.diff
 config-debian-paths.patch
 config-universal-variables.patch
 build-short-timeout.patch
only in patch2:
unchanged:
--- virtuoso-opensource-6.1.3+dfsg1.orig/debian/patches/fix_nepomuk_encoding_error.diff
+++ virtuoso-opensource-6.1.3+dfsg1/debian/patches/fix_nepomuk_encoding_error.diff
@@ -0,0 +1,17 @@
+Index: virtuoso-opensource-6.1.3+dfsg1/libsrc/Wi/xqf.c
+===================================================================
+--- virtuoso-opensource-6.1.3+dfsg1.orig/libsrc/Wi/xqf.c	2012-03-18 17:58:39.823341219 +0100
++++ virtuoso-opensource-6.1.3+dfsg1/libsrc/Wi/xqf.c	2012-03-18 18:01:26.661284371 +0100
+@@ -3520,6 +3520,12 @@
+   desc = xqf_str_parser_descs + desc_idx;
+   if (DV_DB_NULL == arg_dtp)
+     return NEW_DB_NULL;
++  /* if we have wide and we want typed string we do utf8, cast do to default charset so we do not do it */
++  if (DV_WIDE == arg_dtp && desc->p_dest_dtp == DV_STRING)
++    {
++      res = box_wide_as_utf8_char (arg, box_length (arg) / sizeof (wchar_t) - 1, DV_STRING);
++      goto res_ready;
++    }
+   if (DV_STRING != arg_dtp)
+     {
+       caddr_t err = NULL;