Ubuntu cyrus-imapd-2.2 2.2.13-19ubuntu4

[Ubuntu Merge-o-Matic]

This e-mail has been sent due to an upload to Ubuntu that contains Ubuntu
changes.  It contains the difference between the new version and the
previous version of the same source package in Ubuntu.
-------------- next part --------------
Format: 1.8
Date: Sun, 10 Apr 2011 19:05:37 +0000
Source: cyrus-imapd-2.2
Binary: cyrus-common-2.2 cyrus-doc-2.2 cyrus-imapd-2.2 cyrus-pop3d-2.2 cyrus-admin-2.2 cyrus-murder-2.2 cyrus-nntpd-2.2 cyrus-clients-2.2 cyrus-dev-2.2 libcyrus-imap-perl22
Architecture: source
Version: 2.2.13-19ubuntu4
Distribution: natty
Urgency: low
Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
Changed-By: Steve Langasek <steve.langasek 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
Changes: 
 cyrus-imapd-2.2 (2.2.13-19ubuntu4) natty; urgency=low
 .
   * debian/rules: we need to pass --with-com_err= instead of --with-com_err,
     to really get the system version.
Checksums-Sha1: 
 f3e74ba74136e9d1c8dd3023d829bbe549c84a36 2655 cyrus-imapd-2.2_2.2.13-19ubuntu4.dsc
 fe182eb5bea7d42896fb0f688274b4483f688d00 270550 cyrus-imapd-2.2_2.2.13-19ubuntu4.diff.gz
Checksums-Sha256: 
 bd00e73258c081f17070c1c9335d6f937876e50b651fe8c46b1aa573e467e3cc 2655 cyrus-imapd-2.2_2.2.13-19ubuntu4.dsc
 f0c2889c83754a7f8a247ae571a2b20940fff745cc28e71dcea36a023316620b 270550 cyrus-imapd-2.2_2.2.13-19ubuntu4.diff.gz
Files: 
 a5f6c767c4305b3b28cb9690e3a63251 2655 mail extra cyrus-imapd-2.2_2.2.13-19ubuntu4.dsc
 a58c08a40419e696ef8d2dd6a4097c35 270550 mail extra cyrus-imapd-2.2_2.2.13-19ubuntu4.diff.gz
Original-Maintainer: Debian Cyrus Team <pkg-cyrus-imapd-debian-devel at lists.alioth.debian.org>
-------------- next part --------------
diff -pruN 2.2.13-19ubuntu3/debian/changelog 2.2.13-19ubuntu4/debian/changelog
--- 2.2.13-19ubuntu3/debian/changelog	2011-04-10 23:51:16.000000000 +0100
+++ 2.2.13-19ubuntu4/debian/changelog	2011-04-10 23:51:15.000000000 +0100
@@ -1,3 +1,10 @@
+cyrus-imapd-2.2 (2.2.13-19ubuntu4) natty; urgency=low
+
+  * debian/rules: we need to pass --with-com_err= instead of --with-com_err,
+    to really get the system version.
+
+ -- Steve Langasek <steve.langasek at ubuntu.com>  Sun, 10 Apr 2011 19:05:37 +0000
+
 cyrus-imapd-2.2 (2.2.13-19ubuntu3) natty; urgency=low
 
   * Fix up broken changes against configure; it seems something in the build
diff -pruN 2.2.13-19ubuntu3/debian/rules 2.2.13-19ubuntu4/debian/rules
--- 2.2.13-19ubuntu3/debian/rules	2011-04-10 23:51:16.000000000 +0100
+++ 2.2.13-19ubuntu4/debian/rules	2011-04-10 23:51:15.000000000 +0100
@@ -99,7 +99,7 @@ configure-stamp: $(QUILT_STAMPFN)
 	 --disable-listext --enable-annotatemore --with-sasl=/usr \
 	 --with-drac=/usr \
 	 --with-cyrus-user=cyrus --with-cyrus-group=mail \
-	 --with-tclsh=/usr/bin/tclsh --with-com_err \
+	 --with-tclsh=/usr/bin/tclsh --with-com_err= \
 	 --with-pidfile=/var/run/cyrmaster.pid \
 	 --with-syslogfacility=MAIL \
 	 --with-seen-db=skiplist --with-mboxlist-db=skiplist \