[SVN] r302 - in /branches/sarge/cyrus-imapd-2.2.12/debian: ./
examples/ patches/ po/
debian at incase.de
debian at incase.de
Sat Feb 18 20:08:21 UTC 2006
Author: sven
Date: Sat Feb 18 21:08:19 2006
New Revision: 302
URL: https://mail.incase.de/viewcvs?rev=302&root=cyrus22&view=rev
Log:
Merge changes up to #300 into sarge branch
Added:
branches/sarge/cyrus-imapd-2.2.12/debian/logcheck.violations.ignore
- copied unchanged from r301, trunk/cyrus-imapd-2.2.12/debian/logcheck.violations.ignore
branches/sarge/cyrus-imapd-2.2.12/debian/source.lintian-overrides
- copied unchanged from r301, trunk/cyrus-imapd-2.2.12/debian/source.lintian-overrides
Modified:
branches/sarge/cyrus-imapd-2.2.12/debian/changelog
branches/sarge/cyrus-imapd-2.2.12/debian/control
branches/sarge/cyrus-imapd-2.2.12/debian/cyrus-common-2.2.cyrus2.2.init
branches/sarge/cyrus-imapd-2.2.12/debian/examples/editsieve
branches/sarge/cyrus-imapd-2.2.12/debian/logcheck.ignore
branches/sarge/cyrus-imapd-2.2.12/debian/patches/00list
branches/sarge/cyrus-imapd-2.2.12/debian/patches/20-drac_auth.dpatch
branches/sarge/cyrus-imapd-2.2.12/debian/po/POTFILES.in
branches/sarge/cyrus-imapd-2.2.12/debian/rules
Modified: branches/sarge/cyrus-imapd-2.2.12/debian/changelog
URL: https://mail.incase.de/viewcvs/branches/sarge/cyrus-imapd-2.2.12/debian/changelog?rev=302&root=cyrus22&r1=301&r2=302&view=diff
==============================================================================
--- branches/sarge/cyrus-imapd-2.2.12/debian/changelog (original)
+++ branches/sarge/cyrus-imapd-2.2.12/debian/changelog Sat Feb 18 21:08:19 2006
@@ -1,4 +1,28 @@
-cyrus-imapd-2.2 (2.2.12-2.sarge.1) stable; urgency=low
+cyrus-imapd-2.2 (2.2.12-3.sarge.1) stable; urgency=low
+
+ -- Sven Mueller <debian at incase.de> Sat, 18 Feb 2006 21:06:55 +0100
+
+cyrus-imapd-2.2 (2.2.12-4) unstable; urgency=low
+
+ [ Benjamin Seidenberg ]
+ * Change maintainer to mailing list
+ * Remove multiple provides: lines in cyrus-nntpd-2.2 (Closes: #352240)
+ * Add lintian override for CVS dirs in source tarball, we need to hit
+ upstream with a cluebat for this.
+ * Move all Build-Depends-Indep dependencies to Build-Depends because of the
+ way debian/rules invokes this target, they are not installed, fixes FTBFS.
+ (Closes: #352775, #352779)
+
+ [ Sven Mueller ]
+ * Disable DRAC authentication
+ * Fix reference in debian/po/POTFILES.in (Closes: #352948)
+
+ [ Ondřej Surý ]
+ * Upload to unstable.
+
+ -- Ondřej Surý <ondrej at debian.org> Wed, 15 Feb 2006 22:42:35 +0100
+
+cyrus-imapd-2.2 (2.2.12-3) unstable; urgency=low
[ Sven Mueller ]
* Add a script which helps downloading, editing and re-uploading
@@ -15,7 +39,11 @@
* Changed debian/control so that the doc package is in section doc to match
ftpmaster override.
- -- Benjamin Seidenberg <astronut at dlgeek.net> Sat, 21 Jan 2006 17:28:08 -0500
+ [ Ondřej Surý ]
+ * Updated and renamed logcheck rules.
+ * Upload to unstable.
+
+ -- Ondřej Surý <ondrej at debian.org> Mon, 13 Feb 2006 14:16:44 +0100
cyrus-imapd-2.2 (2.2.12-2) experimental; urgency=low
Modified: branches/sarge/cyrus-imapd-2.2.12/debian/control
URL: https://mail.incase.de/viewcvs/branches/sarge/cyrus-imapd-2.2.12/debian/control?rev=302&root=cyrus22&r1=301&r2=302&view=diff
==============================================================================
--- branches/sarge/cyrus-imapd-2.2.12/debian/control (original)
+++ branches/sarge/cyrus-imapd-2.2.12/debian/control Sat Feb 18 21:08:19 2006
@@ -1,11 +1,10 @@
Source: cyrus-imapd-2.2
Section: mail
Priority: extra
-Maintainer: Henrique de Moraes Holschuh <hmh at debian.org>
-Uploaders: Sven Mueller <debian at incase.de>, Benjamin Seidenberg <astronut at dlgeek.net>
+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 <debian at incase.de>, Benjamin Seidenberg <astronut at dlgeek.net>, Ondřej Surý <ondrej at debian.org>
Standards-Version: 3.6.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, drac-dev (>= 1.11-7), libsnmp9-dev | libsnmp5-dev, perl (>= 5.6.0-16), xutils, flex, bison, autotools-dev, po-debconf, dpatch
-Build-Depends-Indep: transfig, gs, groff
+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, drac-dev (>= 1.11-7), libsnmp9-dev | libsnmp5-dev, perl (>= 5.6.0-16), xutils, flex, bison, autotools-dev, po-debconf, dpatch, transfig, gs, groff
Package: cyrus-common-2.2
Architecture: any
@@ -117,10 +116,9 @@
Architecture: any
Section: mail
Depends: cyrus-common-2.2 (= ${Source-Version}), ${shlibs:Depends}
-Provides: news-transport-system
Conflicts: news-transport-system
Replaces: cyrus21-nntpd, cyrus22-nntpd
-Provides: cyrus21-nntpd, cyrus22-nntpd
+Provides: news-transport-system, cyrus21-nntpd, cyrus22-nntpd
Description: Cyrus mail system (NNTP support)
This package contains the NNTP (Network News Transfer Protocol) portion of
the Cyrus IMAPd suite.
Modified: branches/sarge/cyrus-imapd-2.2.12/debian/cyrus-common-2.2.cyrus2.2.init
URL: https://mail.incase.de/viewcvs/branches/sarge/cyrus-imapd-2.2.12/debian/cyrus-common-2.2.cyrus2.2.init?rev=302&root=cyrus22&r1=301&r2=302&view=diff
==============================================================================
--- branches/sarge/cyrus-imapd-2.2.12/debian/cyrus-common-2.2.cyrus2.2.init (original)
+++ branches/sarge/cyrus-imapd-2.2.12/debian/cyrus-common-2.2.cyrus2.2.init Sat Feb 18 21:08:19 2006
@@ -159,7 +159,7 @@
stop)
echo -n "Stopping $DESC: "
if start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid \
- -- name ${NAME} --quiet --startas $DAEMON >/dev/null 2>&1 ; then
+ --name ${NAME} --quiet --startas $DAEMON >/dev/null 2>&1 ; then
echo "$NAME."
rm -f /var/run/${NAME}.pid
exit 0
@@ -181,7 +181,7 @@
reload|force-reload)
echo "Reloading $DESC configuration files."
if start-stop-daemon --stop --signal 1 --quiet \
- --name ${NAME} --pidfile /var/run/$NAME.pid --exec $DAEMON >/dev/null 2>&1 ; then
+ --name ${NAME} --pidfile /var/run/$NAME.pid >/dev/null 2>&1 ; then
exit 0
else
exit 1
Modified: branches/sarge/cyrus-imapd-2.2.12/debian/examples/editsieve
URL: https://mail.incase.de/viewcvs/branches/sarge/cyrus-imapd-2.2.12/debian/examples/editsieve?rev=302&root=cyrus22&r1=301&r2=302&view=diff
==============================================================================
--- branches/sarge/cyrus-imapd-2.2.12/debian/examples/editsieve (original)
+++ branches/sarge/cyrus-imapd-2.2.12/debian/examples/editsieve Sat Feb 18 21:08:19 2006
@@ -233,7 +233,7 @@
fi
done
echo "copying file ${SCRIPTNAME} to ${SCRIPTNAME}.edited"
-cp "${CONFDIR}/${SCRIPTNAME} ${CONFDIR}/${SCRIPTNAME}.edited"
+cp "${CONFDIR}/${SCRIPTNAME}" "${CONFDIR}/${SCRIPTNAME}.edited"
# check wether the file changed at all. If not, we can skip uploading
echo trying diff
if diff -q "${CONFDIR}/${SCRIPTNAME}.orig" "${CONFDIR}/${SCRIPTNAME}"; then
Modified: branches/sarge/cyrus-imapd-2.2.12/debian/logcheck.ignore
URL: https://mail.incase.de/viewcvs/branches/sarge/cyrus-imapd-2.2.12/debian/logcheck.ignore?rev=302&root=cyrus22&r1=301&r2=302&view=diff
==============================================================================
--- branches/sarge/cyrus-imapd-2.2.12/debian/logcheck.ignore (original)
+++ branches/sarge/cyrus-imapd-2.2.12/debian/logcheck.ignore Sat Feb 18 21:08:19 2006
@@ -51,3 +51,4 @@
cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +unready for connections
cyrus/squatter\[[0-9]+\]: +(done )?(indexing|skipping) mailbox
cyrus/notifyd\[[0-9]+\]: do_notify using method
+cyrus/lmtpunix\[[0-9]+\]: +IOERROR: fstating sieve script [/a-zA-Z^]/defaultbc: No such file or directory
Modified: branches/sarge/cyrus-imapd-2.2.12/debian/patches/00list
URL: https://mail.incase.de/viewcvs/branches/sarge/cyrus-imapd-2.2.12/debian/patches/00list?rev=302&root=cyrus22&r1=301&r2=302&view=diff
==============================================================================
--- branches/sarge/cyrus-imapd-2.2.12/debian/patches/00list (original)
+++ branches/sarge/cyrus-imapd-2.2.12/debian/patches/00list Sat Feb 18 21:08:19 2006
@@ -18,7 +18,6 @@
17-fix_tail_syntax_in_xversion.h.dpatch
18-fix_strlen_return_type.dpatch
19-fix_tls_ssl.dpatch
-20-drac_auth.dpatch
21-fix_config-parsing.dpatch
22-imapd_index_check.dpatch
25-update_install-sh.dpatch
Modified: branches/sarge/cyrus-imapd-2.2.12/debian/patches/20-drac_auth.dpatch
URL: https://mail.incase.de/viewcvs/branches/sarge/cyrus-imapd-2.2.12/debian/patches/20-drac_auth.dpatch?rev=302&root=cyrus22&r1=301&r2=302&view=diff
==============================================================================
--- branches/sarge/cyrus-imapd-2.2.12/debian/patches/20-drac_auth.dpatch (original)
+++ branches/sarge/cyrus-imapd-2.2.12/debian/patches/20-drac_auth.dpatch Sat Feb 18 21:08:19 2006
@@ -5,9 +5,9 @@
## DP: Enable DRAC (pop-before-smtp) authentication
@DPATCH@
-diff -urNad cyrus-imapd-2.2.12/configure.in /tmp/dpep.hL1Os6/cyrus-imapd-2.2.12/configure.in
---- cyrus-imapd-2.2.12/configure.in 2005-11-17 04:23:45.000000000 +0100
-+++ /tmp/dpep.hL1Os6/cyrus-imapd-2.2.12/configure.in 2005-11-17 04:23:46.955948052 +0100
+diff -urNad cyrus-imapd-2.2.12/configure.in /tmp/dpep.FoExSn/cyrus-imapd-2.2.12/configure.in
+--- cyrus-imapd-2.2.12/configure.in 2006-02-14 17:13:36.000000000 +0100
++++ /tmp/dpep.FoExSn/cyrus-imapd-2.2.12/configure.in 2006-02-14 17:13:44.656438535 +0100
@@ -988,6 +988,19 @@
SNMP_SUBDIRS=""
AC_SUBST(SNMP_SUBDIRS)
@@ -28,9 +28,9 @@
CMU_LIBWRAP
CMU_UCDSNMP
-diff -urNad cyrus-imapd-2.2.12/imap/Makefile.in /tmp/dpep.hL1Os6/cyrus-imapd-2.2.12/imap/Makefile.in
---- cyrus-imapd-2.2.12/imap/Makefile.in 2005-11-17 04:23:45.000000000 +0100
-+++ /tmp/dpep.hL1Os6/cyrus-imapd-2.2.12/imap/Makefile.in 2005-11-17 04:23:46.955948052 +0100
+diff -urNad cyrus-imapd-2.2.12/imap/Makefile.in /tmp/dpep.FoExSn/cyrus-imapd-2.2.12/imap/Makefile.in
+--- cyrus-imapd-2.2.12/imap/Makefile.in 2006-02-14 17:13:36.000000000 +0100
++++ /tmp/dpep.FoExSn/cyrus-imapd-2.2.12/imap/Makefile.in 2006-02-14 17:13:44.657438437 +0100
@@ -69,6 +69,7 @@
SIEVE_LIBS = @SIEVE_LIBS@
IMAP_COM_ERR_LIBS = @IMAP_COM_ERR_LIBS@
@@ -56,7 +56,7 @@
$(QUANTIFY) $(QUANTOPT) $(CC) $(LDFLAGS) -o imapd.quant \
$(SERVICE) $(IMAPDOBJS) mutex_fake.o libimap.a \
- $(DEPLIBS) $(LIBS) $(LIB_WRAP)
-+ $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(DRAC_LIBS) $(DRAC_LIBS)
++ $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(DRAC_LIBS)
proxyd: $(PROXYDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
$(CC) $(LDFLAGS) -o proxyd \
@@ -69,9 +69,9 @@
nntpd: nntpd.o backend.o index.o smtpclient.o spool.o tls.o \
mutex_fake.o nntp_err.o libimap.a $(DEPLIBS) $(SERVICE)
-diff -urNad cyrus-imapd-2.2.12/imap/imapd.c /tmp/dpep.hL1Os6/cyrus-imapd-2.2.12/imap/imapd.c
---- cyrus-imapd-2.2.12/imap/imapd.c 2005-11-17 04:23:45.000000000 +0100
-+++ /tmp/dpep.hL1Os6/cyrus-imapd-2.2.12/imap/imapd.c 2005-11-17 04:23:46.958947759 +0100
+diff -urNad cyrus-imapd-2.2.12/imap/imapd.c /tmp/dpep.FoExSn/cyrus-imapd-2.2.12/imap/imapd.c
+--- cyrus-imapd-2.2.12/imap/imapd.c 2006-02-14 17:13:36.000000000 +0100
++++ /tmp/dpep.FoExSn/cyrus-imapd-2.2.12/imap/imapd.c 2006-02-14 17:13:44.660438143 +0100
@@ -137,6 +137,18 @@
1, 1, &imapd_authstate, &imapd_userisadmin, &imapd_userisproxyadmin
};
@@ -214,9 +214,9 @@
/* Create telemetry log */
imapd_logfd = telemetry_log(imapd_userid, imapd_in, imapd_out, 0);
-diff -urNad cyrus-imapd-2.2.12/imap/pop3d.c /tmp/dpep.hL1Os6/cyrus-imapd-2.2.12/imap/pop3d.c
---- cyrus-imapd-2.2.12/imap/pop3d.c 2005-11-17 04:23:45.000000000 +0100
-+++ /tmp/dpep.hL1Os6/cyrus-imapd-2.2.12/imap/pop3d.c 2005-11-17 04:23:46.960947563 +0100
+diff -urNad cyrus-imapd-2.2.12/imap/pop3d.c /tmp/dpep.FoExSn/cyrus-imapd-2.2.12/imap/pop3d.c
+--- cyrus-imapd-2.2.12/imap/pop3d.c 2006-02-14 17:13:36.000000000 +0100
++++ /tmp/dpep.FoExSn/cyrus-imapd-2.2.12/imap/pop3d.c 2006-02-14 17:13:44.661438045 +0100
@@ -44,6 +44,10 @@
*/
#include <config.h>
@@ -261,9 +261,9 @@
}
/* Create telemetry log */
-diff -urNad cyrus-imapd-2.2.12/imap/version.c /tmp/dpep.hL1Os6/cyrus-imapd-2.2.12/imap/version.c
---- cyrus-imapd-2.2.12/imap/version.c 2005-11-17 04:21:25.000000000 +0100
-+++ /tmp/dpep.hL1Os6/cyrus-imapd-2.2.12/imap/version.c 2005-11-17 04:23:46.960947563 +0100
+diff -urNad cyrus-imapd-2.2.12/imap/version.c /tmp/dpep.FoExSn/cyrus-imapd-2.2.12/imap/version.c
+--- cyrus-imapd-2.2.12/imap/version.c 2006-02-11 23:57:19.000000000 +0100
++++ /tmp/dpep.FoExSn/cyrus-imapd-2.2.12/imap/version.c 2006-02-14 17:13:44.662437947 +0100
@@ -151,6 +151,10 @@
snprintf(env_buf + strlen(env_buf), MAXIDVALUELEN - strlen(env_buf),
"; %s", SIEVE_VERSION);
@@ -275,9 +275,9 @@
#ifdef HAVE_LIBWRAP
snprintf(env_buf + strlen(env_buf), MAXIDVALUELEN - strlen(env_buf),
"; TCP Wrappers");
-diff -urNad cyrus-imapd-2.2.12/lib/imapoptions /tmp/dpep.hL1Os6/cyrus-imapd-2.2.12/lib/imapoptions
---- cyrus-imapd-2.2.12/lib/imapoptions 2005-11-17 04:23:45.000000000 +0100
-+++ /tmp/dpep.hL1Os6/cyrus-imapd-2.2.12/lib/imapoptions 2005-11-17 04:26:47.858267907 +0100
+diff -urNad cyrus-imapd-2.2.12/lib/imapoptions /tmp/dpep.FoExSn/cyrus-imapd-2.2.12/lib/imapoptions
+--- cyrus-imapd-2.2.12/lib/imapoptions 2006-02-14 17:13:36.000000000 +0100
++++ /tmp/dpep.FoExSn/cyrus-imapd-2.2.12/lib/imapoptions 2006-02-14 17:13:44.663437849 +0100
@@ -196,6 +196,15 @@
{ "deleteright", "c", STRING }
/* The right that a user needs to delete a mailbox. */
Modified: branches/sarge/cyrus-imapd-2.2.12/debian/po/POTFILES.in
URL: https://mail.incase.de/viewcvs/branches/sarge/cyrus-imapd-2.2.12/debian/po/POTFILES.in?rev=302&root=cyrus22&r1=301&r2=302&view=diff
==============================================================================
--- branches/sarge/cyrus-imapd-2.2.12/debian/po/POTFILES.in (original)
+++ branches/sarge/cyrus-imapd-2.2.12/debian/po/POTFILES.in Sat Feb 18 21:08:19 2006
@@ -1,1 +1,1 @@
-[type: gettext/rfc822deb] cyrus22-common.templates
+[type: gettext/rfc822deb] cyrus-common-2.2.templates
Modified: branches/sarge/cyrus-imapd-2.2.12/debian/rules
URL: https://mail.incase.de/viewcvs/branches/sarge/cyrus-imapd-2.2.12/debian/rules?rev=302&root=cyrus22&r1=301&r2=302&view=diff
==============================================================================
--- branches/sarge/cyrus-imapd-2.2.12/debian/rules (original)
+++ branches/sarge/cyrus-imapd-2.2.12/debian/rules Sat Feb 18 21:08:19 2006
@@ -227,9 +227,9 @@
# and logcheck files
install -m 644 debian/logcheck.ignore \
- $(PKGDIR)/etc/logcheck/ignore.d.server/cyrus2.2
- install -m 644 debian/logcheck.ignore \
- $(PKGDIR)/etc/logcheck/violations.ignore.d/cyrus2.2
+ $(PKGDIR)/etc/logcheck/ignore.d.server/cyrus2_2
+ install -m 644 debian/logcheck.violations.ignore \
+ $(PKGDIR)/etc/logcheck/violations.ignore.d/cyrus2_2
# Install the stuff needed for upgrades
for i in convert-sieve.pl dohash rehash undohash translatesieve \
More information about the Pkg-Cyrus-imapd-Debian-devel
mailing list