Hi, I'm attaching my patch, but I can't compile the package. The output from debuild:
[...] make[3]: Leaving directory `/tmp/mysql/mysql-dfsg-4.1-4.1.11a/client' Making all in scripts make[3]: Entering directory `/tmp/mysql/mysql-dfsg-4.1-4.1.11a/scripts' /bin/rm -f mysqld_safe mysqld_safe-t /bin/sed \ -e 's!@''bindir''@!/usr/bin!g' \ -e 's!@''sbindir''@!/usr/sbin!g' \ -e 's!@''scriptdir''@!/usr/bin!g' \ -e 's!@''prefix''@!/usr!g' \ -e 's!@''datadir''@!/usr/share!g' \ -e 's!@''localstatedir''@!/var/lib/mysql!g' \ -e 's!@''libexecdir''@!/usr/sbin!g' \ -e 's!@''pkglibdir''@!/usr/lib/mysql!g' \ -e 's!@''pkgincludedir''@!/usr/include/mysql!g' \ -e 's!@''pkgdatadir''@!/usr/share/mysql!g' \ -e 's!@''CC''@!gcc!'\ -e 's!@''CXX''@!g++!'\ -e 's!@''GXX''@!yes!'\ -e 's!@''CC_VERSION''@!gcc (GCC) 3.3.6 (Debian 1:3.3.6-5)!'\ -e 's!@''CXX_VERSION''@!g++ (GCC) 3.3.6 (Debian 1:3.3.6-5)!'\ -e 's!@''PERL''@!/usr/bin/perl!' \ -e 's!@''ASFLAGS''@!!'\ -e 's!@''CFLAGS''@!-O3 -DDBUG_OFF -DBIG_JOINS=1 -O3 !'\ -e 's!@''CXXFLAGS''@!-O3 -DDBUG_OFF -DBIG_JOINS=1 -felide-constructors -fno-rtti -O3 -fno-impli cit-templates -fno-exceptions -fno-rtti!'\ -e 's!@''LDFLAGS''@!!'\ [...] O3 -fno-implicit-templates -fno-exceptions -fno-rtti'!" \ -e 's!@''MYSQLD_USER''@!mysql!' \ -e 's!@''STATIC_NSS_FLAGS''@!!' \ -e 's!@''NON_THREADED_LIBS''@!-lcrypt -lnsl -lm !' \ -e 's!@''ZLIB_DEPS''@!-lz!' \ -e "[EMAIL PROTECTED]@!/usr/bin/make!" \ fill_help_tables.sh > fill_help_tables-t /bin/chmod +x fill_help_tables-t /bin/mv fill_help_tables-t fill_help_tables make[3]: *** No rule to make target `../Docs/manual.texi', needed by `fill_help_tables.sql'. Stop. make[3]: Leaving directory `/tmp/buildd/mysql-dfsg-4.1-4.1.11a/scripts' make[2]: *** [all-recursive] Error 1 make[2]: Leaving directory `/tmp/buildd/mysql-dfsg-4.1-4.1.11a' make[1]: *** [all] Error 2 make[1]: Leaving directory `/tmp/buildd/mysql-dfsg-4.1-4.1.11a' make: *** [build-stamp] Error 2 pbuilder: Failed autobuilding of package -> Aborting with an error It seem that the error is not related to my patch but I'm not sure... I've noticed that automake is running after configure.in is touched, so it might be automake-related problem. -- .''`. Piotr Roszatycki, Netia SA : :' : mailto:[EMAIL PROTECTED] `. `' mailto:[EMAIL PROTECTED] `-
diff -Nru mysql-dfsg-4.1-4.1.11a/debian/patches/00list mysql-dfsg-4.1-4.1.11a.debian/debian/patches/00list --- mysql-dfsg-4.1-4.1.11a/debian/patches/00list 2005-05-19 13:07:08 +0200 +++ mysql-dfsg-4.1-4.1.11a.debian/debian/patches/00list 2005-05-19 13:04:01 +0200 @@ -13,3 +13,4 @@ 38_scripts__mysqld_safe.sh__signals.dpatch 41_scripts__mysql_install_db.sh__no_test.dpatch 45_warn-CLI-passwords.dpatch +50_libdb_with_uniquename.dpatch diff -Nru mysql-dfsg-4.1-4.1.11a/debian/patches/50_libdb_with_uniquename.dpatch mysql-dfsg-4.1-4.1.11a.debian/debian/patches/50_libdb_with_uniquename.dpatch --- mysql-dfsg-4.1-4.1.11a/debian/patches/50_libdb_with_uniquename.dpatch 1970-01-01 01:00:00 +0100 +++ mysql-dfsg-4.1-4.1.11a.debian/debian/patches/50_libdb_with_uniquename.dpatch 2005-05-19 13:03:52 +0200 @@ -0,0 +1,43 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 50_libdb_unique_name.dpatch by <[EMAIL PROTECTED]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: --with-uniquename=_mysql + [EMAIL PROTECTED]@ + +diff -ru mysql-dfsg-4.1-4.1.11a/configure mysql-dfsg-4.1-4.1.11a.debian/configure +--- mysql-dfsg-4.1-4.1.11a/configure 2005-04-01 13:38:07 +0200 ++++ mysql-dfsg-4.1-4.1.11a.debian/configure 2005-05-19 12:59:16 +0200 +@@ -39174,7 +39174,7 @@ + + + echo "CONFIGURING FOR BERKELEY DB" +- bdb_conf_flags="--disable-shared" ++ bdb_conf_flags="--disable-shared --with-uniquename=_mysql" + if test $with_debug = "yes" + then + bdb_conf_flags="$bdb_conf_flags --enable-debug --enable-diagnostic" +diff -ru mysql-dfsg-4.1-4.1.11a/configure.in mysql-dfsg-4.1-4.1.11a.debian/configure.in +--- mysql-dfsg-4.1-4.1.11a/configure.in 2005-04-01 13:36:51 +0200 ++++ mysql-dfsg-4.1-4.1.11a.debian/configure.in 2005-05-19 12:59:16 +0200 +@@ -2915,7 +2915,7 @@ + AC_CONFIG_FILES(bdb/Makefile) + + echo "CONFIGURING FOR BERKELEY DB" +- bdb_conf_flags="--disable-shared" ++ bdb_conf_flags="--disable-shared --with-uniquename=_mysql" + if test $with_debug = "yes" + then + bdb_conf_flags="$bdb_conf_flags --enable-debug --enable-diagnostic" +diff -ru mysql-dfsg-4.1-4.1.11a/sql/ha_berkeley.h mysql-dfsg-4.1-4.1.11a.debian/sql/ha_berkeley.h +--- mysql-dfsg-4.1-4.1.11a/sql/ha_berkeley.h 2005-04-01 13:36:56 +0200 ++++ mysql-dfsg-4.1-4.1.11a.debian/sql/ha_berkeley.h 2005-05-19 13:01:06 +0200 +@@ -22,6 +22,7 @@ + /* class for the the myisam handler */ + ++#include <db_uniquename.h> + #include <db.h> + + #define BDB_HIDDEN_PRIMARY_KEY_LENGTH 5 + diff -Nru mysql-dfsg-4.1-4.1.11a/debian/rules mysql-dfsg-4.1-4.1.11a.debian/debian/rules --- mysql-dfsg-4.1-4.1.11a/debian/rules 2005-05-19 13:07:08 +0200 +++ mysql-dfsg-4.1-4.1.11a.debian/debian/rules 2005-05-19 13:04:34 +0200 @@ -112,6 +112,10 @@ @echo "#42#DEBUG# Grepping for selected bdb mutex:" @if test -f bdb/build_unix/db_config.h && ! egrep define.*HAVE_MUTEX_.*_GCC_ASSEMBLY bdb/build_unix/db_config.h; then echo "MUTEX PATCH FORGOTTEN"; exit 1; fi + # Required by libdb_with_uniquename patch + sed 's/#define[[:space:]]__/#define /; /#define[[:space:]]getcwd getcwd_mysql/,/#define[[:space:]]vsnprintf vsnprintf_mysql/d' \ + bdb/build_unix/db_int_def.h > bdb/build_unix/db_uniquename.h + touch configure-stamp
