[med-svn] [r-cran-rsqlite] 01/02: Do not check unecessarily for strict version equivalence between compiled version and runtime version

[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 d1be88749e8c61ce08f63da48379a6d460127c01
Author: Andreas Tille <tille at debian.org>
Date:   Fri Sep 25 23:29:27 2015 +0200

    Do not check unecessarily for strict version equivalence between compiled version and runtime version
---
 debian/changelog                                   |  9 +++++++++
 .../patches/do_not_check_strict_versioning.patch   | 22 ++++++++++++++++++++++
 debian/patches/series                              |  2 +-
 .../skip_warning_about_version_mismatch.patch      | 19 -------------------
 4 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8a87fbf..042a13b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+r-cran-rsqlite (1.0.0-2) UNRELEASED; urgency=medium
+
+  * Do not check unecessarily for strict version equivalence between compiled
+    version and runtime version (Thanks for the patch to Don Armstrong
+    <don at debian.org>)
+    Closes: #800042
+
+ -- Andreas Tille <tille at debian.org>  Fri, 25 Sep 2015 23:26:02 +0200
+
 r-cran-rsqlite (1.0.0-1) unstable; urgency=medium
 
   * New upstream version
diff --git a/debian/patches/do_not_check_strict_versioning.patch b/debian/patches/do_not_check_strict_versioning.patch
new file mode 100644
index 0000000..abd0995
--- /dev/null
+++ b/debian/patches/do_not_check_strict_versioning.patch
@@ -0,0 +1,22 @@
+Author: Don Armstrong <don at debian.org>
+Last-Update: Fri, 25 Sep 2015 19:51:02 UTC
+Bug-Debian: http://bugs.debian.org/800042
+Description: Do not check unecessarily for strict version equivalence between
+  compiled version and runtime version
+
+--- a/src/driver.c
++++ b/src/driver.c
+@@ -32,13 +32,6 @@ SQLiteDriver* rsqlite_driver() {
+ void rsqlite_driver_init(SEXP records_, SEXP cache_) {
+   if (dbManager) return; // Already allocated
+ 
+-  const char* clientVersion = sqlite3_libversion();
+-  if (strcmp(clientVersion, compiledVersion)) {
+-    error("SQLite mismatch between compiled version %s and runtime version %s",
+-        compiledVersion, clientVersion
+-    );
+-  }
+-
+   dbManager = malloc(sizeof(SQLiteDriver));
+   if (!dbManager) {
+     error("could not malloc the dbManger");
diff --git a/debian/patches/series b/debian/patches/series
index fd2687e..a4326df 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-#needs further investigation# skip_warning_about_version_mismatch.patch
+do_not_check_strict_versioning.patch
diff --git a/debian/patches/skip_warning_about_version_mismatch.patch b/debian/patches/skip_warning_about_version_mismatch.patch
deleted file mode 100644
index dffce8c..0000000
--- a/debian/patches/skip_warning_about_version_mismatch.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-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