← Back to branch summary

~sbeattie/ubuntu/oneiric/dovecot/dovecot-lp792557

« back to all changes in this revision

Viewing changes to debian/patches/debian-changes-1:1.2.9-1ubuntu6

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short, Ante Karamatic
  • Date: 2010-04-19 13:13:20 UTC
  • Revision ID: james.westby@ubuntu.com-20100419131320-zoem40bavuyyzxww
Tags: 1:1.2.9-1ubuntu6
https://launchpad.net/bugs/511295
[Ante Karamatic]
* dovecot-example.conf, debian/dovecot-common.dirs, debian/01-dovecot-postfix.auth,
     debian/01-dovecot-postfix.conf, debian/control, debian/dovecot-postfix.dirs,
     debian/dovecot-postfix.postinst, debian/dovecot-postfix.postrm, debian/dovecot-postfix.preinst,
     debian/rules:
     * Fix dovecot -n not to report wrong configuration. (LP: #511295) 

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/debian-changes-1:1.2.9-1ubuntu6
 
1
Description: Upstream changes introduced in version 1:1.2.9-1ubuntu6
 
2
 This patch has been created by dpkg-source during the package build.
 
3
 Here's the last changelog entry, hopefully it gives details on why
 
4
 those changes were made:
 
5
 .
 
6
 dovecot (1:1.2.9-1ubuntu6) lucid; urgency=low
 
7
 .
 
8
   [Ante Karamatic]
 
9
   * dovecot-example.conf, debian/dovecot-common.dirs, debian/01-dovecot-postfix.auth,
 
10
        debian/01-dovecot-postfix.conf, debian/control, debian/dovecot-postfix.dirs,
 
11
        debian/dovecot-postfix.postinst, debian/dovecot-postfix.postrm, debian/dovecot-postfix.preinst,
 
12
        debian/rules:
 
13
        * Fix dovecot -n not to report wrong configuration. (LP: #511295)
 
14
 .
 
15
 The person named in the Author field signed this changelog entry.
 
16
Author: Chuck Short <zulcss@ubuntu.com>
 
17
Bug-Ubuntu: https://bugs.launchpad.net/bugs/511295
 
18
 
 
19
---
 
20
The information above should follow the Patch Tagging Guidelines, please
 
21
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
 
22
are templates for supplementary fields that you might want to add:
 
23
 
 
24
Origin: <vendor|upstream|other>, <url of original patch>
 
25
Bug: <url in upstream bugtracker>
 
26
Bug-Debian: http://bugs.debian.org/<bugnumber>
 
27
Forwarded: <no|not-needed|url proving that it has been forwarded>
 
28
Reviewed-By: <name and email of someone who approved the patch>
 
29
Last-Update: <YYYY-MM-DD>
 
30
 
 
31
--- dovecot-1.2.9.orig/dovecot-example.conf
 
32
+++ dovecot-1.2.9/dovecot-example.conf
 
33
@@ -1132,6 +1132,7 @@ auth default {
 
34
       #mode = 0660
 
35
     #}
 
36
   #}
 
37
+  !include_try /etc/dovecot/auth.d/*.auth
 
38
 }
 
39
 
 
40
 # If you wish to use another authentication server than dovecot-auth, you can
 
41
@@ -1274,4 +1275,5 @@ plugin {
 
42
 # Config files can also be included. deliver doesn't support them currently.
 
43
 #!include /etc/dovecot/conf.d/*.conf
 
44
 # Optional configurations, don't give an error if it's not found:
 
45
+!include_try /etc/dovecot/conf.d/*.conf
 
46
 #!include_try /etc/dovecot/extra.conf