Remove gnome-version.xml

This is crufty and no longer useful. gnome-control-center will now
display GNOME Shell version instead of gnome-desktop version, which is a
more meaningful version to display anyway.

With this change, we'll no longer have to spin releases of gnome-desktop
with no changes.

See also: gnome-shell#5406
See also: gnome-control-center!1299

4 files changed, 9 insertions, 52 deletions

diff --git a/gnome-version.xml.in b/gnome-version.xml.in
deleted file mode 100644
index 83264c6f..00000000
--- a/gnome-version.xml.in
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<gnome-version>
- <platform>@GNOME_PLATFORM@</platform>
- <minor>@GNOME_MINOR@</minor>
- <micro>@GNOME_MICRO@</micro>
- <distributor>@GNOME_DISTRIBUTOR@</distributor>
- @GNOME_DATE_COMMENT_START@<date>@GNOME_DATE@</date>@GNOME_DATE_COMMENT_END@
-</gnome-version>
\ No newline at end of file
diff --git a/libgnome-desktop/meson.build b/libgnome-desktop/meson.build
index 375cf57c..708a4ae8 100644
--- a/libgnome-desktop/meson.build
+++ b/libgnome-desktop/meson.build
@@ -27,17 +27,21 @@ conf.set('HAVE_OPENAT', cc.has_function('openat'))
 conf.set('HAVE_USELOCALE', cc.has_function('uselocale'))
 conf.set('HAVE_XLOCALE', cc.has_header('xlocale.h'))
 
+configure_file(
+  output: 'config.h',
+  configuration: conf,
+)
+
+version_conf = configuration_data()
+version_array = meson.project_version().split('.')
+version_conf.set('GNOME_PLATFORM', version_array[0])
+
 gnome_desktop_header_file = configure_file(
   input: 'gnome-desktop-version.h.in',
   output: 'gnome-desktop-version.h',
   configuration: version_conf,
 )
 
-configure_file(
-  output: 'config.h',
-  configuration: conf,
-)
-
 dbus_xrandr_built_sources = gnome.gdbus_codegen('meta-dbus-xrandr',
   'xrandr.xml',
   namespace: 'MetaDBus',
diff --git a/meson.build b/meson.build
index 6435acc4..d8a29cbd 100644
--- a/meson.build
+++ b/meson.build
@@ -85,33 +85,6 @@ if not cc.has_function('clock_gettime', dependencies: rt_dep)
   rt_dep = dependency('', required: false)
 endif
 
-version_array = meson.project_version().split('.')
-version_conf = configuration_data()
-
-version_conf.set('GNOME_PLATFORM', version_array[0])
-version_conf.set('GNOME_MINOR', version_array[1])
-version_conf.set('GNOME_MICRO', 0)
-version_conf.set('GNOME_DISTRIBUTOR', get_option('gnome_distributor'))
-
-if get_option('date_in_gnome_version')
-  date = run_command(['date', '+%Y-%m-%d'])
-  version_conf.set('GNOME_DATE', date.stdout().strip())
-  version_conf.set('GNOME_DATE_COMMENT_START', '')
-  version_conf.set('GNOME_DATE_COMMENT_END', '')
-else
-  version_conf.set('GNOME_DATE', '')
-  version_conf.set('GNOME_DATE_COMMENT_START', '<!--')
-  version_conf.set('GNOME_DATE_COMMENT_END', '-->')
-endif
-
-version_xml = configure_file(
-  configuration: version_conf,
-  input: 'gnome-version.xml.in',
-  output: 'gnome-version.xml',
-  install: true,
-  install_dir: versiondir,
-)
-
 subdir('libgnome-desktop')
 subdir('po')
 subdir('tests')
@@ -143,8 +116,6 @@ summary({
     'Build legacy libgnome-desktop': get_option('legacy_library'),
     'Desktop documentation': get_option('desktop_docs'),
     'API documentation': get_option('gtk_doc'),
-    'Date in gnome-version.xml': get_option('date_in_gnome_version'),
-    'GNOME distributor': get_option('gnome_distributor'),
     'Debug tools': get_option('debug_tools'),
     'Installed tests': get_option('installed_tests'),
   },
diff --git a/meson_options.txt b/meson_options.txt
index c4db6eaf..0eda239a 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,13 +1,3 @@
-option('gnome_distributor',
-  type: 'string', value: 'GNOME.Org',
-  description: 'Specify name of GNOME distributor'
-)
-
-option('date_in_gnome_version',
-  type: 'boolean', value: true,
-  description: 'Include the build date in gnome-version.xml'
-)
-
 option('desktop_docs',
   type: 'boolean', value: true,
   description: 'Build desktop-wide help documents'