Merge remote-tracking branch 'savannah/master' into core-updates

Change-Id: I4f15bcb3e575062c4dd3b6c07a48470300413f24

Conflicts:
	gnu/local.mk
	gnu/packages/bioinformatics.scm
	gnu/packages/dictionaries.scm
	gnu/packages/display-managers.scm
	gnu/packages/engineering.scm
	gnu/packages/geo.scm
	gnu/packages/gl.scm
	gnu/packages/glib.scm
	gnu/packages/gnome-xyz.scm
	gnu/packages/gnome.scm
	gnu/packages/gtk.scm
	gnu/packages/image-processing.scm
	gnu/packages/linux.scm
	gnu/packages/mail.scm
	gnu/packages/patches/eudev-rules-directory.patch
	gnu/packages/plotutils.scm
	gnu/packages/sdl.scm
	gnu/packages/syndication.scm

1 files changed, 3 insertions, 3 deletions

diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm
index f67e83aa9f..15518896ed 100644
--- a/gnu/packages/education.scm
+++ b/gnu/packages/education.scm
@@ -192,7 +192,7 @@ of categories with some of the activities available in that category.
            qtgraphicaleffects
            qtmultimedia-5
            qtquickcontrols2-5
-           qtsensors
+           qtsensors-5
            qtsvg-5))
     (home-page "https://gcompris.net/index-en.html")
     (synopsis "Educational games for small children")
@@ -566,7 +566,7 @@ a pen-tablet display and a beamer.")
 (define-public fet
   (package
     (name "fet")
-    (version "6.18.1")
+    (version "6.19.0")
     (source
      (origin
        (method url-fetch)
@@ -575,7 +575,7 @@ a pen-tablet display and a beamer.")
               (list (string-append directory base)
                     (string-append directory "old/" base))))
        (sha256
-        (base32 "0yf94z4yybaw53jf0hzi1p53rwa91wl3g6pai7gsr4palssyfxw2"))))
+        (base32 "1lrlwk9i2nc2d3ay5wajgv79nxkbl8hgv77aflgncikg4ma9yn55"))))
     (build-system gnu-build-system)
     (arguments
      (list