small fix to the German translation (Closes: 553238), set time_inc to be 250ms (Close...

  + upstream/553238-german-intl.patch: small fix to the German translation
    (Closes: 553238)
  + debian-specific/Muttrc: set time_inc to be 250ms (Closes: 537746)

diff --git a/debian/changelog b/debian/changelog
index bc98d6610f9df4463c56ba1ef62125587a9839f8..4ce5a602e35d90539c234cf4545856c9831ed380 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,11 @@ mutt (1.5.20-7) unstable; urgency=low
   * debian/patches:
     + upstream/548494-swedish-intl.patch: fixes to Swedish translation 
       (Closes: 548494)
   * debian/patches:
     + upstream/548494-swedish-intl.patch: fixes to Swedish translation 
       (Closes: 548494)

+    + upstream/553238-german-intl.patch: small fix to the German translation
+      (Closes: 553238)

     + upstream/553321-ansi-escape-segfault.patch: prevent mutt from segfaulting
       with large ASCII escape sequences (Closes: 553321)
     + upstream/553321-ansi-escape-segfault.patch: prevent mutt from segfaulting
       with large ASCII escape sequences (Closes: 553321)

+    + debian-specific/Muttrc: set time_inc to be 250ms (Closes: 537746)

   * debian/control: 
     + bumping Standards-Version to 3.8.4, nothing to be done
     + adding ${misc:Depends} to make lintian happy
   * debian/control: 
     + bumping Standards-Version to 3.8.4, nothing to be done
     + adding ${misc:Depends} to make lintian happy

diff --git a/debian/patches/debian-specific/Muttrc b/debian/patches/debian-specific/Muttrc
index 5c93eff9622e4911410422b9e27c61dcf4d551c7..fd0a798a117b9a9e0b45becbd3ce6400d5900a6e 100644 (file)
--- a/debian/patches/debian-specific/Muttrc
+++ b/debian/patches/debian-specific/Muttrc
@@ -58,7 +58,18 @@
  #
  # set hostname=cs.hmc.edu
  
  #
  # set hostname=cs.hmc.edu
  

-@@ -101,6 +129,9 @@
+@@ -47,6 +75,10 @@
+ # be undone with unmime_lookup.
+ mime_lookup application/octet-stream
+ 
++# Upgrade the progress counter every 250ms, good for mutt over SSH
++# see http://bugs.debian.org/537746
++set time_inc=250
++
+ ##
+ ## *** DEFAULT SETTINGS FOR THE ATTACHMENTS PATCH ***
+ ##
+@@ -101,6 +133,9 @@

  attachments   -A message/external-body
  attachments   -I message/external-body
  
  attachments   -A message/external-body
  attachments   -I message/external-body
  

diff --git a/debian/patches/series b/debian/patches/series
index 2257aa73f95c85ff6d64dc05b354a6771c849d6e..04fdeb52375589fc43980b533538677e88aec9d5 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -53,6 +53,7 @@ upstream/548577-gpgme-1.2.patch
 upstream/548494-swedish-intl.patch
 upstream/553321-ansi-escape-segfault.patch
 
 upstream/548494-swedish-intl.patch
 upstream/553321-ansi-escape-segfault.patch
 

+upstream/553238-german-intl.patch

 misc/hyphen-as-minus.patch
 #misc/manpage-typos.patch
 misc/smime_keys-manpage.patch
 misc/hyphen-as-minus.patch
 #misc/manpage-typos.patch
 misc/smime_keys-manpage.patch

diff --git a/debian/patches/upstream/553238-german-intl.patch b/debian/patches/upstream/553238-german-intl.patch
new file mode 100644 (file)
index 0000000..2e0c9b5
--- /dev/null
+++ b/debian/patches/upstream/553238-german-intl.patch
@@ -0,0 +1,14 @@
+Small fix in a German translation, the original bug submission was amended after
+consulting a native speaker (gregoa@)
+
+--- a/po/de.po
++++ b/po/de.po
+@@ -1648,7 +1648,7 @@
+ 
+ #: curs_main.c:1317 curs_main.c:1361
+ msgid "No undeleted messages."
+-msgstr "Alle Nachrichten gelöscht."
++msgstr "Keine ungelöschten Nachrichten."
+ 
+ #: curs_main.c:1354 curs_main.c:1378
+ msgid "You are on the first message."