Ubuntu (new upstream) cyrus-imapd-2.2 2.2.13-10ubuntu1

[Ubuntu Merge-o-Matic]

This e-mail has been sent due to an upload to Ubuntu of a new upstream
version which still contains Ubuntu changes.  It contains the difference
between the Ubuntu version and the equivalent base version in Debian, note
that this difference may include the upstream changes.
-------------- next part --------------
Format: 1.7
Date: Mon, 12 Feb 2007 15:10:50 +0100
Source: cyrus-imapd-2.2
Binary: cyrus-dev-2.2 libcyrus-imap-perl22 cyrus-common-2.2 cyrus-doc-2.2 cyrus-clients-2.2 cyrus-pop3d-2.2 cyrus-imapd-2.2 cyrus-admin-2.2 cyrus-nntpd-2.2 cyrus-murder-2.2
Architecture: source
Version: 2.2.13-10ubuntu1
Distribution: feisty
Urgency: high
Maintainer: Ubuntu MOTU Developers <ubuntu-motu at lists.ubuntu.com>
Changed-By: Michael Bienia <geser at ubuntu.com>
Description: 
 cyrus-admin-2.2 - Cyrus mail system (administration tools)
 cyrus-clients-2.2 - Cyrus mail system (test clients)
 cyrus-common-2.2 - Cyrus mail system (common files)
 cyrus-dev-2.2 - Cyrus mail system (developer files)
 cyrus-doc-2.2 - Cyrus mail system (documentation files)
 cyrus-imapd-2.2 - Cyrus mail system (IMAP support)
 cyrus-murder-2.2 - Cyrus mail system (proxies and aggregator)
 cyrus-nntpd-2.2 - Cyrus mail system (NNTP support)
 cyrus-pop3d-2.2 - Cyrus mail system (POP3 support)
 libcyrus-imap-perl22 - Interface to Cyrus imap client imclient library
