01/03: Merge branch 'master' into core-updates

[Marius Bakke]

mbakke pushed a commit to branch core-updates
in repository guix.

commit b4c22f25468cbb0b1644194381b25c795502bc16
Merge: 5146f22 77576be
Author: Marius Bakke <address@hidden>
Date:   Thu Nov 2 22:24:24 2017 +0100

    Merge branch 'master' into core-updates

 doc/guix.texi                                      |   2 +-
 gnu/local.mk                                       |   1 +
 gnu/packages/dejagnu.scm                           |   6 +-
 gnu/packages/dns.scm                               |   4 +-
 gnu/packages/emacs.scm                             |   4 +-
 gnu/packages/enlightenment.scm                     |   8 +-
 gnu/packages/geo.scm                               |  34 +-
 gnu/packages/glib.scm                              |  21 +-
 gnu/packages/gnome.scm                             |  42 +-
 gnu/packages/image-viewers.scm                     |   6 +-
 gnu/packages/imagemagick.scm                       |   6 +-
 gnu/packages/java.scm                              | 701 +++++++++++++++++++++
 gnu/packages/maths.scm                             |  18 +-
 .../patches/java-powermock-fix-java-files.patch    | 178 ++++++
 gnu/packages/perl.scm                              |  22 +
 gnu/packages/tls.scm                               |  28 +-
 gnu/packages/upnp.scm                              |   4 +-
 gnu/packages/version-control.scm                   |   6 +-
 gnu/packages/video.scm                             |  11 +-
 gnu/system/shadow.scm                              |  14 +-
 gnu/tests/ssh.scm                                  |  28 +
 21 files changed, 1058 insertions(+), 86 deletions(-)