Merge branch 'master' into dbus-update

gnu: chess: Update to 6.2.2.

* gnu/packages/games.scm (chess): Update to 6.2.2.

gnu: abbaye: Use 'sdl-union'.

* gnu/packages/games.scm (abbaye)[inputs]: Use 'sdl-union'.
  [arguments]: Adjust 'set-sdl-paths' phase accordingly.

gnu: abbaye: Use 'modify-phases'.

* gnu/packages/games.scm (abbaye)[arguments]: Use 'modify-phases'.

gnu: Add manaplus.

* gnu/packages/games.scm (manaplus): New variable.

gnu: Add MARS.

* gnu/packages/games.scm (mars): New variable.
* gnu/packages/patches/mars-install.patch: New file.
* gnu/packages/patches/mars-sfml-2.3.patch: New file.
* gnu-system.am (dist_patch_DATA): Add them.

Merge branch 'master' into core-updates

gnu: minetest: Update to 0.4.13.

* gnu/packages/games.scm (minetest-data, minetest): Update to 0.4.13.

gnu: Add Gamine.

* gnu/packages/games.scm (gamine): New variable.

gnu: Add wesnoth.

* gnu/packages/games.scm (wesnoth): New variable.

gnu: retroarch: Update to 1.2.2.

* gnu/packages/games.scm (retroarch): Update to 1.2.2.

Merge branch 'master' into core-updates

gnu packages: Clean up synopses and descriptions.

* gnu/packages/admin.scm, gnu/packages/algebra.scm, gnu/packages/audio.scm,
  gnu/packages/backup.scm, gnu/packages/base.scm, gnu/packages/bittorrent.scm,
  gnu/packages/code.scm, gnu/packages/compression.scm,
  gnu/packages/databases.scm, gnu/packages/enchant.scm,
  gnu/packages/firmware.scm, gnu/packages/fonts.scm,
  gnu/packages/freedesktop.scm, gnu/packages/games.scm, gnu/packages/gd.scm,
  gnu/packages/gl.scm, gnu/packages/gnome.scm, gnu/packages/gsasl.scm,
  gnu/packages/gstreamer.scm, gnu/packages/gtk.scm, gnu/packages/guile.scm,
  gnu/packages/haskell.scm, gnu/packages/language.scm,
  gnu/packages/lesstif.scm, gnu/packages/libreoffice.scm,
  gnu/packages/linux.scm, gnu/packages/llvm.scm, gnu/packages/maths.scm,
  gnu/packages/mcrypt.scm, gnu/packages/mit-krb5.scm, gnu/packages/mp3.scm,
  gnu/packages/ncdu.scm, gnu/packages/networking.scm, gnu/packages/ntp.scm,
  gnu/packages/ocaml.scm, gnu/packages/openbox.scm, gnu/packages/pdf.scm,
  gnu/packages/perl.scm, gnu/packages/pretty-print.scm,
  gnu/packages/pulseaudio.scm, gnu/packages/python.scm,
  gnu/packages/rdesktop.scm, gnu/packages/rdf.scm, gnu/packages/ruby.scm,
  gnu/packages/slang.scm, gnu/packages/slim.scm, gnu/packages/telephony.scm,
  gnu/packages/tls.scm, gnu/packages/tmux.scm, gnu/packages/tre.scm,
  gnu/packages/unrtf.scm, gnu/packages/version-control.scm,
  gnu/packages/vpn.scm, gnu/packages/web.scm, gnu/packages/wget.scm,
  gnu/packages/xdisorg.scm, gnu/packages/xfce.scm, gnu/packages/xiph.scm:
  Fix typos.  Trim long lines.  Add missing periods in the end of sentences.
  Use double spaces between sentences.  Remove trailing whitespaces.

gnu packages: Avoid description lines with leading "(".

* gnu/packages/curl.scm (curl): Reformat description to avoid a line
  beginning with "(" because such lines break font-lock highlighting
  in Emacs.
* gnu/packages/flashing-tools.scm (dfu-programmer): Likewise.
* gnu/packages/games.scm (gnugo): Likewise.
* gnu/packages/gnome.scm (json-glib): Likewise.
* gnu/packages/image.scm (jbig2dec): Likewise.
* gnu/packages/maths.scm (units): Likewise.
* gnu/packages/pdf.scm (mupdf): Likewise.
* gnu/packages/web.scm (perl-encode-locale): Likewise.
* gnu/packages/wordnet.scm (wordnet): Likewise.
* gnu/packages/xml.scm (libxml2):Likewise.

Merge branch 'master' into core-updates

Merge branch 'master' into gtk-rebuild

Conflicts:
	gnu/packages/gtk.scm

gnu: Add fizmo.

* gnu/packages/games.scm (fizmo): New variable.

gnu: Add GNUjump.

* gnu/packages/games.scm (gnujump): New variable.

gnu: gnubik: Update to 2.4.2.

* gnu/packages/games.scm (gnubik): Update to 2.4.2.

Merge branch 'master' into core-updates