Merge tag 'upstream/3.1.1+dfsg1'

Upstream version 3.1.1+dfsg1

# gpg: Signature made Thu 09 Feb 2017 04:37:24 AM EST
# gpg:                using RSA key 5001E1B09AA3744B
# gpg:                issuer "unit193@ubuntu.com"
# gpg: Good signature from "Unit 193 <unit193@ubuntu.com>" [unknown]
# gpg:                 aka "Unit 193 <unit193@gmail.com>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 8DB3 E586 865D 2B4A 2B18  5A5C 5001 E1B0 9AA3 744B

1 files changed, 41 insertions, 0 deletions

diff --git a/Plugins/DbSqliteSystemData/fix_files.sh b/Plugins/DbSqliteSystemData/fix_files.sh
new file mode 100644
index 0000000..fcc7505
--- /dev/null
+++ b/Plugins/DbSqliteSystemData/fix_files.sh
@@ -0,0 +1,41 @@
+#!/usr/bin/env tclsh
+
+proc process {f} {
+  set fd [open $f r]
+  set data [read $fd]  
+  close $fd
+  
+  #set data [string map [list systemdata_systemdata_ systemdata_] $data]
+  set data [string map [list sqlite3 systemdata_sqlite3 ../core/ ""] $data]
+  
+  set fd [open $f w]
+  puts $fd $data
+  close $fd
+}
+
+foreach f {
+	systemdata_sqlite3.c
+	systemdata_sqlite3.h
+	systemdata_sqlite3ext.h
+	systemdata_interop.c
+	systemdata_extension-functions.c
+	systemdata_crypt.c
+} {
+	process $f
+}
+
+# Concat
+set targetFile systemdata_sqlite3.c
+set srcFiles {
+	systemdata_interop.c
+	systemdata_crypt.c
+	systemdata_extension-functions.c
+}
+
+set trgFd [open $targetFile a+]
+foreach f $srcFiles {
+	set fd [open $f r]
+	puts $trgFd [read $fd]
+	close $fd
+}
+close $trgFd