[Pkg-mozext-commits] [firetray] 29/33: Merge tag 'upstream/0.6.0+dfsg'

[David Prévot]

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

taffit pushed a commit to branch master
in repository firetray.

commit f4ae9e06d1a9bcd1a5cd9ee0c67a989715b2f69c
Merge: 044e922 cde14fb
Author: David Prévot <david at tilapin.org>
Date:   Fri Oct 23 17:04:18 2015 -0400

    Merge tag 'upstream/0.6.0+dfsg'
    
    Upstream version 0.6.0+dfsg
    
    # gpg: Signature faite le ven. 23 oct. 2015 17:04:14 AST
    # gpg:                avec la clef RSA 058C1CF944F6BD3C
    # gpg: Bonne signature de « David Prévot <david at tilapin.org> »
    # gpg:                 alias « David Prévot <davidp at altern.org> »
    # gpg:                 alias « David Prévot <davidp at no-log.org> »
    # gpg:                 alias « David Prévot <taffit at debian.org> »
    # gpg: Attention : cette clef n'est pas certifiée avec une signature de confiance.
    # gpg:             Rien n'indique que la signature appartient à son propriétaire.
    # Empreinte de clef principale : AE14 AD01 426D 2BFB 82EF  7E1E B82A 217A FDFE 09F2
    #    Empreinte de la sous-clef : 7875 4D07 BC09 5C74 48F7  8D66 058C 1CF9 44F6 BD3C

 src/Makefile                                       |  13 +-
 src/chrome/content/options.js                      |  57 ++--
 src/chrome/content/options.xul                     | 329 +++++++++++----------
 src/chrome/locale/bg/options.dtd                   |   6 +-
 src/chrome/locale/de-DE/options.dtd                | 145 ++++-----
 src/chrome/locale/de-DE/options.properties         |   4 +-
 src/chrome/locale/de-DE/overlay.properties         |   6 +-
 src/chrome/locale/zh-TW/options.dtd                |  20 +-
 src/chrome/locale/zh-TW/overlay.properties         |   8 +-
 src/install.rdf                                    |   2 +-
 src/lib/linux/Makefile                             |   2 +-
 src/modules/FiretrayHandler.jsm                    |  93 +++---
 src/modules/FiretrayWindow.jsm                     |   2 +-
 src/modules/commons.js                             |   2 +-
 src/modules/ctypes/ctypes-utils.jsm                |   2 +-
 src/modules/ctypes/linux/cairo.jsm                 |  10 +
 src/modules/ctypes/linux/{gdk.jsm => gdk23.jsm}    |  89 +-----
 .../ctypes/linux/{ => gtk2}/appindicator.jsm       |  11 +-
 src/modules/ctypes/linux/gtk2/gdk.jsm              | 109 +++++++
 src/modules/ctypes/linux/{ => gtk2}/gtk.jsm        |   5 +-
 src/modules/ctypes/linux/gtk23.jsm                 |  21 ++
 .../ctypes/linux/{ => gtk3}/appindicator.jsm       |   9 +-
 src/modules/ctypes/linux/gtk3/gdk.jsm              |  69 +++++
 src/modules/ctypes/linux/{ => gtk3}/gtk.jsm        |  13 +-
 src/modules/linux/FiretrayAppIndicator.jsm         |  51 ++--
 src/modules/linux/FiretrayChatStatusIcon.jsm       |  15 +-
 src/modules/linux/FiretrayGtkIcons.jsm             |   7 +-
 src/modules/linux/FiretrayGtkStatusIcon.jsm        |  84 ++++--
 src/modules/linux/FiretrayPopupMenu.jsm            |  18 +-
 src/modules/linux/FiretrayStatusIcon.jsm           |  61 ++--
 src/modules/linux/FiretrayWindow.jsm               |  61 ++--
 src/modules/winnt/FiretrayStatusIcon.jsm           |   6 +-
 src/modules/winnt/FiretrayWindow.jsm               |   2 +-
 33 files changed, 795 insertions(+), 537 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/firetray.git