[24009] in Source-Commits
/svn/athena r23618 - trunk/debathena/config/alpine-config/debian
daemon@ATHENA.MIT.EDU (Evan Broder)
Sat Mar 14 00:41:48 2009
Date: Sat, 14 Mar 2009 00:41:40 -0400
From: Evan Broder <broder@MIT.EDU>
Message-Id: <200903140441.n2E4fead014509@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: broder
Date: 2009-03-14 00:41:40 -0400 (Sat, 14 Mar 2009)
New Revision: 23618
Added:
trunk/debathena/config/alpine-config/debian/transform_pine.conf.debathena
Removed:
trunk/debathena/config/alpine-config/debian/debathena-alpine-config.install
trunk/debathena/config/alpine-config/debian/pine.conf.debathena
Modified:
trunk/debathena/config/alpine-config/debian/changelog
trunk/debathena/config/alpine-config/debian/rules
Log:
In alpine-config:
* Use DEB_TRANSFORM_FILES to isolate our changes to the default config.
Modified: trunk/debathena/config/alpine-config/debian/changelog
===================================================================
--- trunk/debathena/config/alpine-config/debian/changelog 2009-03-14 04:02:41 UTC (rev 23617)
+++ trunk/debathena/config/alpine-config/debian/changelog 2009-03-14 04:41:40 UTC (rev 23618)
@@ -2,8 +2,9 @@
* Depend on alpine instead of only recommending it.
* Revert 1.4; this is being handled upstream.
+ * Use DEB_TRANSFORM_FILES to isolate our changes to the default config.
- -- Evan Broder <broder@mit.edu> Fri, 13 Mar 2009 23:51:38 -0400
+ -- Evan Broder <broder@mit.edu> Sat, 14 Mar 2009 00:41:22 -0400
debathena-alpine-config (1.4) unstable; urgency=low
Deleted: trunk/debathena/config/alpine-config/debian/debathena-alpine-config.install
Deleted: trunk/debathena/config/alpine-config/debian/pine.conf.debathena
Modified: trunk/debathena/config/alpine-config/debian/rules
===================================================================
--- trunk/debathena/config/alpine-config/debian/rules 2009-03-14 04:02:41 UTC (rev 23617)
+++ trunk/debathena/config/alpine-config/debian/rules 2009-03-14 04:41:40 UTC (rev 23618)
@@ -1,8 +1,12 @@
#!/usr/bin/make -f
DEB_DIVERT_EXTENSION = .debathena
-DEB_DIVERT_FILES_debathena-alpine-config += \
- /etc/pine.conf
+DEB_TRANSFORM_FILES_debathena-alpine-config += \
+ /etc/pine.conf.debathena
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/config-package.mk
+
+debian/check_file_copies/etc/pine.conf.debathena::
+ mkdir -p debian/check_file_copies/etc
+ alpine -conf >$@
Added: trunk/debathena/config/alpine-config/debian/transform_pine.conf.debathena
===================================================================
--- trunk/debathena/config/alpine-config/debian/transform_pine.conf.debathena 2009-03-14 04:02:41 UTC (rev 23617)
+++ trunk/debathena/config/alpine-config/debian/transform_pine.conf.debathena 2009-03-14 04:41:40 UTC (rev 23618)
@@ -0,0 +1,17 @@
+#!/usr/bin/perl -0p
+s#^(user-domain=).*$#${1}mit.edu#m or die;
+s#^(nntp-server=).*$#${1}news.mit.edu#m or die;
+s#^(inbox-path=).*$#${1}{mit.edu/hesiod/imap}INBOX#m or die;
+s#^(feature-list=).*$#${1}enable-mail-check-cue\n\tsave-will-quote-leading-froms\n\tenable-full-header-cmd#m or die;
+s#^(bugs-fullname=).*$#${1}Athena Bugs#m or die;
+s#^(bugs-address=).*$#${1}bugs\@mit.edu#m or die;
+s#^(suggest-fullname=).*$#${1}Athena Suggestions#m or die;
+s#^(suggest-address=).*$#${1}suggest\@mit.edu#m or die;
+s#^(local-fullname=).*$#${1}Athena Consultants#m or die;
+s#^(local-address=).*$#${1}olc-mail\@mit.edu#m or die;
+s#^(url-viewers=).*$#${1}/usr/bin/sensible-browser#m or die;
+s#^(folder-collections=).*$#${1}"MIT Mail" {mit.edu/hesiod/imap}INBOX.[]#m or die;
+s#^(sendmail-path=).*$#${1}/usr/lib/debathena-msmtp -t#m or die;
+s#^(rsh-open-timeout=).*$#${1}0#m or die;
+s#^(ssh-open-timeout=).*$#${1}0#m or die;
+s#^(new-version-threshold=).*$#\# (Athena hack: 'z' should be lexically greater than any pine version.)\n${1}z#m or die;
Property changes on: trunk/debathena/config/alpine-config/debian/transform_pine.conf.debathena
___________________________________________________________________
Name: svn:executable
+ *