diff -Nru db4.8-4.8.30/debian/changelog db4.8-4.8.30/debian/changelog --- db4.8-4.8.30/debian/changelog 2015-04-23 02:44:57.000000000 +0000 +++ db4.8-4.8.30/debian/changelog 2012-01-08 03:41:34.000000000 +0000 @@ -1,26 +1,78 @@ -db4.8 (4.8.30-vivid1) vivid; urgency=low +db4.8 (4.8.30-10precise1) precise; urgency=low - * Mark for vivid. + * Mark for precise. - -- Matt Corallo (BlueMatt) Wed, 22 Apr 2015 19:45:00 -0700 + -- Matt Corallo Sat, 7 Jan 2011 22:41:00 -0500 -db4.8 (4.8.30-utopic1) utopic; urgency=low +db4.8 (4.8.30-10oneiric3) oneiric; urgency=low - * Mark for utopic. + * Change depends so that install works. - -- Matt Corallo (BlueMatt) Fri, 24 Oct 2014 20:59:00 -0500 + -- Matt Corallo Tue, 8 Nov 2011 14:49:00 -0500 -db4.8 (4.8.30-raring2) raring; urgency=low +db4.8 (4.8.30-10oneiric2) oneiric; urgency=low - * Mark for raring. + * Remove all but libdb4.8++* packages. - -- Matt Corallo Sat, 04 May 2013 21:40:00 +0100 + -- Matt Corallo Sun, 30 Oct 2011 16:34:00 -0400 -db4.8 (4.8.30-quantal2) quantal; urgency=low +db4.8 (4.8.30-10oneiric1) oneiric; urgency=low - * Mark for quantal. + * Bump version for no reason. - -- Matt Corallo Wed, 24 Oct 2012 14:54:00 -0400 + -- Matt Corallo Fri, 28 Oct 2011 13:12:00 -0400 + +db4.8 (4.8.30-5ubuntu2) natty; urgency=low + + * Build for multiarch, adding Pre-Depends: multiarch-support to the shared + library packages. + * Use DESTDIR instead of prefix when installing. + + -- Steve Langasek Wed, 16 Mar 2011 18:10:53 -0700 + +db4.8 (4.8.30-5ubuntu1) natty; urgency=low + + * Build with -mno-vsx on ppc64, otherwise the tests fail. + + -- Colin Watson Fri, 04 Mar 2011 15:31:46 +0000 + +db4.8 (4.8.30-5) unstable; urgency=low + + * Orphan the package. + + -- Clint Adams Fri, 11 Feb 2011 20:40:32 -0500 + +db4.8 (4.8.30-4) unstable; urgency=low + + [ Thorsten Glaser ] + * Fix manpage-has-errors-from-man lintian warning + * Add db4.7_codegen(1) from db4.7 (4.7.25-12), renamed appropriately + * Correct db4.8-util override disparity + * Use mktemp -t not --tmpdir to be backportable. (Closes: #584934) + * Mark testsuite failures non-fatal on Hurd + + [ Clint Adams ] + * Patch from Steve Langasek to make db4.8 cross-compilable. + closes: #611697. + * Build Java package on armel. + + -- Clint Adams Mon, 31 Jan 2011 22:00:04 -0500 + +db4.8 (4.8.30-3ubuntu1) natty; urgency=low + + * Enable both native & cross building by using DEB_HOST variables, + rather than DEB_BUILD ones. + * Pass correct values to configure for cross building + * Use correct binutils for cross building + + -- Peter Pearse Mon, 31 Jan 2011 13:08:05 +0000 + +db4.8 (4.8.30-3) unstable; urgency=low + + * Patch from Matthias Klose to work around newer binutils breakage on + mips. closes: #604771. + + -- Clint Adams Thu, 25 Nov 2010 12:20:41 -0500 db4.8 (4.8.30-2) unstable; urgency=high diff -Nru db4.8-4.8.30/debian/control db4.8-4.8.30/debian/control --- db4.8-4.8.30/debian/control 2010-08-29 21:21:03.000000000 +0000 +++ db4.8-4.8.30/debian/control 2011-11-08 19:48:21.000000000 +0000 @@ -1,64 +1,13 @@ Source: db4.8 Section: libs Priority: standard -Maintainer: Clint Adams +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian QA Group Standards-Version: 3.9.1 -Build-Depends: tcl8.5-dev, procps [!hurd-i386], default-jdk-builddep [!arm !hppa !hurd-i386 !m32r !avr32] +Build-Depends: tcl8.5-dev, procps [!hurd-i386], default-jdk-builddep [!arm !hppa !hurd-i386 !m32r !avr32], dpkg-dev (>= 1.16.0~ubuntu4) Homepage: http://www.oracle.com/technology/software/products/berkeley-db/index.html -Vcs-Browser: http://git.debian.org/?p=private/schizo/db.git;a=shortlog;h=refs/heads/db4.8 -Vcs-Git: git://git.debian.org/git/private/schizo/db.git - -Package: db4.8-doc -Architecture: all -Section: doc -Priority: optional -Description: Berkeley v4.8 Database Documentation [html] - This package contains documentation in HTML format for all of - the APIs (C, C++, C#, STL, Java, Tcl) and utilities provided - by version 4.8 of Berkeley DB. - -Package: libdb4.8-dev -Architecture: any -Section: libdevel -Priority: extra -Depends: libdb4.8 (= ${binary:Version}) -Suggests: db4.8-doc -Conflicts: libdb1-dev, libdb2-dev, libdb3-dev, libdb4.2-dev, libdb4.3-dev, libdb4.4-dev, libdb4.5-dev, libdb4.6-dev, libdb4.7-dev -Description: Berkeley v4.8 Database Libraries [development] - This is the development package which contains headers and static - libraries for the Berkeley v4.8 database library. - -Package: libdb4.8 -Architecture: any -Conflicts: libdb2 (<< 2:2.7.7-3) -Section: libs -Priority: standard -Depends: ${shlibs:Depends} -Description: Berkeley v4.8 Database Libraries [runtime] - This is the runtime package for programs that use the v4.8 Berkeley - database library. - -Package: db4.8-util -Architecture: any -Section: utils -Priority: optional -Depends: ${shlibs:Depends} -Description: Berkeley v4.8 Database Utilities - This package provides different tools for manipulating databases - in the Berkeley v4.8 database format, and includes: - - db4.8_archive: write the pathnames of the log files no longer in use. - - db4.8_checkpoint: daemon process to monitor the database log and - checkpoint it periodically. - - db4.8_deadlock: traverse the database environment lock region and - abort lock requests when a deadlock is detected. - - db4.8_load: loads (and creates) a database from standard input. - - db4.8_dump: read a database file and write it in a format understood - by db4.{2..8}_load. - - db4.8_printlog: dump log files in human readable format. - - db4.8_stat: display statistics for Berkeley DB environments. - - db4.8_upgrade: upgrades the version of files and the databases they - contain. - - db4.8_verify: check the structure of files and their databases. +Vcs-Browser: http://git.debian.org/?p=collab-maint/db.git;a=shortlog;h=refs/heads/db4.8 +Vcs-Git: git://git.debian.org/git/collab-maint/db.git Package: libdb4.8++ Architecture: any @@ -66,6 +15,8 @@ Conflicts: libdb2++ (<< 2:2.7.7-3) Section: libs Priority: optional +Multi-Arch: same +Pre-Depends: multiarch-support Description: Berkeley v4.8 Database Libraries for C++ [runtime] This is the runtime package for programs that use the Berkeley v4.8 database library. This is only for programs which use the C++ interface. @@ -76,61 +27,8 @@ Conflicts: libdb2++-dev, libdb++-dev, libdb3++-dev Section: libdevel Priority: extra -Depends: libdb4.8++ (= ${binary:Version}), libdb4.8-dev (= ${binary:Version}) +Depends: libdb4.8++ (= ${binary:Version}), libdb4.8-dev Description: Berkeley v4.8 Database Libraries for C++ [development] This is the development package which contains headers and static libraries for the Berkeley v4.8 database library. This is only for programs which will use the C++ interface. - -Package: libdb4.8-tcl -Architecture: any -Section: interpreters -Priority: extra -Conflicts: libdb3-tcl, libdb4.0-tcl, libdb4.1-tcl, libdb4.2-tcl, libdb4.3-tcl, libdb4.4-tcl, libdb4.5-tcl, libdb4.6-tcl, libdb4.7-tcl -Depends: ${shlibs:Depends} -Description: Berkeley v4.8 Database Libraries for Tcl [module] - This package provides a Tcl module suitable for accessing Berkeley v4.8 - databases from within Tcl programs. - -Package: libdb4.8-dbg -Architecture: any -Section: debug -Priority: extra -Depends: libdb4.8 (= ${binary:Version}) -Description: Berkeley v4.8 Database Libraries [debug] - This package provides the debug symbols for the Berkeley v4.8 database - library. - -Package: libdb4.8-java -Architecture: any -Section: java -Priority: optional -Provides: libdb-java -Conflicts: libdb-java -Depends: ${shlibs:Depends} -Recommends: libdb4.8-java-gcj -Description: Berkeley v4.8 Database Libraries for Java - This package provides the Java interface for the Berkeley v4.8 database - library. - -Package: libdb4.8-java-gcj -Architecture: any -Section: java -Priority: optional -Depends: libdb4.8-java (>= ${source:Version}), libgcj-common (>> 1:4.1.1-13), ${shlibs:Depends} -Description: Berkeley v4.8 Database Libraries for Java (native code) - This package provides the Java interface for the Berkeley v4.8 database - library. - . - This package contains the natively compiled code for use by gij. - -Package: libdb4.8-java-dev -Architecture: any -Section: libdevel -Priority: optional -Provides: libdb-java-dev -Conflicts: libdb-java-dev -Depends: ${shlibs:Depends}, libdb4.8-java -Description: Berkeley v4.8 Database Libraries for Java [development] - This package provides the Java interface for the Berkeley v4.8 database - library. diff -Nru db4.8-4.8.30/debian/manpages/db4.8_checkpoint.1 db4.8-4.8.30/debian/manpages/db4.8_checkpoint.1 --- db4.8-4.8.30/debian/manpages/db4.8_checkpoint.1 2010-08-29 21:21:03.000000000 +0000 +++ db4.8-4.8.30/debian/manpages/db4.8_checkpoint.1 2011-03-17 00:54:00.000000000 +0000 @@ -24,7 +24,7 @@ following format, where \fI###\fR is the process ID, and the date is the time the utility was started. .sp -.TR 8 +.TP 8 db_checkpoint: ### Wed Jun 15 01:23:45 EDT 1995 .sp This file will be removed if the db4.8_checkpoint utility exits gracefully. diff -Nru db4.8-4.8.30/debian/manpages/db4.8_codegen.1 db4.8-4.8.30/debian/manpages/db4.8_codegen.1 --- db4.8-4.8.30/debian/manpages/db4.8_codegen.1 1970-01-01 00:00:00.000000000 +0000 +++ db4.8-4.8.30/debian/manpages/db4.8_codegen.1 2011-03-17 00:54:00.000000000 +0000 @@ -0,0 +1,319 @@ +.\" Copyright \(co 2010 by Thorsten Glaser +.\" +.\" +.\" +.\" +.Dd January 12, 2011 +.Dt DB4.8_CODEGEN 1 +.Os "Berkeley DB" +.Sh NAME +.Nm db4.8_codegen +.Nd generate application code for Berkeley DB +.Sh SYNOPSIS +.Nm +.Op Fl Vv +.Op Fl a Ar api +.Op Fl i Ar file +.Op Fl o Ar prefix +.Sh DESCRIPTION +The +.Nm +utility generates application code to create and configure +Berkeley DB database environments and databases based on a simple +description language and writes it to one or more output files. +The generated code may need modification, in the case of complicated +applications, but will usually significantly reduce the time required +to create Berkeley DB applications. +.Pp +The options are as follows: +.Bl -tag -width XXX +.It Fl a Ar api +Generate code for the specified API +.Pq currently, only Do c Dc is accepted . +.It Fl i Ar file +Specify an input +.Ar file ; +by default, standard input is used. +.It Fl o Ar prefix +Specify an output file +.Ar prefix ; +by default, +.Dq application +is used. +.It Fl V +Write the library version number to standard output and exit. +.It Fl v +Run in verbose mode. +.El +.Pp +The +.Nm +utility exits 0 on success, and >0 if an error occurs. +.Sh C Language Specific Information +By default, when the +.Nm +utility generates C-language code, the output file is named +.Dq Pa application.c . +The output filename can be specified with the +.Fl o +option. +.Pp +At the beginning of the output file is a list of public database environment +.Pq Vt DB_ENV +handles and database +.Pq Vt DB +handles, as specified by the description language. +The database environment handle variables are named +.Dq Ar XXX Ns _dbenv , +where +.Dq Ar XXX +is the name of the environment in the input specification. +For databases associated with a database environment, the database +handle variables are named +.Dq Ar XXX Ns _ Ns Ar YYY , +where +.Dq Ar XXX +is the name of the environment, and +.Dq Ar YYY +is the name of the database. +For standalone databases, the database handle variables are named +.Dq Ar XXX , +where +.Dq Ar XXX +is the name of the database. +.Pp +There are two public functions in the output file: +.Fn bdb_startup +and +.Fn bdb_shutdown . +The +.Fn bdb_startup +function should be called to create and configure the database +environments and databases, and the +.Fn bdb_shutdown +function should be called to gracefully shut down the environments +and databases. +.Sh Specification Language +The +.Nm +uses a simple description language: +.Pp +.Bl -bullet -compact +.It +Lines in the input consist of white-space separated tokens. +.It +Tokens are case-insensitive. +.It +Empty lines and lines where the first non-space character is a hash mark +.Pq Dq \&# +are ignored. +In addition, hash marks may appear in lines, in which case the content +of the line from the hash mark to the end of the line is ignored. +.El +.Pp +There are two top-level objects: +.Dq environment +and +.Dq database , +which correspond to database environments and databases, respectively. +These top-level objects can be associated with keywords to describe +their configuration and relationships. +.Pp +For example, the following input would create two standalone databases: +.Bd -literal -offset indent +database data_one { + type btree +} +database data_two { + type btree +} +.Ed +.Pp +In this case, there would be no +.Vt DB_ENV +handle, and the public +.Vt DB +handles would be: +.Bd -literal -offset indent +DB *data_one; +DB *data_two; +.Ed +.Pp +For example, the following input would create a database environment which +contains three databases: +.Bd -literal -offset indent +environment myenv { + database data_one { + type btree + } + database data_two { + type btree + } + database data_three { + type btree + } +} +.Ed +.Pp +In this case, the public +.Vt DB_ENV +and +.Vt DB +handles would be: +.Bd -literal -offset indent +DB_ENV *myenv_dbenv; +DB *myenv_data_one; +DB *myenv_data_two; +DB *myenv_data_three; +.Ed +.Pp +A variety of keywords can be specified for the databases and the environments. +For example, the cache size can be specified for the database environment, +and the page size can be specified for the database, as well as for secondary +relationships: +.Bd -literal -offset indent +environment myenv { + cachesize 2 0 10 + database data_one { + type btree + pagesize 1024 + } + database data_two { + primary data_one + secondary_offset 10 15 + type btree + pagesize 32768 + } + database data_three { + type btree + pagesize 512 + } +} +.Ed +.Ss Environment Keywords +.Bl -tag -width secondary_offset +.It Ic environment +Start a database environment block. +.Pp +There must be three tokens on the line: the keyword, the name of the +environment and an opening brace +.Pq Dq \&{ . +.It Ic home +Specify the database environment home directory. +.Pp +There must be two tokens on the line: the keyword and the home directory. +.It Ic cachesize +Specify the database environment cache size. +.Pp +There must be two tokens on the line: the keyword, the gigabytes of cache, +the bytes of cache, and the number of caches (the number of underlying +physical areas into which the cache is logically divided). +.It Ic private +Specify the database environment is private. +.Pp +There must be one token on the line: the keyword by itself. +.It Ic \&} +End the database environment block. +.Pp +There must be one token on the line: the keyword by itself. +.El +.Ss Database Keywords +.Bl -tag -width secondary_offset +.It Ic database +Start a database block. +.Pp +There must be three tokens on the line: the keyword, the name of the +database and an opening brace +.Pq Dq \&{ . +.It Ic custom +Specify a custom key-comparison routine. +This is used when the Btree database requires a specific sort that +.Nm +cannot generate. +A stub key comparison routine will be created and configured for the +database which should be modified as necessary. +See the +.Dq Ic key_type +keyword for more information. +.Pp +There must be one token on the line: the keyword by itself. +.It Ic dupsort +Configure the database to support sorted duplicates. +.Pp +There must be one token on the line: the keyword by itself. +.It Ic extentsize +Configure the size of the Queue database extent files. +.Pp +There must be two tokens on the line: the keyword and the extent file +size, as a number of pages. +.It Ic key_type +Configure a integral type key-comparison routine. +This is used when the Btree database key is an integral type (such as +.Dq Vt "unsigned int" +or +.Dq Vt u_int32_t ) . +Any C-language integral type may be specified. +See the +.Dq Ic custom +keyword for more information. +A Btree comparison routine based on the type of the key will be +created and configured. +.Pp +There must be two tokens on the line: the keyword and the type. +.It Ic pagesize +Configure the database page size. +.Pp +There must be two tokens on the line: the keyword and the page size in bytes. +.It Ic primary +Configure the database as a secondary index. +A stub secondary callback routine will be created and configured for the +database, which should be modified as necessary. +See the +.Dq Ic secondary_offset +keyword for more information. +.Pp +There must be two tokens on the line: the keyword and the +name of the primary database for which this database is a secondary. +.It Ic recnum +Configure the Btree database to support record number access. +.Pp +There must be one token on the line: the keyword by itself. +.It Ic re_len +Configure the record length for a Queue database or a fixed-length +Recno database. +.Pp +There must be two tokens on the line: the keyword and the length +of a record, in bytes. +.Pp +.It Ic secondary_offset +Configure a secondary callback routine based on a byte string found +in the primary database's data item. +.Pp +There must be three tokens on the line: the keyword, the byte offset from +the beginning of the primary data item where the secondary key occurs, and +the length of the secondary key in bytes. +.It Ic transaction +Configure the database (and, by extension, the database environment), +to be transactional. +.Pp +There must be one token on the line: the keyword by itself. +.It Ic type +Configure the database type. +.Pp +There must be two tokens on the line: the keyword and the type, +where the type is one of +.Dq btree , +.Dq hash , +.Dq queue +or +.Dq recno . +.It Ic \&} +End the database environment block. +.Pp +There must be one token on the line: the keyword by itself. +.El +.Sh AUTHORS +.An Thorsten Glaser Aq tg@debian.org +wrote this manual page for the Debian project (but may be +used by others) after the original HTML format documentation +Copyright \(co 1996,2008 Oracle. All rights reserved. diff -Nru db4.8-4.8.30/debian/manpages/db4.8_deadlock.1 db4.8-4.8.30/debian/manpages/db4.8_deadlock.1 --- db4.8-4.8.30/debian/manpages/db4.8_deadlock.1 2010-08-29 21:21:03.000000000 +0000 +++ db4.8-4.8.30/debian/manpages/db4.8_deadlock.1 2011-03-17 00:54:00.000000000 +0000 @@ -47,7 +47,7 @@ following format, where \fI###\fR is the process ID, and the date is the time the utility was started. .sp -.TR 8 +.TP 8 db_deadlock: ### Wed Jun 15 01:23:45 EDT 1995 .sp This file will be removed if the db4.8_deadlock utility exits gracefully. diff -Nru db4.8-4.8.30/debian/manpages/db4.8_load.1 db4.8-4.8.30/debian/manpages/db4.8_load.1 --- db4.8-4.8.30/debian/manpages/db4.8_load.1 2010-08-29 21:21:03.000000000 +0000 +++ db4.8-4.8.30/debian/manpages/db4.8_load.1 2011-03-17 00:54:00.000000000 +0000 @@ -124,7 +124,7 @@ \fI/etc/passwd\fR file into a database, with the login name as the key item and the entire password entry as the data item: .PP -.TR 8 +.TP 8 awk \-F: '{print $1; print $0}' < /etc/passwd | sed 's/\\\\/\\\\\\\\/g' | db4.8_load \-T \-t hash passwd.db .PP diff -Nru db4.8-4.8.30/debian/patches/debian-changes-4.8.30-2 db4.8-4.8.30/debian/patches/debian-changes-4.8.30-2 --- db4.8-4.8.30/debian/patches/debian-changes-4.8.30-2 2010-08-29 21:25:39.000000000 +0000 +++ db4.8-4.8.30/debian/patches/debian-changes-4.8.30-2 1970-01-01 00:00:00.000000000 +0000 @@ -1,148 +0,0 @@ -Description: Upstream changes introduced in version 4.8.30-2 - This patch has been created by dpkg-source during the package build. - Here's the last changelog entry, hopefully it gives details on why - those changes were made: - . - db4.8 (4.8.30-2) unstable; urgency=high - . - * Bump to Standards-Version 3.9.1. - * Patch from Aurelien Jarno to avoid following javac symlinks to - ultimately avoid failing to equate /usr/lib/jvm/default- - java/bin/../../../.. to /usr when using GCJ. closes: #594816. - . - The person named in the Author field signed this changelog entry. -Author: Clint Adams -Bug-Debian: http://bugs.debian.org/594816 - ---- -The information above should follow the Patch Tagging Guidelines, please -checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here -are templates for supplementary fields that you might want to add: - -Origin: , -Bug: -Bug-Debian: http://bugs.debian.org/ -Bug-Ubuntu: https://launchpad.net/bugs/ -Forwarded: -Reviewed-By: -Last-Update: - ---- db4.8-4.8.30.orig/test/env012.tcl -+++ db4.8-4.8.30/test/env012.tcl -@@ -75,7 +75,7 @@ proc env012 { } { - $testdir $testfile PUT $key $data RECOVER 0 10 &] - - # Wait a while so process 1 has a chance to get going. -- tclsleep 2 -+ tclsleep 4 - - puts "\t\tEnv$tnum.b2: Start process 2." - set p2 [exec $tclsh_path $test_path/wrap.tcl envscript.tcl \ ---- db4.8-4.8.30.orig/docs/api_reference/CXX/dbcursor.html -+++ db4.8-4.8.30/docs/api_reference/CXX/dbcursor.html -@@ -94,7 +94,7 @@ Db::cursor(DbTxn *txnid, Dbc **cursorp, -
    -
  • -

    -- DB_BULK -+ DB_CURSOR_BULK -

    -

    - Configure a cursor to optimize for bulk operations. Each ---- db4.8-4.8.30.orig/docs/api_reference/C/dbcursor.html -+++ db4.8-4.8.30/docs/api_reference/C/dbcursor.html -@@ -92,7 +92,7 @@ DB->cursor(DB *db, DB_TXN *txnid, DBC -

      -
    • -

      -- DB_BULK -+ DB_CURSOR_BULK -

      -

      - Configure a cursor to optimize for bulk operations. Each ---- db4.8-4.8.30.orig/dbinc/mutex_int.h -+++ db4.8-4.8.30/dbinc/mutex_int.h -@@ -850,7 +850,11 @@ typedef volatile unsigned char tsl_t; - * alignment locally. - */ - #ifndef MUTEX_ALIGN --#define MUTEX_ALIGN sizeof(unsigned int) -+# if defined(__linux__) && defined(__sparc__) -+# define MUTEX_ALIGN 8 -+# else -+# define MUTEX_ALIGN sizeof(unsigned int) -+# endif - #endif - - /* ---- db4.8-4.8.30.orig/dbinc/db_page.h -+++ db4.8-4.8.30/dbinc/db_page.h -@@ -226,6 +226,17 @@ typedef struct __pg_crypto { - */ - } PG_CRYPTO; - -+/* -+ * With most compilers sizeof(PG_CRYPTO) == 38. However some ABIs -+ * require it to be padded to 40 bytes. The padding must be excluded -+ * from our size calculations due to the 16-byte alignment requirement -+ * for crypto. -+ * -+ * A similar problem applies to PG_CHKSUM, but it's too late to change -+ * that. -+ */ -+#define SIZEOF_PG_CRYPTO 38 -+ - 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 { - */ - #define P_INP(dbp, pg) \ - ((db_indx_t *)((u_int8_t *)(pg) + SIZEOF_PAGE + \ -- (F_ISSET((dbp), DB_AM_ENCRYPT) ? sizeof(PG_CRYPTO) : \ -+ (F_ISSET((dbp), DB_AM_ENCRYPT) ? SIZEOF_PG_CRYPTO : \ - (F_ISSET((dbp), DB_AM_CHKSUM) ? sizeof(PG_CHKSUM) : 0)))) - - #define P_IV(dbp, pg) \ ---- db4.8-4.8.30.orig/dist/Makefile.in -+++ db4.8-4.8.30/dist/Makefile.in -@@ -766,9 +766,15 @@ $(libdb_version): $(C_OBJS) - $(RM) $(libdb) - $(LN) -s $(libdb_version) $(libdb) - -+Versions: $(C_OBJS) -+ rm -f $@ -+ printf "DB4_8 {\n global:\n" > $@ -+ nm `sed -n "/^pic_object='\(.*\)'$$/ { s//\1/;p;}" $(C_OBJS)` | grep " [TR] " | cut -d" " -f3 | sed -e 's/$$/;/' >> $@ -+ printf "local: *; };\n" >> $@ -+ - # Shared C library. --$(libso_target): $(C_OBJS) -- $(SOLINK) $(SOFLAGS) $(LDFLAGS) -o $@ $(C_OBJS) $(LIBCSO_LIBS) -+$(libso_target): $(C_OBJS) Versions -+ $(SOLINK) $(SOFLAGS) -Wl,--version-script=Versions $(LDFLAGS) -o $@ $(C_OBJS) $(LIBCSO_LIBS) - $(RM) $(libdb) - $(LN) -s .libs/$(libdb_version) $(libdb) - ---- db4.8-4.8.30.orig/dist/configure -+++ db4.8-4.8.30/dist/configure -@@ -16858,7 +16858,7 @@ $as_echo "$_cur" >&6; } - done - _ACJNI_FOLLOWED="$_cur" - --_JTOPDIR=`echo "$_ACJNI_FOLLOWED" | sed -e 's://*:/:g' -e 's:/[^/]*$::'` -+_JTOPDIR=`echo "$_ACJNI_JAVAC" | sed -e 's://*:/:g' -e 's:/[^/]*$::'` - case "$host_os" in - darwin*) _JTOPDIR=`echo "$_JTOPDIR" | sed -e 's:/[^/]*$::'` - _JINC="$_JTOPDIR/Headers";; ---- db4.8-4.8.30.orig/dist/aclocal_java/ac_jni_include_dirs.m4 -+++ db4.8-4.8.30/dist/aclocal_java/ac_jni_include_dirs.m4 -@@ -44,7 +44,7 @@ case "$_ACJNI_JAVAC" in - esac - - _ACJNI_FOLLOW_SYMLINKS("$_ACJNI_JAVAC") --_JTOPDIR=`echo "$_ACJNI_FOLLOWED" | sed -e 's://*:/:g' -e 's:/[[^/]]*$::'` -+_JTOPDIR=`echo "$_ACJNI_JAVAC" | sed -e 's://*:/:g' -e 's:/[[^/]]*$::'` - case "$host_os" in - darwin*) _JTOPDIR=`echo "$_JTOPDIR" | sed -e 's:/[[^/]]*$::'` - _JINC="$_JTOPDIR/Headers";; diff -Nru db4.8-4.8.30/debian/patches/debian-changes-4.8.30-5 db4.8-4.8.30/debian/patches/debian-changes-4.8.30-5 --- db4.8-4.8.30/debian/patches/debian-changes-4.8.30-5 1970-01-01 00:00:00.000000000 +0000 +++ db4.8-4.8.30/debian/patches/debian-changes-4.8.30-5 2011-03-17 00:54:00.000000000 +0000 @@ -0,0 +1,144 @@ +Description: Upstream changes introduced in version 4.8.30-5 + This patch has been created by dpkg-source during the package build. + Here's the last changelog entry, hopefully it gives details on why + those changes were made: + . + db4.8 (4.8.30-5) unstable; urgency=low + . + * Orphan the package. + . + The person named in the Author field signed this changelog entry. +Author: Clint Adams + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: , +Bug: +Bug-Debian: http://bugs.debian.org/ +Bug-Ubuntu: https://launchpad.net/bugs/ +Forwarded: +Reviewed-By: +Last-Update: + +--- db4.8-4.8.30.orig/test/env012.tcl ++++ db4.8-4.8.30/test/env012.tcl +@@ -75,7 +75,7 @@ proc env012 { } { + $testdir $testfile PUT $key $data RECOVER 0 10 &] + + # Wait a while so process 1 has a chance to get going. +- tclsleep 2 ++ tclsleep 4 + + puts "\t\tEnv$tnum.b2: Start process 2." + set p2 [exec $tclsh_path $test_path/wrap.tcl envscript.tcl \ +--- db4.8-4.8.30.orig/docs/api_reference/CXX/dbcursor.html ++++ db4.8-4.8.30/docs/api_reference/CXX/dbcursor.html +@@ -94,7 +94,7 @@ Db::cursor(DbTxn *txnid, Dbc **cursorp, +

        +
      • +

        +- DB_BULK ++ DB_CURSOR_BULK +

        +

        + Configure a cursor to optimize for bulk operations. Each +--- db4.8-4.8.30.orig/docs/api_reference/C/dbcursor.html ++++ db4.8-4.8.30/docs/api_reference/C/dbcursor.html +@@ -92,7 +92,7 @@ DB->cursor(DB *db, DB_TXN *txnid, DBC +

          +
        • +

          +- DB_BULK ++ DB_CURSOR_BULK +

          +

          + Configure a cursor to optimize for bulk operations. Each +--- db4.8-4.8.30.orig/dbinc/mutex_int.h ++++ db4.8-4.8.30/dbinc/mutex_int.h +@@ -850,7 +850,11 @@ typedef volatile unsigned char tsl_t; + * alignment locally. + */ + #ifndef MUTEX_ALIGN +-#define MUTEX_ALIGN sizeof(unsigned int) ++# if defined(__linux__) && defined(__sparc__) ++# define MUTEX_ALIGN 8 ++# else ++# define MUTEX_ALIGN sizeof(unsigned int) ++# endif + #endif + + /* +--- db4.8-4.8.30.orig/dbinc/db_page.h ++++ db4.8-4.8.30/dbinc/db_page.h +@@ -226,6 +226,17 @@ typedef struct __pg_crypto { + */ + } PG_CRYPTO; + ++/* ++ * With most compilers sizeof(PG_CRYPTO) == 38. However some ABIs ++ * require it to be padded to 40 bytes. The padding must be excluded ++ * from our size calculations due to the 16-byte alignment requirement ++ * for crypto. ++ * ++ * A similar problem applies to PG_CHKSUM, but it's too late to change ++ * that. ++ */ ++#define SIZEOF_PG_CRYPTO 38 ++ + 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 { + */ + #define P_INP(dbp, pg) \ + ((db_indx_t *)((u_int8_t *)(pg) + SIZEOF_PAGE + \ +- (F_ISSET((dbp), DB_AM_ENCRYPT) ? sizeof(PG_CRYPTO) : \ ++ (F_ISSET((dbp), DB_AM_ENCRYPT) ? SIZEOF_PG_CRYPTO : \ + (F_ISSET((dbp), DB_AM_CHKSUM) ? sizeof(PG_CHKSUM) : 0)))) + + #define P_IV(dbp, pg) \ +--- db4.8-4.8.30.orig/dist/Makefile.in ++++ db4.8-4.8.30/dist/Makefile.in +@@ -766,9 +766,15 @@ $(libdb_version): $(C_OBJS) + $(RM) $(libdb) + $(LN) -s $(libdb_version) $(libdb) + ++Versions: $(C_OBJS) ++ rm -f $@ ++ printf "DB4_8 {\n global:\n" > $@ ++ nm `sed -n "/^pic_object='\(.*\)'$$/ { s//\1/;s,.libs/,,;p;}" $(C_OBJS)` | grep " [DTR] " | cut -d" " -f3 | sed -e 's/$$/;/' >> $@ ++ printf "local: *; };\n" >> $@ ++ + # Shared C library. +-$(libso_target): $(C_OBJS) +- $(SOLINK) $(SOFLAGS) $(LDFLAGS) -o $@ $(C_OBJS) $(LIBCSO_LIBS) ++$(libso_target): $(C_OBJS) Versions ++ $(SOLINK) $(SOFLAGS) -Wl,--version-script=Versions $(LDFLAGS) -o $@ $(C_OBJS) $(LIBCSO_LIBS) + $(RM) $(libdb) + $(LN) -s .libs/$(libdb_version) $(libdb) + +--- db4.8-4.8.30.orig/dist/configure ++++ db4.8-4.8.30/dist/configure +@@ -16858,7 +16858,7 @@ $as_echo "$_cur" >&6; } + done + _ACJNI_FOLLOWED="$_cur" + +-_JTOPDIR=`echo "$_ACJNI_FOLLOWED" | sed -e 's://*:/:g' -e 's:/[^/]*$::'` ++_JTOPDIR=`echo "$_ACJNI_JAVAC" | sed -e 's://*:/:g' -e 's:/[^/]*$::'` + case "$host_os" in + darwin*) _JTOPDIR=`echo "$_JTOPDIR" | sed -e 's:/[^/]*$::'` + _JINC="$_JTOPDIR/Headers";; +--- db4.8-4.8.30.orig/dist/aclocal_java/ac_jni_include_dirs.m4 ++++ db4.8-4.8.30/dist/aclocal_java/ac_jni_include_dirs.m4 +@@ -44,7 +44,7 @@ case "$_ACJNI_JAVAC" in + esac + + _ACJNI_FOLLOW_SYMLINKS("$_ACJNI_JAVAC") +-_JTOPDIR=`echo "$_ACJNI_FOLLOWED" | sed -e 's://*:/:g' -e 's:/[[^/]]*$::'` ++_JTOPDIR=`echo "$_ACJNI_JAVAC" | sed -e 's://*:/:g' -e 's:/[[^/]]*$::'` + case "$host_os" in + darwin*) _JTOPDIR=`echo "$_JTOPDIR" | sed -e 's:/[[^/]]*$::'` + _JINC="$_JTOPDIR/Headers";; diff -Nru db4.8-4.8.30/debian/patches/series db4.8-4.8.30/debian/patches/series --- db4.8-4.8.30/debian/patches/series 2010-08-29 21:21:35.000000000 +0000 +++ db4.8-4.8.30/debian/patches/series 2011-03-17 00:54:00.000000000 +0000 @@ -1 +1 @@ -debian-changes-4.8.30-2 +debian-changes-4.8.30-5 diff -Nru db4.8-4.8.30/debian/rules db4.8-4.8.30/debian/rules --- db4.8-4.8.30/debian/rules 2010-08-29 21:21:03.000000000 +0000 +++ db4.8-4.8.30/debian/rules 2011-10-30 23:26:38.000000000 +0000 @@ -20,34 +20,58 @@ DEB_BUILD_GNU_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU) DEB_BUILD_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU) DEB_HOST_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) -JAVA_UNSUPPORTED_CPUS = zm32rz zarmz zhppaz zavr32z +ifeq ($(DEB_HOST_ARCH),ppc64) +CFLAGS += -mno-vsx +endif + +JAVA_UNSUPPORTED_CPUS = zm32rz zhppaz zavr32z JAVA_UNSUPPORTED_SYSTEMS = zgnuz zknetbsd-gnuz -include /usr/share/gcj/debian_defaults -CONFIGURE_VARS = CC=gcc CFLAGS="$(CFLAGS)" CPPFLAGS="-I/usr/include/tcl8.5" +ifeq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE)) + CONFIGURE_VARS = CC=gcc CFLAGS="$(CFLAGS)" CPPFLAGS="-I/usr/include/tcl8.5" + TCLDIR=/usr/lib/tcl8.5 +else + CONFIGURE_VARS = CC=$(DEB_HOST_GNU_TYPE)-gcc CXX=$(DEB_HOST_GNU_TYPE)-g++ CFLAGS="$(CFLAGS)" CPPFLAGS="-I/usr/$(DEB_HOST_GNU_TYPE)/include/tcl8.5" + TCLDIR=/usr/$(DEB_HOST_GNU_TYPE)/lib/tcl8.5 +endif + CONFIGURE_SWITCHES = --prefix=/usr \ --mandir=\$${prefix}/share/man \ --localstatedir=/var \ --sysconfdir=/etc \ - --libexecdir=/usr/lib \ + --libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \ + --libexecdir=/usr/lib/ \ --enable-cxx \ --enable-compat185 \ --enable-tcl \ - --with-tcl=/usr/lib/tcl8.5 \ + --with-tcl=$(TCLDIR) \ --enable-test -DB_BINARY_PKGS = libdb4.8 libdb4.8-dev libdb4.8++ libdb4.8++-dev libdb4.8-tcl db4.8-util libdb4.8-dbg +#DB_BINARY_PKGS = libdb4.8 libdb4.8-dev libdb4.8++ libdb4.8++-dev libdb4.8-tcl db4.8-util libdb4.8-dbg +DB_BINARY_PKGS = libdb4.8++ libdb4.8++-dev ifeq (zx86_64-linux-gnuz,z$(DEB_HOST_GNU_TYPE)z) CONFIGURE_SWITCHES += --with-mutex=POSIX/pthreads/library endif -ifeq (,$(findstring z$(DEB_BUILD_GNU_CPU)z,$(JAVA_UNSUPPORTED_CPUS))) -ifeq (,$(findstring z$(DEB_BUILD_GNU_SYSTEM)z,$(JAVA_UNSUPPORTED_SYSTEMS))) +ifeq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE)) + STRIP = strip + OBJCOPY = objcopy +else + STRIP = $(DEB_HOST_GNU_TYPE)-strip + OBJCOPY = $(DEB_HOST_GNU_TYPE)-objcopy + CONFIGURE_SWITCHES += --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) +endif + +ifeq (,$(findstring z$(DEB_HOST_GNU_CPU)z,$(JAVA_UNSUPPORTED_CPUS))) +ifeq (,$(findstring z$(DEB_HOST_GNU_SYSTEM)z,$(JAVA_UNSUPPORTED_SYSTEMS))) JAVA_HOME = /usr/lib/jvm/default-java JAVA_BIN = $(JAVA_HOME)/bin CFLAGS += -I$(JAVA_HOME)/include @@ -57,9 +81,9 @@ CONFIGURE_VARS += JAVA="$(JAVA_BIN)/java" JAR="$(JAVA_BIN)/jar" CONFIGURE_VARS += JAVACFLAGS="$(JAVACFLAGS)" CONFIGURE_SWITCHES += --enable-java -DB_BINARY_PKGS += libdb4.8-java libdb4.8-java-dev +#DB_BINARY_PKGS += libdb4.8-java libdb4.8-java-dev ifneq (,$(filter $(DEB_BUILD_ARCH), $(gcj_native_archs))) -DB_BINARY_PKGS += libdb4.8-java-gcj +#DB_BINARY_PKGS += libdb4.8-java-gcj endif endif endif @@ -68,8 +92,10 @@ CONFIGURE_VARS += STRIP=":" endif -BROKEN_ARCHES = zs390z -VERY_BROKEN_ARCHES = zm68kz zhppaz +BROKEN_CPUS = zs390z +VERY_BROKEN_CPUS = zm68kz zhppaz +BROKEN_SYSTEMS = zgnuz +VERY_BROKEN_SYSTEMS = package=db4.8 bdbversion=4.8 @@ -87,17 +113,22 @@ cd obj && $(MAKE) -ifeq (,$(findstring z$(DEB_BUILD_GNU_CPU)z,$(VERY_BROKEN_ARCHES))) +ifeq (,$(findstring z$(DEB_BUILD_GNU_CPU)z,$(VERY_BROKEN_CPUS))$(findstring z$(DEB_BUILD_GNU_SYSTEM)z,$(VERY_BROKEN_SYSTEMS))) ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS))) chmod +x ./debian/runtests.tclsh cd obj && ../debian/runtests.tclsh || true -ifeq (,$(findstring z$(DEB_BUILD_GNU_CPU)z,$(BROKEN_ARCHES))) +ifeq (,$(findstring z$(DEB_BUILD_GNU_CPU)z,$(BROKEN_CPUS))$(findstring z$(DEB_BUILD_GNU_SYSTEM)z,$(BROKEN_SYSTEMS))) ! grep ^FAIL obj/ALL.OUT else + # Testsuite failures are marked as non-fatal on $(DEB_BUILD_GNU_SYSTEM)-$(DEB_BUILD_GNU_CPU) grep ^FAIL obj/ALL.OUT || true endif +else + # Testsuite has been disabled by DEB_BUILD_OPTIONS=$(DEB_BUILD_OPTIONS) endif +else + # Testsuite has been disabled on $(DEB_BUILD_GNU_SYSTEM)-$(DEB_BUILD_GNU_CPU) endif touch build @@ -116,7 +147,7 @@ rm -rf debian/tmp $(INSTALL_DIR) debian/tmp - cd obj && $(MAKE) install prefix=$(CURDIR)/debian/tmp/usr + cd obj && $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp touch install-stamp @@ -134,10 +165,10 @@ gzip -9frq debian/$(package)-doc/usr/share/doc/$(package)-doc/changelog.Debian cd debian/$(package)-doc && find * -type f ! -regex '^DEBIAN/.*' -print0 | xargs -r0 md5sum > DEBIAN/md5sums - dpkg-gencontrol -isp -p$(package)-doc -Pdebian/$(package)-doc + #dpkg-gencontrol -isp -p$(package)-doc -Pdebian/$(package)-doc chown -R root:root debian/$(package)-doc chmod -R ugo=rX,u+w debian/$(package)-doc - dpkg --build debian/$(package)-doc .. + #dpkg --build debian/$(package)-doc .. binary-arch: checkroot build install-stamp $(checkdir) @@ -145,45 +176,45 @@ rm -rf debian/lib$(package)-dev debian/$(package)-util debian/lib$(package) \ debian/lib$(package)++ debian/lib$(package)++-dev debian/lib$(package)-tcl \ debian/lib$(package)-java debian/lib$(package)-java-dev - $(INSTALL_DIR) debian/lib$(package)-dev/usr/lib \ + $(INSTALL_DIR) debian/lib$(package)-dev/usr/lib/$(DEB_HOST_MULTIARCH) \ debian/$(package)-util/usr/share/man/man1 \ - debian/lib$(package)/usr/lib debian/lib$(package)++/usr/lib \ + debian/lib$(package)/usr/lib/$(DEB_HOST_MULTIARCH) debian/lib$(package)++/usr/lib/$(DEB_HOST_MULTIARCH) \ debian/lib$(package)++-dev/usr/include \ - debian/lib$(package)++-dev/usr/lib \ - debian/lib$(package)-tcl/usr/lib \ - debian/lib$(package)-java/usr/lib \ + debian/lib$(package)++-dev/usr/lib/$(DEB_HOST_MULTIARCH) \ + debian/lib$(package)-tcl/usr/lib/$(DEB_HOST_MULTIARCH) \ + debian/lib$(package)-java/usr/lib/$(DEB_HOST_MULTIARCH) \ debian/lib$(package)-java/usr/share/java \ - debian/lib$(package)-java-dev/usr/lib \ - debian/lib$(package)-dbg/usr/lib/debug/usr/lib + debian/lib$(package)-java-dev/usr/lib/$(DEB_HOST_MULTIARCH) \ + debian/lib$(package)-dbg/usr/lib/debug/usr/lib/$(DEB_HOST_MULTIARCH) - objcopy --only-keep-debug debian/tmp/usr/lib/libdb-$(bdbversion).so \ - debian/lib$(package)-dbg/usr/lib/debug/usr/lib/libdb-$(bdbversion).so.debug + $(OBJCOPY) --only-keep-debug debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libdb-$(bdbversion).so \ + debian/lib$(package)-dbg/usr/lib/debug/usr/lib/$(DEB_HOST_MULTIARCH)/libdb-$(bdbversion).so.debug ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) - strip --remove-section=.note --remove-section=.comment \ - debian/tmp/usr/lib/*.so debian/tmp/usr/bin/* - strip --strip-debug debian/tmp/usr/lib/*.a + $(STRIP) --remove-section=.note --remove-section=.comment \ + debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.so debian/tmp/usr/bin/* + $(STRIP) --strip-debug debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.a endif - objcopy --add-gnu-debuglink=debian/lib$(package)-dbg/usr/lib/debug/usr/lib/libdb-$(bdbversion).so.debug \ - debian/tmp/usr/lib/libdb-$(bdbversion).so + $(OBJCOPY) --add-gnu-debuglink=debian/lib$(package)-dbg/usr/lib/debug/usr/lib/$(DEB_HOST_MULTIARCH)/libdb-$(bdbversion).so.debug \ + debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libdb-$(bdbversion).so - chmod 644 debian/tmp/usr/lib/*.so debian/tmp/usr/include/*.h + chmod 644 debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.so debian/tmp/usr/include/*.h chmod 755 debian/tmp/usr/bin/* cp -a debian/tmp/usr/include debian/lib$(package)-dev/usr cp -a debian/tmp/usr/bin debian/$(package)-util/usr - cp -a debian/tmp/usr/lib/*.so debian/tmp/usr/lib/*.a \ - debian/tmp/usr/lib/*.la debian/lib$(package)-dev/usr/lib -ifeq (,$(findstring z$(DEB_BUILD_GNU_CPU)z,$(JAVA_UNSUPPORTED_CPUS))) -ifeq (,$(findstring z$(DEB_BUILD_GNU_SYSTEM)z,$(JAVA_UNSUPPORTED_SYSTEMS))) - cp -a debian/tmp/usr/lib/db.jar \ + cp -a debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.so debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.a \ + debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.la debian/lib$(package)-dev/usr/lib/$(DEB_HOST_MULTIARCH) +ifeq (,$(findstring z$(DEB_HOST_GNU_CPU)z,$(JAVA_UNSUPPORTED_CPUS))) +ifeq (,$(findstring z$(DEB_HOST_GNU_SYSTEM)z,$(JAVA_UNSUPPORTED_SYSTEMS))) + cp -a debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/db.jar \ debian/lib$(package)-java/usr/share/java/lib$(package)-java-$(version).jar ln -s lib$(package)-java-$(version).jar \ debian/lib$(package)-java/usr/share/java/lib$(package)-java.jar -ifneq (,$(filter $(DEB_BUILD_ARCH), $(gcj_native_archs))) +ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj_native_archs))) mkdir debian/lib$(package)-java-gcj - (TMPFILE=$$(mktemp --tmpdir sourcelist.XXXXXXXXXX) && \ + (TMPFILE=$$(mktemp -t sourcelist.XXXXXXXXXX) && \ find $(CURDIR) -type f ! -type l >$$TMPFILE && \ aot-compile -L /usr/lib/gcj -c -fsource-filename=$$TMPFILE debian/lib$(package)-java debian/lib$(package)-java-gcj/usr/lib/gcj; \ retval=$?; \ @@ -193,25 +224,25 @@ endif endif endif - mv debian/lib$(package)-dev/usr/lib/*cxx* debian/lib$(package)++-dev/usr/lib + mv debian/lib$(package)-dev/usr/lib/$(DEB_HOST_MULTIARCH)/*cxx* debian/lib$(package)++-dev/usr/lib/$(DEB_HOST_MULTIARCH) mv debian/lib$(package)-dev/usr/include/*cxx* debian/lib$(package)++-dev/usr/include - mv debian/lib$(package)-dev/usr/lib/*tcl* debian/lib$(package)-tcl/usr/lib -ifeq (,$(findstring z$(DEB_BUILD_GNU_CPU)z,$(JAVA_UNSUPPORTED_CPUS))) -ifeq (,$(findstring z$(DEB_BUILD_GNU_SYSTEM)z,$(JAVA_UNSUPPORTED_SYSTEMS))) - mv debian/lib$(package)-dev/usr/lib/*java* debian/lib$(package)-java/usr/lib - - mv debian/lib$(package)-java/usr/lib/libdb*.a \ - debian/lib$(package)-java/usr/lib/libdb*.la \ - debian/lib$(package)-java/usr/lib/libdb_java.so \ - debian/lib$(package)-java/usr/lib/libdb_java-4.so \ - debian/lib$(package)-java-dev/usr/lib/ + mv debian/lib$(package)-dev/usr/lib/$(DEB_HOST_MULTIARCH)/*tcl* debian/lib$(package)-tcl/usr/lib/$(DEB_HOST_MULTIARCH) +ifeq (,$(findstring z$(DEB_HOST_GNU_CPU)z,$(JAVA_UNSUPPORTED_CPUS))) +ifeq (,$(findstring z$(DEB_HOST_GNU_SYSTEM)z,$(JAVA_UNSUPPORTED_SYSTEMS))) + mv debian/lib$(package)-dev/usr/lib/$(DEB_HOST_MULTIARCH)/*java* debian/lib$(package)-java/usr/lib/$(DEB_HOST_MULTIARCH) + + mv debian/lib$(package)-java/usr/lib/$(DEB_HOST_MULTIARCH)/libdb*.a \ + debian/lib$(package)-java/usr/lib/$(DEB_HOST_MULTIARCH)/libdb*.la \ + debian/lib$(package)-java/usr/lib/$(DEB_HOST_MULTIARCH)/libdb_java.so \ + debian/lib$(package)-java/usr/lib/$(DEB_HOST_MULTIARCH)/libdb_java-4.so \ + debian/lib$(package)-java-dev/usr/lib/$(DEB_HOST_MULTIARCH)/ endif endif - mv debian/lib$(package)-dev/usr/lib/libdb-$(bdbversion).so debian/lib$(package)/usr/lib - mv debian/lib$(package)++-dev/usr/lib/libdb_cxx-$(bdbversion).so debian/lib$(package)++/usr/lib + mv debian/lib$(package)-dev/usr/lib/$(DEB_HOST_MULTIARCH)/libdb-$(bdbversion).so debian/lib$(package)/usr/lib/$(DEB_HOST_MULTIARCH) + mv debian/lib$(package)++-dev/usr/lib/$(DEB_HOST_MULTIARCH)/libdb_cxx-$(bdbversion).so debian/lib$(package)++/usr/lib/$(DEB_HOST_MULTIARCH) - rm -f debian/lib$(package)-dev/usr/lib/libdb.a - ln -s libdb-$(bdbversion).a debian/lib$(package)-dev/usr/lib/libdb.a + rm -f debian/lib$(package)-dev/usr/lib/$(DEB_HOST_MULTIARCH)/libdb.a + ln -s libdb-$(bdbversion).a debian/lib$(package)-dev/usr/lib/$(DEB_HOST_MULTIARCH)/libdb.a cd debian/$(package)-util/usr/bin && for i in * ; \ do mv $$i `echo $$i | sed 's/db/$(package)/'` ; \ @@ -227,23 +258,23 @@ gzip -9fq debian/$${i}/usr/share/doc/$${i}/changelog.Debian ; \ done - echo 'libdb $(bdbversion) lib$(package)' >debian/lib$(package)/DEBIAN/shlibs + #echo 'libdb $(bdbversion) lib$(package)' >debian/lib$(package)/DEBIAN/shlibs echo 'libdb_cxx $(bdbversion) lib$(package)++' >debian/lib$(package)++/DEBIAN/shlibs - echo 'libdb_tcl $(bdbversion) lib$(package)-tcl' >debian/lib$(package)-tcl/DEBIAN/shlibs -ifeq (,$(findstring z$(DEB_BUILD_GNU_CPU)z,$(JAVA_UNSUPPORTED_CPUS))) -ifeq (,$(findstring z$(DEB_BUILD_GNU_SYSTEM)z,$(JAVA_UNSUPPORTED_SYSTEMS))) - echo 'libdb_java $(bdbversion) lib$(package)-java' >debian/lib$(package)-java/DEBIAN/shlibs - $(INSTALL_SCRIPT) debian/libjava.postinst debian/lib$(package)-java/DEBIAN/postinst + #echo 'libdb_tcl $(bdbversion) lib$(package)-tcl' >debian/lib$(package)-tcl/DEBIAN/shlibs +ifeq (,$(findstring z$(DEB_HOST_GNU_CPU)z,$(JAVA_UNSUPPORTED_CPUS))) +ifeq (,$(findstring z$(DEB_HOST_GNU_SYSTEM)z,$(JAVA_UNSUPPORTED_SYSTEMS))) + #echo 'libdb_java $(bdbversion) lib$(package)-java' >debian/lib$(package)-java/DEBIAN/shlibs + #$(INSTALL_SCRIPT) debian/libjava.postinst debian/lib$(package)-java/DEBIAN/postinst -ifneq (,$(filter $(DEB_BUILD_ARCH), $(gcj_native_archs))) - $(INSTALL_SCRIPT) debian/java-gcj.postrm debian/lib$(package)-java-gcj/DEBIAN/postrm - $(INSTALL_SCRIPT) debian/java-gcj.postinst debian/lib$(package)-java-gcj/DEBIAN/postinst +ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj_native_archs))) + #$(INSTALL_SCRIPT) debian/java-gcj.postrm debian/lib$(package)-java-gcj/DEBIAN/postrm + #$(INSTALL_SCRIPT) debian/java-gcj.postinst debian/lib$(package)-java-gcj/DEBIAN/postinst endif endif endif - $(INSTALL_SCRIPT) debian/libtcl.postinst debian/lib$(package)-tcl/DEBIAN/postinst + #$(INSTALL_SCRIPT) debian/libtcl.postinst debian/lib$(package)-tcl/DEBIAN/postinst $(INSTALL_SCRIPT) debian/lib++.postinst debian/lib$(package)++/DEBIAN/postinst - $(INSTALL_SCRIPT) debian/lib.postinst debian/lib$(package)/DEBIAN/postinst + #$(INSTALL_SCRIPT) debian/lib.postinst debian/lib$(package)/DEBIAN/postinst for i in $(DB_BINARY_PKGS); \ do dpkg-shlibdeps -Tdebian/substvars.$${i} -dDepends `find debian/$${i}/usr/lib -name "*.so"` `find debian/$${i}/usr/bin -type f` ; \