[Pkg-privacy-commits] [torbirdy] 01/03: Imported Upstream version 0.2.1

[Ulrike Uhlig]

This is an automated email from the git hooks/post-receive script.

u-guest pushed a commit to annotated tag upstream/0.2.1
in repository torbirdy.

commit bd133df2fb148976af220815fd9f6766cedb85e2
Merge: 812e880 3751aa7
Author: Ulrike Uhlig <u at 451f.org>
Date:   Thu Dec 1 21:04:58 2016 +0100

    Imported Upstream version 0.2.1

 ChangeLog                     | 6 ++++++
 README.RELEASE                | 1 +
 chrome/content/emailwizard.js | 4 ++++
 components/torbirdy.js        | 6 +-----
 install.rdf                   | 2 +-
 5 files changed, 13 insertions(+), 6 deletions(-)

diff --cc ChangeLog
index ac49c95,ac49c95..07774ae
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,3 -1,3 +1,9 @@@
++0.2.1,
++ * Bug 20157: Do not set calendar timezone to UTC
++ * Bug 20750, 20644: Ensure RSS feeds are displayed in plain text
++ * Revert setting no_proxies_on to an empty string
++ * Added support for automatic configuration of systemli.org email accounts
++
  0.2.0, 27 Jun 2016
  
   * Bug 6314: Prevent local timestamp disclosure via Date header
diff --cc README.RELEASE
index f398409,f398409..8fb2d86
--- a/README.RELEASE
+++ b/README.RELEASE
@@@ -16,5 -16,5 +16,6 @@@ To perform a release for TorBirdy
    Upload the package to Mozilla's AddOn site manually
    Write a blog post anouncing the release on the Tor Project blog
    Write an email anouncing the release to tor-talk
++  Bump the version number on the wiki and make other relevant changes
    Announce the release widely in whatever format is reasonable or desired
   
diff --cc chrome/content/emailwizard.js
index 2da6ad7,2da6ad7..d09ea5b
--- a/chrome/content/emailwizard.js
+++ b/chrome/content/emailwizard.js
@@@ -106,6 -106,6 +106,10 @@@ if(!org.torbirdy.emailwizard) org.torbi
            config.incoming.hostname = "mail.%EMAILDOMAIN%";
            config.outgoing.hostname = "mail.%EMAILDOMAIN%";
            break;
++        case "systemli.org":
++          config.incoming.hostname = "mail.%EMAILDOMAIN%";
++          config.outgoing.hostname = "mail.%EMAILDOMAIN%";
++          break;
        }
  
        replaceVariables(config, realname, email, password);
diff --cc components/torbirdy.js
index d4743e0,d4743e0..41baf5f
--- a/components/torbirdy.js
+++ b/components/torbirdy.js
@@@ -37,8 -37,8 +37,6 @@@ var TorBirdyPrefs = 
  
    // Use a manual proxy configuration.
    "network.proxy.type": 1,
--  // https://bugs.torproject.org/10419
--  "network.proxy.no_proxies_on": "",
    // Restrict TBB ports.
    "network.security.ports.banned": "9050,9051,9150,9151",
    // Number of seconds to wait before attempting to recontact an unresponsive proxy server.
@@@ -312,9 -312,9 +310,6 @@@
  
    // Mozilla Lightning.
    "calendar.useragent.extra": "",
--  // We have to set a timezone otherwise the system time is used. "UTC" or
--  // "GMT" is not an option so we set it to Europe/London.
--  "calendar.timezone.local": "Europe/London",
  
    /*
     Other Settings
@@@ -325,6 -325,6 +320,7 @@@
    // These are similar to the mailnews.* settings.
    "rss.display.disallow_mime_handlers": 3,
    "rss.display.html_as": 1,
++  "rss.show.content-base": 1,
  
    // Override the user agent by setting it to an empty string.
    "general.useragent.override": "",
diff --cc install.rdf
index 801c7ad,801c7ad..93736d4
--- a/install.rdf
+++ b/install.rdf
@@@ -4,7 -4,7 +4,7 @@@
       xmlns:em="http://www.mozilla.org/2004/em-rdf#">
    <Description about="urn:mozilla:install-manifest">
      <em:id>castironthunderbirdclub at torproject.org</em:id>
--    <em:version>0.2.0</em:version>
++    <em:version>0.2.1</em:version>
      <em:type>2</em:type>
      <em:iconURL>chrome://castironthunderbirdclub/skin/images/tor.png</em:iconURL>
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/torbirdy.git