* gnu/system/examples/vm-image.tmpl (label): New field.

* gnu/packages/bootloaders (u-boot-tools)[arguments]<#:phases>[check]:
Modify phase.
[check-x86]: New phase.
[patch]: New phase.

* gnu/packages/gnome.scm (gexiv2)[arguments]: New field.

Fixes <https://bugs.gnu.org/35501>.
Reported by Brendan Tildesley <mail@brendan.scot>.

* gnu/packages/libusb.scm (libplist)[arguments]: New field.

* gnu/packages/wm.scm (i3lock): New public variable.

(cherry picked from commit b6afc350514ae5016adc6ca70f7be72aa3ecb2d2)

* gnu/services/desktop.scm (colord-service-type): Make public.
[description]: New field.

Until now 'guix system search bluetooth' would turn up nothing.

* gnu/services/desktop.scm (bluetooth-service-type)
(bluetooth-configuration): Make public.
(bluetooth-service-type)[description]: New field.

* gnu/packages/games.scm (armagetronad):
(cataclysm-dda):
(abbaye):
(wesnoth):
(wesnoth-server):
(starfighter):
(kiki):
(fillets-ng):
(crawl):
(crawl-tiles):
(tome4):
(btanks):
(battle-tanks):
(edgar): Use these as the package definition.
(armagetron-advanced):
(cataclysm-dark-days-ahead):
(l-abbaye-des-morts):
(the-battle-for-wesnoth):
(the-battle-for-wesnoth-server):
(project-starfighter):
(kiki-the-nano-bot):
(fish-fillets-ng):
(dungeon-crawl-stone-soup):
(dungeon-crawl-stone-soup-tiles):
(tales-of-maj-eyal):
(the-legend-of-edgar): Turn these into obsolete aliases.

This reverts renames made by the following commits:
f95e33a7ad9afe3f5087b4d8c80731d731b08839
b1aee9fce2d4177dc0eb41c8509d50a131a19655
f6a21d61deecc37f8c900f2d2acf01475b917d10
24a67aef2ae0f40f1b4af235f5fc054881dc4db1
36a0b5b48c8f14e2ac5707dd6dfea99ee2304873
8b6e2bc15f0cbbe325f45fff9a7b5d3df143ca53
6639295f2f24ca8334d6b4d9d9cb63bd13388537
184f5c8db199adbc91b4b108c1bf89e3727f0bce
ecdb1348ad9992f7d98ea5b1b5b6bc0bafc9b79c
375cb94130b222535ad7c7e0fa0d212483407351
c91ed484d0b66d5639ba01f9ba301ff762d9170d
973bd8a62c13bc5b2ca08585c367589d8c7197fe
df42e0f9c9e6a85803d2709d195a8eb29ec7ee5f

* gnu/packages/wm.scm (i3-wm)[arguments]: Add a phase to patch the
session '.desktop' files to use the absolute paths of the 'i3' and
'i3-with-shmlog' binaries.

* gnu/packages/wm.scm (awesome)[arguments]: Add a phase to patch the
session '.desktop' file to use the absolute path of the 'awesome'
binary.