← Back to branch summary

~ubuntu-branches/ubuntu/dapper/cyrus-sasl2/dapper

« back to all changes in this revision

Viewing changes to debian/patches/13_libdb42_autotools.diff

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt, Adam Conrad
  • Date: 2006-04-10 11:46:53 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20060410114653-ze3gs0xfkofg7pqd
Tags: 2.1.19.dfsg1-0.1ubuntu1
* Synchronize to Debian (#28137)
* Reapply remaining Ubuntu changes to clean Debian package:
  - debian/patches/13_libdb42_autotools.diff, debian/control: Build against
    db4.3 instead of 4.2.
  - debian/control:  Since the libsasl2 package description so clearly states
    that the library is "completely useless" without one of the
    libsasl2-modules packages, upgrade the Recommends on a single package to
    an ORd Depends on the complete list of them. (Ubuntu bug #8046) 
    [Adam Conrad]

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/13_libdb42_autotools.diff
1
 
diff -Nru3 ./cyrus-sasl-2.1.19/cmulocal/berkdb.m4 ../build-tree.new/cyrus-sasl-2.1.19/cmulocal/berkdb.m4
2
 
--- ./cyrus-sasl-2.1.19/cmulocal/berkdb.m4      2004-02-14 21:13:03.000000000 +0000
3
 
+++ ../build-tree.new/cyrus-sasl-2.1.19/cmulocal/berkdb.m4      2004-07-04 12:42:28.000000000 +0100
 
1
diff -Nru3 ./cyrus-sasl-2.1.19.dfsg1/cmulocal/berkdb.m4 ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/cmulocal/berkdb.m4
 
2
--- ./cyrus-sasl-2.1.19.dfsg1/cmulocal/berkdb.m4        2004-02-14 21:13:03.000000000 +0000
 
3
+++ ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/cmulocal/berkdb.m4        2004-07-04 12:42:28.000000000 +0100
4
4
@@ -211,11 +211,13 @@
5
5
            BDB_LIBADD=""
6
6
        fi