[26551] in Source-Commits
/svn/athena r25619 - trunk/debathena/config/thunderbird-config/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Fri Jul 6 15:11:03 2012
Date: Fri, 6 Jul 2012 15:11:00 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201207061911.q66JB01e012398@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2012-07-06 15:11:00 -0400 (Fri, 06 Jul 2012)
New Revision: 25619
Removed:
trunk/debathena/config/thunderbird-config/debian/thunderbird.debathena
Modified:
trunk/debathena/config/thunderbird-config/debian/changelog
trunk/debathena/config/thunderbird-config/debian/compat
trunk/debathena/config/thunderbird-config/debian/control.in
trunk/debathena/config/thunderbird-config/debian/debathena-thunderbird-config.install
trunk/debathena/config/thunderbird-config/debian/debathena-thunderbird-config.links
trunk/debathena/config/thunderbird-config/debian/debathena.js
trunk/debathena/config/thunderbird-config/debian/rules
Log:
In thunderbird-config:
* Update for Thunderbird 3.x, drop all support for pre-3.x releases
* Disable offline IMAP (Trac: #1020)
Modified: trunk/debathena/config/thunderbird-config/debian/changelog
===================================================================
--- trunk/debathena/config/thunderbird-config/debian/changelog 2012-07-06 16:59:30 UTC (rev 25618)
+++ trunk/debathena/config/thunderbird-config/debian/changelog 2012-07-06 19:11:00 UTC (rev 25619)
@@ -1,3 +1,10 @@
+debathena-thunderbird-config (1.8) unstable; urgency=low
+
+ * Update for Thunderbird 3.x, drop all support for pre-3.x releases
+ * Disable offline IMAP (Trac: #1020)
+
+ -- Jonathan Reed <jdreed@mit.edu> Fri, 06 Jul 2012 15:12:06 -0400
+
debathena-thunderbird-config (1.7) unstable; urgency=low
* No change rebuild to pick up config-package-dev 4.13 changes
Modified: trunk/debathena/config/thunderbird-config/debian/compat
===================================================================
--- trunk/debathena/config/thunderbird-config/debian/compat 2012-07-06 16:59:30 UTC (rev 25618)
+++ trunk/debathena/config/thunderbird-config/debian/compat 2012-07-06 19:11:00 UTC (rev 25619)
@@ -1 +1 @@
-6
+7
Modified: trunk/debathena/config/thunderbird-config/debian/control.in
===================================================================
--- trunk/debathena/config/thunderbird-config/debian/control.in 2012-07-06 16:59:30 UTC (rev 25618)
+++ trunk/debathena/config/thunderbird-config/debian/control.in 2012-07-06 19:11:00 UTC (rev 25619)
@@ -3,12 +3,14 @@
Priority: extra
Maintainer: Debathena Project <debathena@mit.edu>
Build-Depends: @cdbs@
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
Package: debathena-thunderbird-config
+X-Debathena-No-Build: hardy
Architecture: all
-Depends: ${misc:Depends}, debathena-hesiod-config, icedove | thunderbird
+Depends: ${misc:Depends}, icedove | thunderbird
Description: Thunderbird configuration for Debathena
- This package configures Thunderbird for the Debathena system, setting
- it to use MIT's IMAP and SMTP servers, and also setting a few other
- settings for the MIT environment.
+ This package configures Thunderbird for the Debathena system, which
+ primarily consists of disabling offline IMAP storage. Account
+ settings are not dealt with here, but via Thunderbird's autoconfig
+ mechanism.
Modified: trunk/debathena/config/thunderbird-config/debian/debathena-thunderbird-config.install
===================================================================
--- trunk/debathena/config/thunderbird-config/debian/debathena-thunderbird-config.install 2012-07-06 16:59:30 UTC (rev 25618)
+++ trunk/debathena/config/thunderbird-config/debian/debathena-thunderbird-config.install 2012-07-06 19:11:00 UTC (rev 25619)
@@ -1,3 +1 @@
debian/debathena.js usr/share/debathena-thunderbird-config
-debian/debathena.cfg usr/lib/thunderbird
-debian/thunderbird.debathena usr/bin
Modified: trunk/debathena/config/thunderbird-config/debian/debathena-thunderbird-config.links
===================================================================
--- trunk/debathena/config/thunderbird-config/debian/debathena-thunderbird-config.links 2012-07-06 16:59:30 UTC (rev 25618)
+++ trunk/debathena/config/thunderbird-config/debian/debathena-thunderbird-config.links 2012-07-06 19:11:00 UTC (rev 25619)
@@ -1,3 +1,2 @@
usr/share/debathena-thunderbird-config/debathena.js etc/icedove/pref/debathena.js
-usr/bin/thunderbird.debathena usr/bin/icedove.debathena
-usr/lib/thunderbird/debathena.cfg usr/lib/icedove/debathena.cfg
+usr/share/debathena-thunderbird-config/debathena.js etc/thunderbird/pref/debathena.js
Modified: trunk/debathena/config/thunderbird-config/debian/debathena.js
===================================================================
--- trunk/debathena/config/thunderbird-config/debian/debathena.js 2012-07-06 16:59:30 UTC (rev 25618)
+++ trunk/debathena/config/thunderbird-config/debian/debathena.js 2012-07-06 19:11:00 UTC (rev 25619)
@@ -1,2 +1,2 @@
-pref('general.config.obscure_value', 0);
-pref('general.config.filename', 'debathena.cfg');
+lock_pref("mail.server.default.autosync_offline_stores", false);
+lock_pref("mail.server.default.offline_download", false);
Modified: trunk/debathena/config/thunderbird-config/debian/rules
===================================================================
--- trunk/debathena/config/thunderbird-config/debian/rules 2012-07-06 16:59:30 UTC (rev 25618)
+++ trunk/debathena/config/thunderbird-config/debian/rules 2012-07-06 19:11:00 UTC (rev 25619)
@@ -1,18 +1,3 @@
#!/usr/bin/make -f
-TBIRD_VERSION = $(shell dpkg-query --showformat='$${Version}' --show thunderbird)
-NEW_TBIRD = $(shell dpkg --compare-versions $(TBIRD_VERSION) ge '3.0~' && echo y)
-
-
-DEB_DIVERT_EXTENSION = .debathena
-DEB_DIVERT_FILES_debathena-thunderbird-config += \
- /usr/bin/thunderbird.debathena \
- /usr/bin/icedove.debathena
-
-ifneq ($(NEW_TBIRD),y)
- install/debathena-thunderbird-config::
- dh_link usr/share/debathena-thunderbird-config/debathena.js etc/thunderbird/pref/debathena.js
-endif
-
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/config-package.mk
