[Pkg-cyrus-sasl2-commits] r424 - in /cyrus-sasl-2.1/branches/heimdal/debian: changelog patches/0017_db4.6.dpatch patches/0017_db4.7.dpatch patches/00list

[fabbe at users.alioth.debian.org]

Author: fabbe
Date: Sun May 10 06:14:32 2009
New Revision: 424

URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/?sc=1&rev=424
Log:
Sync with main package.

Added:
    cyrus-sasl-2.1/branches/heimdal/debian/patches/0017_db4.7.dpatch   (with props)
Removed:
    cyrus-sasl-2.1/branches/heimdal/debian/patches/0017_db4.6.dpatch
Modified:
    cyrus-sasl-2.1/branches/heimdal/debian/changelog
    cyrus-sasl-2.1/branches/heimdal/debian/patches/00list

Modified: cyrus-sasl-2.1/branches/heimdal/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/branches/heimdal/debian/changelog?rev=424&op=diff
==============================================================================
--- cyrus-sasl-2.1/branches/heimdal/debian/changelog (original)
+++ cyrus-sasl-2.1/branches/heimdal/debian/changelog Sun May 10 06:14:32 2009
@@ -1,8 +1,9 @@
 cyrus-sasl2-heimdal (2.1.22.dfsg1-25) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
-
- -- Fabian Fagerholm <fabbe at debian.org>  Sat, 09 May 2009 23:28:04 +0300
+  * Sync with main package.
+
+ -- Fabian Fagerholm <fabbe at debian.org>  Sun, 10 May 2009 08:57:07 +0300
 
 cyrus-sasl2-heimdal (2.1.22.dfsg1-24) unstable; urgency=high
 

Added: cyrus-sasl-2.1/branches/heimdal/debian/patches/0017_db4.7.dpatch
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/branches/heimdal/debian/patches/0017_db4.7.dpatch?rev=424&op=file
==============================================================================
--- cyrus-sasl-2.1/branches/heimdal/debian/patches/0017_db4.7.dpatch (added)
+++ cyrus-sasl-2.1/branches/heimdal/debian/patches/0017_db4.7.dpatch Sun May 10 06:14:32 2009
@@ -1,0 +1,43 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 0017_db4.6.dpatch by Fabian Fagerholm <fabbe at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Support and build against db4.7.
+
+ at DPATCH@
+diff -urNad trunk~/aclocal.m4 trunk/aclocal.m4
+--- trunk~/aclocal.m4	2008-01-07 13:15:47.000000000 +0200
++++ trunk/aclocal.m4	2009-05-10 08:35:13.000000000 +0300
+@@ -1691,7 +1691,7 @@
+ 	fi
+ 
+ 	saved_LIBS=$LIBS
+-        for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
++        for dbname in db-4.7 db4.7 db47 db-4.6 db4.6 db46 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
+           do
+ 	    LIBS="$saved_LIBS -l$dbname"
+ 	    AC_TRY_LINK([#include <db.h>],
+diff -urNad trunk~/cmulocal/berkdb.m4 trunk/cmulocal/berkdb.m4
+--- trunk~/cmulocal/berkdb.m4	2008-01-07 13:15:48.000000000 +0200
++++ trunk/cmulocal/berkdb.m4	2009-05-10 08:35:38.000000000 +0300
+@@ -213,7 +213,7 @@
+ 	fi
+ 
+ 	saved_LIBS=$LIBS
+-        for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
++        for dbname in db-4.7 db4.7 db47 db-4.6 db4.6 db46 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
+           do
+ 	    LIBS="$saved_LIBS -l$dbname"
+ 	    AC_TRY_LINK([#include <db.h>],
+diff -urNad trunk~/saslauthd/aclocal.m4 trunk/saslauthd/aclocal.m4
+--- trunk~/saslauthd/aclocal.m4	2008-01-07 13:17:52.000000000 +0200
++++ trunk/saslauthd/aclocal.m4	2009-05-10 08:36:30.000000000 +0300
+@@ -2016,7 +2016,7 @@
+ 	fi
+ 
+ 	saved_LIBS=$LIBS
+-        for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
++        for dbname in db-4.7 db4.7 db47 db-4.6 db4.6 db46 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
+           do
+ 	    LIBS="$saved_LIBS -l$dbname"
+ 	    AC_TRY_LINK([#include <db.h>],

Propchange: cyrus-sasl-2.1/branches/heimdal/debian/patches/0017_db4.7.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: cyrus-sasl-2.1/branches/heimdal/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/branches/heimdal/debian/patches/00list?rev=424&op=diff
==============================================================================
--- cyrus-sasl-2.1/branches/heimdal/debian/patches/00list (original)
+++ cyrus-sasl-2.1/branches/heimdal/debian/patches/00list Sun May 10 06:14:32 2009
@@ -15,7 +15,7 @@
 0013_fix_hurd_build
 0014_avoid_pic_overwrite
 0016_pid_file_lock_creation_mask
-0017_db4.6
+0017_db4.7
 0018_auth_rimap_quotes
 0019_ldap_deprecated
 0020_saslauthd_manpage