Ubuntu cyrus-imapd-2.2 2.2.13-19ubuntu3

Ubuntu Merge-o-Matic mom at ubuntu.com
Sun Apr 10 10:52:36 UTC 2011


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 00:51:30 -0700
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-19ubuntu3
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
Launchpad-Bugs-Fixed: 749123
Changes: 
 cyrus-imapd-2.2 (2.2.13-19ubuntu3) natty; urgency=low
 .
   * Fix up broken changes against configure; it seems something in the build
     runs autoconf which makes clean-after-build not work correctly.
 .
 cyrus-imapd-2.2 (2.2.13-19ubuntu2) natty; urgency=low
 .
   * debian/control: restore cyrus-nntpd-2.2 package, lost due to
     update-maintainer mangling of the file.
 .
 cyrus-imapd-2.2 (2.2.13-19ubuntu1) natty; urgency=low
 .
   * debian/rules: use -lcom_err from the system path, instead of hard-coding
     /usr which breaks under multiarch.  LP: #749123.
Checksums-Sha1: 
 1bb10c1466293501ac23947a011f3545dd02c9ac 2655 cyrus-imapd-2.2_2.2.13-19ubuntu3.dsc
 ddc1fe2b2efac5b02795d15fb02332786fadb30f 270595 cyrus-imapd-2.2_2.2.13-19ubuntu3.diff.gz
Checksums-Sha256: 
 614d4984403bee430d54f6904b9b35c477ddf4d1799176e01afef28d85dfee56 2655 cyrus-imapd-2.2_2.2.13-19ubuntu3.dsc
 3c1dee49d71962ef94d0abe133d3f99d25360a004b3d73f360a7cb30029ee204 270595 cyrus-imapd-2.2_2.2.13-19ubuntu3.diff.gz
Files: 
 c751f0f8bc2c443368d1a861d973327f 2655 mail extra cyrus-imapd-2.2_2.2.13-19ubuntu3.dsc
 4a8059bfe5004b53baad27ee71ffb0b5 270595 mail extra cyrus-imapd-2.2_2.2.13-19ubuntu3.diff.gz
Original-Maintainer: Debian Cyrus Team <pkg-cyrus-imapd-debian-devel at lists.alioth.debian.org>
-------------- next part --------------
diff -pruN 2.2.13-19build1/debian/changelog 2.2.13-19ubuntu3/debian/changelog
--- 2.2.13-19build1/debian/changelog	2011-04-10 11:41:23.000000000 +0100
+++ 2.2.13-19ubuntu3/debian/changelog	2011-04-10 11:41:21.000000000 +0100
@@ -1,3 +1,24 @@
+cyrus-imapd-2.2 (2.2.13-19ubuntu3) natty; urgency=low
+
+  * Fix up broken changes against configure; it seems something in the build
+    runs autoconf which makes clean-after-build not work correctly.
+
+ -- Steve Langasek <steve.langasek at ubuntu.com>  Sun, 10 Apr 2011 00:51:30 -0700
+
+cyrus-imapd-2.2 (2.2.13-19ubuntu2) natty; urgency=low
+
+  * debian/control: restore cyrus-nntpd-2.2 package, lost due to
+    update-maintainer mangling of the file.
+
+ -- Steve Langasek <steve.langasek at ubuntu.com>  Sun, 10 Apr 2011 07:36:56 +0000
+
+cyrus-imapd-2.2 (2.2.13-19ubuntu1) natty; urgency=low
+
+  * debian/rules: use -lcom_err from the system path, instead of hard-coding
+    /usr which breaks under multiarch.  LP: #749123.
+
+ -- Steve Langasek <steve.langasek at ubuntu.com>  Sun, 10 Apr 2011 07:27:08 +0000
+
 cyrus-imapd-2.2 (2.2.13-19build1) maverick; urgency=low
 
   * No change rebuild for Heimdal transition
diff -pruN 2.2.13-19build1/debian/control 2.2.13-19ubuntu3/debian/control
--- 2.2.13-19build1/debian/control	2011-04-10 11:41:23.000000000 +0100
+++ 2.2.13-19ubuntu3/debian/control	2011-04-10 11:41:21.000000000 +0100
@@ -1,7 +1,8 @@
 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 Developers <ubuntu-devel-discuss at lists.ubuntu.com>
+XSBC-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>, Christoph Berg <myon at debian.org>
 Standards-Version: 3.8.3
 Build-Depends: debhelper (>= 5), quilt, tcl-dev | tcl8.3-dev, libwrap0-dev, libpam0g-dev, libdb4.7-dev, libssl-dev, libzephyr-dev, libsasl2-dev (>= 2.1.9), comerr-dev, libsnmp-dev | libsnmp9-dev, perl, xutils-dev | xutils, flex, bison, autotools-dev, po-debconf, transfig, ghostscript | gs-gpl, groff, libkvm-dev [kfreebsd-i386], libkvm-dev [kfreebsd-amd64], heimdal-dev
@@ -173,8 +174,8 @@ Architecture: any
 Section: mail
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Conflicts: cyrus21-clients, cyrus22-clients
-Provides: cyrus21-clients, cyrus22-clients
 Replaces: cyrus21-clients, cyrus22-clients
+Provides: cyrus21-clients, cyrus22-clients
 Description: Cyrus mail system (test clients)
  This package contains client tools to test the Cyrus IMAPd suite.
  It contains the mupdatetest, sivtest, smtptest, lmtptest,
@@ -215,4 +216,3 @@ Description: Interface to Cyrus imap cli
  undocumented upstream.
  .
  For more information, please see the cyrus-common-2.2 package.
-
diff -pruN 2.2.13-19build1/debian/rules 2.2.13-19ubuntu3/debian/rules
--- 2.2.13-19build1/debian/rules	2011-04-10 11:41:23.000000000 +0100
+++ 2.2.13-19ubuntu3/debian/rules	2011-04-10 11:41:21.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=/usr \
+	 --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 \


More information about the Pkg-Cyrus-imapd-Debian-devel mailing list