tags 722233 + patch
tags 722233 + pending
thanks

Hi Peter,

I've prepared an NMU for subversion (versioned as 1.7.9-1+nmu5) and
uploaded it to DELAYED/1.  Please find the nmu diff attached.

Cheers,
Julien
diff -u subversion-1.7.9/debian/changelog subversion-1.7.9/debian/changelog
--- subversion-1.7.9/debian/changelog
+++ subversion-1.7.9/debian/changelog
@@ -1,3 +1,10 @@
+subversion (1.7.9-1+nmu5) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * Drop SQLite version check (closes: #722233).  This is dpkg-shlibdeps' job.
+
+ -- Julien Cristau <jcris...@debian.org>  Mon, 09 Sep 2013 15:13:49 +0200
+
 subversion (1.7.9-1+nmu4) unstable; urgency=low
 
   * Non-maintainer upload.
diff -u subversion-1.7.9/debian/patches/loosen-sqlite-version-check subversion-1.7.9/debian/patches/loosen-sqlite-version-check
--- subversion-1.7.9/debian/patches/loosen-sqlite-version-check
+++ subversion-1.7.9/debian/patches/loosen-sqlite-version-check
@@ -1,18 +1,19 @@
-Bug 608925: The actual ABI compatibility of sqlite3 doesn't seem to
-depend on the patchlevel (the x in 3.7.x), so omit that in our sanity
-check here.
+Bugs 608925 and 722233: The actual ABI compatibility of sqlite3 doesn't
+depend on the version, so drop the sanity check.
 
 This matters in Debian because the sqlite3 library package exports a
 slightly more liberal shlibs file than the library version itself.
 
---- a/subversion/libsvn_subr/sqlite.c
-+++ b/subversion/libsvn_subr/sqlite.c
-@@ -740,7 +740,7 @@
+Index: subversion-1.7.9/subversion/libsvn_subr/sqlite.c
+===================================================================
+--- subversion-1.7.9.orig/subversion/libsvn_subr/sqlite.c
++++ subversion-1.7.9/subversion/libsvn_subr/sqlite.c
+@@ -740,7 +740,7 @@ static volatile svn_atomic_t sqlite_init
  static svn_error_t *
  init_sqlite(void *baton, apr_pool_t *pool)
  {
 -  if (sqlite3_libversion_number() < SQLITE_VERSION_NUMBER)
-+  if (sqlite3_libversion_number()/1000 < SQLITE_VERSION_NUMBER/1000)
++  if (0 && sqlite3_libversion_number() < SQLITE_VERSION_NUMBER)
      {
        return svn_error_createf(
                      SVN_ERR_SQLITE_ERROR, NULL,

Attachment: signature.asc
Description: Digital signature

Reply via email to