Merge branch 'bug-17853'

diff --cc gnu-system.am
Simple merge

diff --cc gnu/packages/gnome.scm
Simple merge

diff --cc gnu/packages/linux.scm
Simple merge

diff --cc gnu/packages/maths.scm
index 3fa7409,79a30fa..8134806
--- 1/gnu/packages/maths.scm
--- 2/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@@ -41,9 -41,9 +41,10 @@@
    #:use-module (gnu packages gcc)
    #:use-module (gnu packages gd)
    #:use-module (gnu packages ghostscript)
+   #:use-module (gnu packages glib)
    #:use-module (gnu packages gtk)
    #:use-module (gnu packages less)
 +  #:use-module (gnu packages lisp)
    #:use-module (gnu packages gnome)
    #:use-module (gnu packages xorg)
    #:use-module (gnu packages gl)

diff --cc gnu/packages/pdf.scm
Simple merge