[pkg-db-commits] [SCM] Berkeley DB Debian packaging branch, debian-sid, updated. debian/5.1.25-10-34-g42cbaf8

[Ondřej Surý]

The following commit has been merged in the debian-sid branch:
commit 428bdd652e238ab60df169acd83c36658ba34b91
Author: Ondřej Surý <ondrej at sury.org>
Date:   Fri Sep 23 11:46:51 2011 +0200

    Refresh patches to the new release

diff --git a/debian/patches/002-versioned_symbols.patch b/debian/patches/002-versioned_symbols.patch
index 5ea6219..4cd3989 100644
--- a/debian/patches/002-versioned_symbols.patch
+++ b/debian/patches/002-versioned_symbols.patch
@@ -1,6 +1,6 @@
---- db-5.1.25.orig/dist/Makefile.in
-+++ db-5.1.25/dist/Makefile.in
-@@ -820,9 +820,15 @@ $(libdb_version): $(C_OBJS)
+--- a/dist/Makefile.in
++++ b/dist/Makefile.in
+@@ -846,9 +846,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 557d140..d97bdef 100644
--- a/debian/patches/003-jni_javac.patch
+++ b/debian/patches/003-jni_javac.patch
@@ -1,6 +1,6 @@
---- db-5.1.25.orig/dist/configure
-+++ db-5.1.25/dist/configure
-@@ -17473,7 +17473,7 @@ $as_echo "$_cur" >&6; }
+--- a/dist/configure
++++ b/dist/configure
+@@ -18399,7 +18399,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";;
---- db-5.1.25.orig/dist/aclocal_java/ac_jni_include_dirs.m4
-+++ db-5.1.25/dist/aclocal_java/ac_jni_include_dirs.m4
+--- a/dist/aclocal_java/ac_jni_include_dirs.m4
++++ b/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 2baee57..0eb0755 100644
--- a/debian/patches/004-tclsleep.patch
+++ b/debian/patches/004-tclsleep.patch
@@ -1,5 +1,5 @@
---- db-5.1.25.orig/test/tcl/env012.tcl
-+++ db-5.1.25/test/tcl/env012.tcl
+--- a/test/tcl/env012.tcl
++++ b/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 34e2b1a..0997d5f 100644
--- a/debian/patches/005-pg_crypt_size.patch
+++ b/debian/patches/005-pg_crypt_size.patch
@@ -1,6 +1,6 @@
---- db-5.1.25.orig/src/dbinc/db_page.h
-+++ db-5.1.25/src/dbinc/db_page.h
-@@ -226,6 +226,17 @@ typedef struct __pg_crypto {
+--- a/src/dbinc/db_page.h
++++ b/src/dbinc/db_page.h
+@@ -256,6 +256,17 @@ typedef struct __pg_crypto {
  	 */
  } PG_CRYPTO;
  
@@ -18,7 +18,7 @@
  typedef struct _db_page {
  	DB_LSN	  lsn;		/* 00-07: Log sequence number. */
  	db_pgno_t pgno;		/* 08-11: Current page number. */
-@@ -261,7 +272,7 @@ typedef struct _db_page {
+@@ -291,7 +302,7 @@ typedef struct _db_page {
   */
  #define	P_INP(dbp, pg)							\
  	((db_indx_t *)((u_int8_t *)(pg) + SIZEOF_PAGE +			\
diff --git a/debian/patches/006-mutex_alignment.patch b/debian/patches/006-mutex_alignment.patch
index f18e41d..88d890a 100644
--- a/debian/patches/006-mutex_alignment.patch
+++ b/debian/patches/006-mutex_alignment.patch
@@ -1,5 +1,5 @@
---- db-5.1.25.orig/src/dbinc/mutex_int.h
-+++ db-5.1.25/src/dbinc/mutex_int.h
+--- a/src/dbinc/mutex_int.h
++++ b/src/dbinc/mutex_int.h
 @@ -850,7 +850,11 @@ typedef volatile unsigned char tsl_t;
   * alignment locally.
   */

-- 
Berkeley DB Debian packaging