Closes: 395250 400645 400747
Changes: 
 cyrus-imapd-2.2 (2.2.13-10ubuntu1) feisty; urgency=low
 .
   * Merge from debian unstable, remaining changes:
     - Build using DB4.3.
   * Modified Maintainer values to match Debian-Maintainer-Field spec.
 .
 cyrus-imapd-2.2 (2.2.13-10) unstable; urgency=high
 .
   * High urgency due to #400747
 .
   [ Sven Mueller ]
   * Update README.Debian.simpleinstall (Closes: #395250)
   * Upstream change: applied RFC4314 READ-ONLY logic
 .
   [ Benjamin Seidenberg ]
   * Add notice about lmtp overquota configuration option rename to
     UPGRADE.Debian (Closes: #400645)
   * Disable upstream patch 0019 due to bad sasl interactions (Closes: #400747)
Files: 
 5e00be675b3377546012eb060f424cff 1384 mail extra cyrus-imapd-2.2_2.2.13-10ubuntu1.dsc
 a31c1a7f542c3297cd6d2216fec36f99 258015 mail extra cyrus-imapd-2.2_2.2.13-10ubuntu1.diff.gz
-------------- next part --------------
diff -pruN 2.2.13-10/debian/changelog 2.2.13-10ubuntu1/debian/changelog
--- 2.2.13-10/debian/changelog	2007-02-12 16:15:28.000000000 +0000
+++ 2.2.13-10ubuntu1/debian/changelog	2007-02-12 16:13:51.000000000 +0000
@@ -1,3 +1,11 @@
+cyrus-imapd-2.2 (2.2.13-10ubuntu1) feisty; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Build using DB4.3.
+  * Modified Maintainer values to match Debian-Maintainer-Field spec.
+
+ -- Michael Bienia <geser at ubuntu.com>  Mon, 12 Feb 2007 15:10:50 +0100
+
 cyrus-imapd-2.2 (2.2.13-10) unstable; urgency=high
 
   * High urgency due to #400747
@@ -13,6 +21,13 @@ cyrus-imapd-2.2 (2.2.13-10) unstable; ur
 
  -- Benjamin Seidenberg <benjamin at debian.org>  Sat,  9 Dec 2006 10:03:38 -0500
 
+cyrus-imapd-2.2 (2.2.13-9ubuntu1) feisty; urgency=low
+
+  * Merge with Debian unstable; remaining changes:
+    - Build using DB4.3.
+
+ -- Matthias Klose <doko at ubuntu.com>  Thu,  7 Dec 2006 17:31:51 +0100
+
 cyrus-imapd-2.2 (2.2.13-9) unstable; urgency=high
 
   * The "Benjamin made it in time for etch" release.
@@ -144,6 +159,12 @@ cyrus-imapd-2.2 (2.2.13-5) unstable; urg
 
  -- Sven Mueller <sven at debian.org>  Thu, 10 Aug 2006 03:17:27 +0200
 
+cyrus-imapd-2.2 (2.2.13-4ubuntu1) edgy; urgency=low
+
+  * Synchronize with Debian unstable.
+
+ -- Matthias Klose <doko at ubuntu.com>  Tue, 11 Jul 2006 18:51:39 +0200
+
 cyrus-imapd-2.2 (2.2.13-4) unstable; urgency=low
 
   [ Benjamin Seidenberg ]
@@ -225,6 +246,16 @@ cyrus-imapd-2.2 (2.2.12-5) unstable; urg
 
  -- Sven Mueller <debian at incase.de>  Fri, 31 Mar 2006 20:11:54 +0200
 
+cyrus-imapd-2.2 (2.2.12-4ubuntu1) dapper; urgency=low
+
+  * Synchronize with Debian unstable.
+  [ Taken from the cyrus21-imapd package ]
+  * Switch default config to use ssl-cert-snakeoil certificates only for the
+    global entry. Maintain the other examples to keep more clear how it works.
+  * Add Depends on ssl-cert.
+
+ -- Matthias Klose <doko at ubuntu.com>  Fri, 24 Feb 2006 00:28:45 +0000
+
 cyrus-imapd-2.2 (2.2.12-4) unstable; urgency=low
 
   [ Benjamin Seidenberg ]
@@ -245,6 +276,12 @@ cyrus-imapd-2.2 (2.2.12-4) unstable; urg
 
  -- Ondřej Surý <ondrej at debian.org>  Wed, 15 Feb 2006 22:42:35 +0100
 
+cyrus-imapd-2.2 (2.2.12-3ubuntu1) dapper; urgency=low
+
+  * Build using Berkeley DB 4.3.
+
+ -- Matthias Klose <doko at ubuntu.com>  Wed, 15 Feb 2006 17:40:07 +0000
+
 cyrus-imapd-2.2 (2.2.12-3) unstable; urgency=low
 
   [ Sven Mueller ]
diff -pruN 2.2.13-10/debian/control 2.2.13-10ubuntu1/debian/control
--- 2.2.13-10/debian/control	2007-02-12 16:15:28.000000000 +0000
+++ 2.2.13-10ubuntu1/debian/control	2007-02-12 16:13:51.000000000 +0000
@@ -1,10 +1,11 @@
 Source: cyrus-imapd-2.2
 Section: mail
 Priority: extra
-Maintainer: Debian Cyrus Team <pkg-cyrus-imapd-debian-devel at lists.alioth.debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu at lists.ubuntu.com>
+Original-Maintainer: Debian Cyrus Team <pkg-cyrus-imapd-debian-devel at lists.alioth.debian.org>
 Uploaders: Henrique de Moraes Holschuh <hmh at debian.org>, Sven Mueller <sven at debian.org>, Benjamin Seidenberg <benjamin at debian.org>, Ondřej Surý <ondrej at debian.org>
 Standards-Version: 3.7.2
-Build-Depends: debhelper (>= 4.1.68), tcl8.3-dev, libwrap0-dev, libpam0g-dev, libdb4.2-dev (>= 4.2.52), libssl-dev, libzephyr-dev, libsasl2-dev (>= 2.1.9), comerr-dev, libsnmp9-dev | libsnmp5-dev, perl (>= 5.6.0-16), xutils, flex, bison, autotools-dev, po-debconf, dpatch, transfig, gs, groff, libkvm-dev [kfreebsd-i386], libkvm-dev [kfreebsd-amd64]
+Build-Depends: debhelper (>= 4.1.68), tcl8.3-dev, libwrap0-dev, libpam0g-dev, libdb4.3-dev, libssl-dev, libzephyr-dev, libsasl2-dev (>= 2.1.9), comerr-dev, libsnmp9-dev | libsnmp5-dev, perl (>= 5.6.0-16), xutils, flex, bison, autotools-dev, po-debconf, dpatch, transfig, gs, groff, libkvm-dev [kfreebsd-i386], libkvm-dev [kfreebsd-amd64]
 
 Package: cyrus-common-2.2
 Architecture: any
diff -pruN 2.2.13-10/debian/rules 2.2.13-10ubuntu1/debian/rules
--- 2.2.13-10/debian/rules	2007-02-12 16:15:28.000000000 +0000
+++ 2.2.13-10ubuntu1/debian/rules	2007-02-12 16:13:51.000000000 +0000
@@ -65,7 +65,7 @@ DEBVERSION:=$(shell LCALL=C dpkg-parsech
 EXTRA_IDENT:="Debian-$(DEBVERSION)"
 
 # DB engine version
-DBENGINE=BerkeleyDB4.2
+DBENGINE=BerkeleyDB4.3
 
 DEBUGFLAGS=-g
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))