← Back to branch summary

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

« back to all changes in this revision

Viewing changes to debian/patches/22_237x_3_sasl_upstream_cvs-FIX.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/22_237x_3_sasl_upstream_cvs-FIX.diff
1
 
diff -ruN cyrus-sasl-2.1.19.orig/lib/common.c cyrus-sasl-2.1.19/lib/common.c
2
 
--- cyrus-sasl-2.1.19.orig/lib/common.c 2004-10-16 17:48:04.000000000 -0300
3
 
+++ cyrus-sasl-2.1.19/lib/common.c      2004-10-16 17:48:56.000000000 -0300
 
1
diff -ruN cyrus-sasl-2.1.19.dfsg1.orig/lib/common.c cyrus-sasl-2.1.19.dfsg1/lib/common.c
 
2
--- cyrus-sasl-2.1.19.dfsg1.orig/lib/common.c   2004-10-16 17:48:04.000000000 -0300
 
3
+++ cyrus-sasl-2.1.19.dfsg1/lib/common.c        2004-10-16 17:48:56.000000000 -0300
4
4
@@ -1846,6 +1846,7 @@
5
5
   if (! path)
6
6
     return SASL_BADPARAM;