[pkg-db-commits] [db5.3] 05/06: Update patches for 5.3.28 release

[Ondrej Sury]

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

ondrej pushed a commit to annotated tag debian/5.3.28-1
in repository db5.3.

commit b434224792cf307ff93ac74b01b85b5250386b6c
Author: Ondřej Surý <ondrej at sury.org>
Date:   Sun Oct 27 14:38:28 2013 +0100

    Update patches for 5.3.28 release
---
 debian/patches/002-versioned_symbols.patch |    6 +++---
 debian/patches/003-jni_javac.patch         |    8 ++++----
 debian/patches/004-tclsleep.patch          |    4 ++--
 debian/patches/005-pg_crypt_size.patch     |    4 ++--
 debian/patches/006-mutex_alignment.patch   |    4 ++--
 debian/patches/007-link-sql-libs.patch     |    4 ++--
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/debian/patches/002-versioned_symbols.patch b/debian/patches/002-versioned_symbols.patch
index 3bc227b..0d6e817 100644
--- a/debian/patches/002-versioned_symbols.patch
+++ b/debian/patches/002-versioned_symbols.patch
@@ -1,6 +1,6 @@
---- a/dist/Makefile.in
-+++ b/dist/Makefile.in
-@@ -854,9 +854,15 @@ $(libdb_version): $(C_OBJS)
+--- db5.3.orig/dist/Makefile.in
++++ db5.3/dist/Makefile.in
+@@ -855,9 +855,15 @@ $(libdb_version): $(C_OBJS)
  	$(RM) $(libdb)
  	$(LN) -s $(libdb_version) $(libdb)
  
diff --git a/debian/patches/003-jni_javac.patch b/debian/patches/003-jni_javac.patch
index 3567b5b..8e6eb57 100644
--- a/debian/patches/003-jni_javac.patch
+++ b/debian/patches/003-jni_javac.patch
@@ -1,5 +1,5 @@
---- a/dist/configure
-+++ b/dist/configure
+--- db5.3.orig/dist/configure
++++ db5.3/dist/configure
 @@ -18413,7 +18413,7 @@ $as_echo "$_cur" >&6; }
  done
  _ACJNI_FOLLOWED="$_cur"
@@ -9,8 +9,8 @@
  case "$host_os" in
  	darwin*)	_JTOPDIR=`echo "$_JTOPDIR" | sed -e 's:/[^/]*$::'`
  			_JINC="$_JTOPDIR/Headers";;
---- a/dist/aclocal_java/ac_jni_include_dirs.m4
-+++ b/dist/aclocal_java/ac_jni_include_dirs.m4
+--- db5.3.orig/dist/aclocal_java/ac_jni_include_dirs.m4
++++ db5.3/dist/aclocal_java/ac_jni_include_dirs.m4
 @@ -44,7 +44,7 @@ case "$_ACJNI_JAVAC" in
  esac
  
diff --git a/debian/patches/004-tclsleep.patch b/debian/patches/004-tclsleep.patch
index 0eb0755..c6bc0cc 100644
--- a/debian/patches/004-tclsleep.patch
+++ b/debian/patches/004-tclsleep.patch
@@ -1,5 +1,5 @@
---- a/test/tcl/env012.tcl
-+++ b/test/tcl/env012.tcl
+--- db5.3.orig/test/tcl/env012.tcl
++++ db5.3/test/tcl/env012.tcl
 @@ -75,7 +75,7 @@ proc env012 { } {
  	    $testdir $testfile PUT $key $data RECOVER 0 10 &]
  
diff --git a/debian/patches/005-pg_crypt_size.patch b/debian/patches/005-pg_crypt_size.patch
index 0997d5f..1dd3bfe 100644
--- a/debian/patches/005-pg_crypt_size.patch
+++ b/debian/patches/005-pg_crypt_size.patch
@@ -1,5 +1,5 @@
---- a/src/dbinc/db_page.h
-+++ b/src/dbinc/db_page.h
+--- db5.3.orig/src/dbinc/db_page.h
++++ db5.3/src/dbinc/db_page.h
 @@ -256,6 +256,17 @@ typedef struct __pg_crypto {
  	 */
  } PG_CRYPTO;
diff --git a/debian/patches/006-mutex_alignment.patch b/debian/patches/006-mutex_alignment.patch
index 88d890a..aee9b33 100644
--- a/debian/patches/006-mutex_alignment.patch
+++ b/debian/patches/006-mutex_alignment.patch
@@ -1,5 +1,5 @@
---- a/src/dbinc/mutex_int.h
-+++ b/src/dbinc/mutex_int.h
+--- db5.3.orig/src/dbinc/mutex_int.h
++++ db5.3/src/dbinc/mutex_int.h
 @@ -850,7 +850,11 @@ typedef volatile unsigned char tsl_t;
   * alignment locally.
   */
diff --git a/debian/patches/007-link-sql-libs.patch b/debian/patches/007-link-sql-libs.patch
index 72bb5be..55a1487 100644
--- a/debian/patches/007-link-sql-libs.patch
+++ b/debian/patches/007-link-sql-libs.patch
@@ -2,8 +2,8 @@ Description: Link libdb_sql-5.3 with the right libraries.
 Author: Iain Lane <iain.lane at canonical.com>
 Bug-Upstream: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=712262
 
---- db5.3-5.3.21.orig/dist/Makefile.in
-+++ db5.3-5.3.21/dist/Makefile.in
+--- db5.3.orig/dist/Makefile.in
++++ db5.3/dist/Makefile.in
 @@ -897,7 +897,7 @@ $(libsql_version): $(SQL_OBJS)
  
  # Shared SQL library.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-db/db5.3.git