Hi, Attached is the diff for my hotkeys 0.5.7.4-0.1 NMU.
[I stripped the diff against the configure generated by running 'autoconf' again]
diff -Nru /tmp/Hclb36QtyX/hotkeys-0.5.7.4/acinclude.m4
/tmp/7K1emgwIQr/hotkeys-0.5.7.4/acinclude.m4
--- /tmp/Hclb36QtyX/hotkeys-0.5.7.4/acinclude.m4 2002-11-25
19:27:13.000000000 +0100
+++ /tmp/7K1emgwIQr/hotkeys-0.5.7.4/acinclude.m4 2007-07-20
16:10:58.000000000 +0200
@@ -337,21 +337,21 @@
dnl-----------------------------------------------------------------------
-dnl Checks for LIBDB3
+dnl Checks for LIBDB
dnl-----------------------------------------------------------------------
-AC_DEFUN(AM_CHECK_DB3,
+AC_DEFUN(AM_CHECK_DB,
[
- if test ! x$db3_libdir = x; then
- LIBS="$LIBS -L$db3_libdir"
+ if test ! x$db_libdir = x; then
+ LIBS="$LIBS -L$db_libdir"
fi
- if test ! x$db3_incdir = x; then
- CPPFLAGS="$CPPFLAGS -I$db3_incdir"
+ if test ! x$db_incdir = x; then
+ CPPFLAGS="$CPPFLAGS -I$db_incdir"
fi
dnl
- dnl We need to check both libdb and libdb3
+ dnl We need to check both libdb and libdb
dnl
- AC_CHECK_LIB(db3, db_create, , [ nodb=yes ])
+ AC_CHECK_LIB(db, db_create, , [ nodb=yes ])
if test "x$nodb" = "xyes"
then
AC_CHECK_LIB(db, db_create, ,
@@ -359,7 +359,7 @@
echo "*** Cannot find a suitable Berkeley DB library on your
system."
echo "*** Version 3.2.9 or above is required."
echo "*** If you've installed it in an unusual location, please"
- echo "*** use --with-db3-inc and --with-db3-lib to specify it."
+ echo "*** use --with-db-inc and --with-db-lib to specify it."
exit 1
])
fi
@@ -367,14 +367,14 @@
dnl
dnl Check its version
dnl
- AC_MSG_CHECKING(for version of db3)
+ AC_MSG_CHECKING(for version of db)
AC_TRY_RUN([
#include <db.h>
int main ()
{
int major=0, minor=0, patch=0;
db_version(&major, &minor, &patch);
- if ( major==3 && ((minor==2 && patch>=9) || minor>2) )
+ if ( major > 3 || (major==3 && ((minor==2 && patch>=9) || minor>2)) )
exit(0);
else
exit(1);
@@ -384,7 +384,7 @@
echo "*** The version of the Berkeley DB library installed is not"
echo "*** 3.2.9 or above, make sure the correct version is installed."
echo "*** If you've installed it in an unusual location, please"
- echo "*** use --with-db3-inc and --with-db3-lib to specify it."
+ echo "*** use --with-db-inc and --with-db-lib to specify it."
exit 1
],
[echo $ac_n "cross compiling; assumed OK... $ac_c"]
diff -Nru /tmp/Hclb36QtyX/hotkeys-0.5.7.4/aclocal.m4
/tmp/7K1emgwIQr/hotkeys-0.5.7.4/aclocal.m4
--- /tmp/Hclb36QtyX/hotkeys-0.5.7.4/aclocal.m4 2002-12-08 15:16:44.000000000
+0100
+++ /tmp/7K1emgwIQr/hotkeys-0.5.7.4/aclocal.m4 2007-07-20 16:10:17.000000000
+0200
@@ -349,21 +349,21 @@
dnl-----------------------------------------------------------------------
-dnl Checks for LIBDB3
+dnl Checks for LIBDB
dnl-----------------------------------------------------------------------
-AC_DEFUN(AM_CHECK_DB3,
+AC_DEFUN(AM_CHECK_DB,
[
- if test ! x$db3_libdir = x; then
- LIBS="$LIBS -L$db3_libdir"
+ if test ! x$db_libdir = x; then
+ LIBS="$LIBS -L$db_libdir"
fi
- if test ! x$db3_incdir = x; then
- CPPFLAGS="$CPPFLAGS -I$db3_incdir"
+ if test ! x$db_incdir = x; then
+ CPPFLAGS="$CPPFLAGS -I$db_incdir"
fi
dnl
- dnl We need to check both libdb and libdb3
+ dnl We need to check both libdb and libdb
dnl
- AC_CHECK_LIB(db3, db_create, , [ nodb=yes ])
+ AC_CHECK_LIB(db, db_create, , [ nodb=yes ])
if test "x$nodb" = "xyes"
then
AC_CHECK_LIB(db, db_create, ,
@@ -371,7 +371,7 @@
echo "*** Cannot find a suitable Berkeley DB library on your
system."
echo "*** Version 3.2.9 or above is required."
echo "*** If you've installed it in an unusual location, please"
- echo "*** use --with-db3-inc and --with-db3-lib to specify it."
+ echo "*** use --with-db-inc and --with-db-lib to specify it."
exit 1
])
fi
@@ -379,14 +379,14 @@
dnl
dnl Check its version
dnl
- AC_MSG_CHECKING(for version of db3)
+ AC_MSG_CHECKING(for version of db)
AC_TRY_RUN([
#include <db.h>
int main ()
{
int major=0, minor=0, patch=0;
db_version(&major, &minor, &patch);
- if ( major==3 && ((minor==2 && patch>=9) || minor>2) )
+ if ( major > 3 || (major==3 && ((minor==2 && patch>=9) || minor>2)) )
exit(0);
else
exit(1);
@@ -396,7 +396,7 @@
echo "*** The version of the Berkeley DB library installed is not"
echo "*** 3.2.9 or above, make sure the correct version is installed."
echo "*** If you've installed it in an unusual location, please"
- echo "*** use --with-db3-inc and --with-db3-lib to specify it."
+ echo "*** use --with-db-inc and --with-db-lib to specify it."
exit 1
],
[echo $ac_n "cross compiling; assumed OK... $ac_c"]
diff -Nru /tmp/Hclb36QtyX/hotkeys-0.5.7.4/ChangeLog
/tmp/7K1emgwIQr/hotkeys-0.5.7.4/ChangeLog
--- /tmp/Hclb36QtyX/hotkeys-0.5.7.4/ChangeLog 2006-01-19 07:43:20.000000000
+0100
+++ /tmp/7K1emgwIQr/hotkeys-0.5.7.4/ChangeLog 2007-07-20 15:54:27.000000000
+0200
@@ -1,3 +1,10 @@
+hotkeys (0.5.7.4-0.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Build against libdb4.3-dev (Closes: 297316).
+
+ -- Pierre Habouzit <[EMAIL PROTECTED]> Fri, 20 Jul 2007 15:53:57 +0200
+
hotkeys (0.5.7.4) unstable; urgency=low
* Changed build-deps due to the xlibs-dev transition. (Closes: #346712)
@@ -328,6 +335,3 @@
-- Anthony Wong <[EMAIL PROTECTED]> Fri, 29 Dec 2000 21:25:58 +0800
-Local variables:
-mode: debian-changelog
-End:
pgp6FuLguRWuq.pgp
Description: PGP signature
