Imported Debian patch 2.14-1

diff --git a/debian/Muttrc b/debian/Muttrc
index 63584ba595b25c19dddf07a9f24a5b15128905cb..835f9485540cef13e91351b2d27d97bdb98b7178 100644 (file)
--- a/debian/Muttrc
+++ b/debian/Muttrc
@@ -1,13 +1,13 @@
-set display_filter='t-prot -cmekatlS --max-lines=250 --bigq --pgp-move-vrf -Mmutt -L/etc/t-prot/footers -A/etc/t-prot/ads'
+set display_filter='t-prot -cmekatlS --max-lines=250 --bigq --pgp-short --pgp-move-vrf -Mmutt -L/etc/t-prot/footers -A/etc/t-prot/ads'
 # set it to '' to turn it off by default
 
 # toggle TOFU protection with ESC-0 (off) and ESC-1 (on)
 macro generic \e0 ":unset display_filter\n" "Turn TOFU protection off"
-macro generic \e1 ":set display_filter='t-prot -cmekatlS --max-lines=250 --bigq --pgp-move-vrf -Mmutt -L/etc/t-prot/footers -A/etc/t-prot/ads'\n" "Turn TOFU protection on"
+macro generic \e1 ":set display_filter='t-prot -cmekatlS --max-lines=250 --bigq --pgp-short --pgp-move-vrf -Mmutt -L/etc/t-prot/footers -A/etc/t-prot/ads'\n" "Turn TOFU protection on"
 
 # same in pager mode - ugly but what the hell...
 macro pager \e0 ":unset display_filter; exec exit\n:exec display-message\n" "Turn TOFU protection off"
-macro pager \e1 ":set display_filter='t-prot -cmekatlS --max-lines=250 --bigq --pgp-move-vrf -Mmutt -L/etc/t-prot/footers -A/etc/t-prot/ads'; exec exit\n:exec display-message\n" "Turn TOFU protection on"
+macro pager \e1 ":set display_filter='t-prot -cmekatlS --max-lines=250 --bigq --pgp-short --pgp-move-vrf -Mmutt -L/etc/t-prot/footers -A/etc/t-prot/ads'; exec exit\n:exec display-message\n" "Turn TOFU protection on"
 
 # highlight TOFU protection:
 color body     brightmagenta           black   "^\\[---.*"

diff --git a/debian/changelog b/debian/changelog
index e04674c12decb9a3ff36ad1039c1b27f94339b17..7d6e6a55de7f24989aa612af4908d5b64b93f0ad 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+t-prot (2.14-1) unstable; urgency=low
+
+  * New upstream release improving --pgp-short performance.
+  * Enable --pgp-short in our Muttrc config snippet.
+  * Add Axel Beckert as Co-Maintainer. Enjoy. :)
+  * Add Vcs-* control fields.
+
+ -- Gerfried Fuchs <rhonda@debian.at>  Thu, 11 Feb 2010 21:33:51 +0100
+
 t-prot (2.13.1-1) unstable; urgency=low
 
   * New upstream release.

diff --git a/debian/control b/debian/control
index 82abeab28af4488c601e08e1912abc977d46e8af..1ea4733cf3318ea3bad1bee9609e95cb6ec7bc96 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,12 @@ Source: t-prot
 Section: mail
 Priority: optional
 Maintainer: Gerfried Fuchs <rhonda@debian.at>
+Uploaders: Axel Beckert <abe@debian.org>
 Build-Depends-Indep: po-debconf, patch
 Standards-Version: 3.8.4
 Homepage: http://www.escape.de/~tolot/mutt/
+Vcs-Browser: http://git.deb.at/w/pkg/t-prot.git
+Vcs-Git: git://git.deb.at/g/pkg/t-prot.git
 
 Package: t-prot
 Architecture: all