upgpkg: city-defaults 1-6

Update for GNOME 3.14