← Back to branch summary

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

« back to all changes in this revision

Viewing changes to debian/patches/20_2373_sasl_upstream_cvs.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/20_2373_sasl_upstream_cvs.diff
10
10
Members: 
11
11
        plugins/cram.c:1.83->1.84 
12
12
 
13
 
Index: cyrus-sasl-2.1.19/plugins/cram.c
 
13
Index: cyrus-sasl-2.1.19.dfsg1/plugins/cram.c
14
14
===================================================================
15
15
RCS file: /cvs/src/sasl/plugins/cram.c,v
16
16
retrieving revision 1.83
17
17
retrieving revision 1.84
18
18
diff -u -r1.83 -r1.84
19
 
--- cyrus-sasl-2.1.19/plugins/cram.c    15 Dec 2003 20:04:22 -0000      1.83
20
 
+++ cyrus-sasl-2.1.19/plugins/cram.c    6 Aug 2004 20:29:44 -0000       1.84
 
19
--- cyrus-sasl-2.1.19.dfsg1/plugins/cram.c      15 Dec 2003 20:04:22 -0000      1.83
 
20
+++ cyrus-sasl-2.1.19.dfsg1/plugins/cram.c      6 Aug 2004 20:29:44 -0000       1.84
21
21
@@ -1,7 +1,7 @@
22
22
 /* CRAM-MD5 SASL plugin
23
23
  * Rob Siemborski