[med-svn] [r-cran-rsqlite] 01/01: Consider a patch for further investigation (not activated in series) to relax the version comparison between the installed SQLite version and the version this package was built against

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository r-cran-rsqlite.

commit 265370967f6edcd6876a41ab9d9aff499bd87ddf
Author: Andreas Tille <tille at debian.org>
Date:   Fri Jun 27 09:12:25 2014 +0200

    Consider a patch for further investigation (not activated in series) to relax the version comparison between the installed SQLite version and the version this package was built against
---
 debian/changelog                                      |  9 +++++++++
 debian/patches/series                                 |  1 +
 .../patches/skip_warning_about_version_mismatch.patch | 19 +++++++++++++++++++
 3 files changed, 29 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 1b3a585..1106ba4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+r-cran-rsqlite (0.11.4-2) UNRELEASED; urgency=medium
+
+  * Consider a patch that would relax version comparison since the installed
+    sqlite version might differ from the version this package was builded
+    against but patch is not activated since it might need further
+    investigation
+
+ -- Andreas Tille <tille at debian.org>  Fri, 27 Jun 2014 09:03:24 +0200
+
 r-cran-rsqlite (0.11.4-1) unstable; urgency=medium
 
   * New upstream version
diff --git a/debian/patches/series b/debian/patches/series
index c759e06..ce9dd16 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 do_not_check_against_bundled_sqlite_version.patch
+#needs further investigation# skip_warning_about_version_mismatch.patch
diff --git a/debian/patches/skip_warning_about_version_mismatch.patch b/debian/patches/skip_warning_about_version_mismatch.patch
new file mode 100644
index 0000000..dffce8c
--- /dev/null
+++ b/debian/patches/skip_warning_about_version_mismatch.patch
@@ -0,0 +1,19 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Fri, 27 Jun 2014 09:03:24 +0200
+Description: Consider a patch that would relax version comparison since the
+ installed sqlite version might differ from the version this package was
+ builded against but patch is not activated since it might need further 
+ investigation
+
+--- a/src/RS-SQLite.c
++++ b/src/RS-SQLite.c
+@@ -69,7 +69,8 @@ RS_SQLite_init(SEXP config_params, SEXP
+     const char *clientVersion = sqlite3_libversion();
+ 
+     /* make sure we're running with the "right" version of the SQLite library */
+-    if(strcmp(clientVersion, compiledVarsion)){
++    /* since in Debian the packaged version is used there might be slight differences in the installed version and the version at build time -> compare only major.minor. version */
++    if(strncmp(clientVersion, compiledVarsion, 4)){
+         char  buf[256];
+         (void) sprintf(buf,
+                        "%s mismatch between compiled version %s and runtime version %s",

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/r-cran-rsqlite.git