[SVN] r528 - in /trunk/cyrus-imapd-2.2.13/debian: NEWS
UPGRADE.Debian changelog cyrus-common-2.2.install cyrus.conf rules
debian at incase.de
debian at incase.de
Mon Jul 31 03:22:38 UTC 2006
Author: astronut
Date: Mon Jul 31 05:22:25 2006
New Revision: 528
URL: https://mail.incase.de/viewcvs?rev=528&root=cyrus22&view=rev
Log:
Instead of changing conf, change cyr_expire's install path. Also, fix the build that sven totally fucked in r513 and no one noticed till now. We weren't actually installing half of the package.
Removed:
trunk/cyrus-imapd-2.2.13/debian/NEWS
Modified:
trunk/cyrus-imapd-2.2.13/debian/UPGRADE.Debian
trunk/cyrus-imapd-2.2.13/debian/changelog
trunk/cyrus-imapd-2.2.13/debian/cyrus-common-2.2.install
trunk/cyrus-imapd-2.2.13/debian/cyrus.conf
trunk/cyrus-imapd-2.2.13/debian/rules
Modified: trunk/cyrus-imapd-2.2.13/debian/UPGRADE.Debian
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/UPGRADE.Debian?rev=528&root=cyrus22&r1=527&r2=528&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/UPGRADE.Debian (original)
+++ trunk/cyrus-imapd-2.2.13/debian/UPGRADE.Debian Mon Jul 31 05:22:25 2006
@@ -25,7 +25,7 @@
information from cyrus v1.5 below and in more detail in
/usr/share/doc/cyrus-common-2.2/README.Debian.database.
-Please note that the 2.1 packages in Debian use a different fromat
+Please note that the 2.1 packages in Debian use a different format
from upstream, thus the upgrade is easier.
Upgrading sieve scripts
Modified: trunk/cyrus-imapd-2.2.13/debian/changelog
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/changelog?rev=528&root=cyrus22&r1=527&r2=528&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/changelog (original)
+++ trunk/cyrus-imapd-2.2.13/debian/changelog Mon Jul 31 05:22:25 2006
@@ -23,10 +23,8 @@
- README.Debian.
(Closes: #378520, #369882)
* Bump debian policy to version 3.7.2 (No changes required)
- * Fix path to cyr_expire in cyrus.conf. Thanks to Alexander Turic
- <alexander at turcic.com>. This has been broken a while.
- Since current users will probably have broken conf, add note to
- NEWS.Debian.
+ * Move cyr_expire to /usr/sbin as this is used in cyrus.conf.
+ Thanks to Alexander Turic <alexander at turcic.com>.
-- Benjamin Seidenberg <astronut at dlgeek.net> Sun, 30 Jul 2006 20:09:08 -0400
Modified: trunk/cyrus-imapd-2.2.13/debian/cyrus-common-2.2.install
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/cyrus-common-2.2.install?rev=528&root=cyrus22&r1=527&r2=528&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/cyrus-common-2.2.install (original)
+++ trunk/cyrus-imapd-2.2.13/debian/cyrus-common-2.2.install Mon Jul 31 05:22:25 2006
@@ -9,7 +9,6 @@
usr/sbin/tls_prune
usr/sbin/mbpath
usr/sbin/arbitron*
-usr/lib/cyrus/bin/cyr_expire
usr/lib/cyrus/bin/lmtpd
usr/lib/cyrus/bin/timsieved
usr/lib/cyrus/bin/sievec
Modified: trunk/cyrus-imapd-2.2.13/debian/cyrus.conf
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/cyrus.conf?rev=528&root=cyrus22&r1=527&r2=528&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/cyrus.conf (original)
+++ trunk/cyrus-imapd-2.2.13/debian/cyrus.conf Mon Jul 31 05:22:25 2006
@@ -18,7 +18,7 @@
#mupdatepush cmd="/usr/sbin/ctl_mboxlist -m"
# this is recommended if using duplicate delivery suppression
- delprune cmd="/usr/lib/cyrus/bin/cyr_expire -E 3"
+ delprune cmd="/usr/sbin/cyr_expire -E 3"
# this is recommended if caching TLS sessions
tlsprune cmd="/usr/sbin/tls_prune"
}
Modified: trunk/cyrus-imapd-2.2.13/debian/rules
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/rules?rev=528&root=cyrus22&r1=527&r2=528&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/rules (original)
+++ trunk/cyrus-imapd-2.2.13/debian/rules Mon Jul 31 05:22:25 2006
@@ -182,7 +182,8 @@
mv $(TMPPKG)/usr/lib/cyrus/bin/$$i $(TMPPKG)/usr/sbin/cyr$$i ;\
done
for i in mbpath ctl_mboxlist ctl_deliver ctl_cyrusdb squatter \
- tls_prune ipurge cyrdump cvt_cyrusdb chk_cyrus arbitron; do \
+ tls_prune ipurge cyrdump cvt_cyrusdb chk_cyrus arbitron \
+ cyr_expire; do \
mv $(TMPPKG)/usr/lib/cyrus/bin/$$i $(TMPPKG)/usr/sbin/$$i ;\
done
mkdir -p $(TMPPKG)/usr/include
@@ -264,7 +265,7 @@
install -m 644 "$$i" "$${i%%.lintian}/usr/share/lintian/overrides/$${i%%.lintian}" ;\
done
- dh_movefiles -a
+ dh_install -a --sourcedir=$(TMPPKG)
touch install-arch-stamp
# We aren't actually able to install arch-indep independently from
@@ -292,7 +293,7 @@
mkdir -p $(DOCDIR)/contrib
xargs < debian/cyrus-common-2.2.contrib -rti cp -r '{}' $(DOCDIR)/contrib
- dh_movefiles -i
+ dh_install -i --sourcedir=$(TMPPKG)
binary-indep: install-indep
dh_testdir -i
More information about the Pkg-Cyrus-imapd-Debian-devel
mailing list