From 1bd59773fffa43698aae35b1cb29085971f56ce2 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@collabora.com>
Date: Tue, 6 Aug 2019 15:59:47 +0100
Subject: [PATCH] system-info: Move from examples/ to bin/ and install in its
 own package

This has become less an example and more a command-line driver for the
library, so rename it accordingly.

Signed-off-by: Simon McVittie <smcv@collabora.com>
---
 {examples => bin}/meson.build                 |  0
 {examples => bin}/system-info.c               |  0
 debian/control                                | 22 +++++++++++++++++++
 debian/libsteam-runtime-tools-0-tests.install |  1 -
 debian/steam-runtime-tools-bin.install        |  1 +
 meson.build                                   |  2 +-
 tests/meson.build                             |  4 ++--
 ...amples-system-info.c => system-info-cli.c} |  0
 8 files changed, 26 insertions(+), 4 deletions(-)
 rename {examples => bin}/meson.build (100%)
 rename {examples => bin}/system-info.c (100%)
 create mode 100644 debian/steam-runtime-tools-bin.install
 rename tests/{examples-system-info.c => system-info-cli.c} (100%)

diff --git a/examples/meson.build b/bin/meson.build
similarity index 100%
rename from examples/meson.build
rename to bin/meson.build
diff --git a/examples/system-info.c b/bin/system-info.c
similarity index 100%
rename from examples/system-info.c
rename to bin/system-info.c
diff --git a/debian/control b/debian/control
index a6d229ae3..3e77d7914 100644
--- a/debian/control
+++ b/debian/control
@@ -86,6 +86,7 @@ Section: misc
 Depends:
  ${misc:Depends},
  ${shlibs:Depends},
+ steam-runtime-tools-bin,
  zlib1g,
 Description:
  The Steam Runtime is the library stack used to run the Steam client
@@ -93,3 +94,24 @@ Description:
  supporting code used by the Steam client to discover system information.
  .
  This package contains automated tests.
+
+Package: steam-runtime-tools-bin
+Architecture: any
+Multi-Arch: foreign
+Section: libdevel
+Breaks:
+ libsteam-runtime-tools-0-tests (<< 0.20190806.0~),
+Replaces:
+ libsteam-runtime-tools-0-tests (<< 0.20190806.0~),
+Depends:
+ libsteam-runtime-tools-0-0,
+ ${misc:Depends},
+ ${shlibs:Depends},
+Description: Steam Runtime utility library - command-line tools
+ The Steam Runtime is the library stack used to run the Steam client
+ on Linux. The Steam Runtime Tools utility library contains open-source
+ supporting code used by the Steam client to discover system information.
+ .
+ This package contains the command-line tool steam-runtime-system-info,
+ which summarizes everything that the libsteam-runtime-tools library
+ can find out.
diff --git a/debian/libsteam-runtime-tools-0-tests.install b/debian/libsteam-runtime-tools-0-tests.install
index 7c203c2ab..e2a295100 100644
--- a/debian/libsteam-runtime-tools-0-tests.install
+++ b/debian/libsteam-runtime-tools-0-tests.install
@@ -1,3 +1,2 @@
-usr/bin/steam-runtime-system-info
 usr/libexec/installed-tests
 usr/share/installed-tests
diff --git a/debian/steam-runtime-tools-bin.install b/debian/steam-runtime-tools-bin.install
new file mode 100644
index 000000000..0d975a7d5
--- /dev/null
+++ b/debian/steam-runtime-tools-bin.install
@@ -0,0 +1 @@
+usr/bin/steam-runtime-system-info
diff --git a/meson.build b/meson.build
index 1a2c000cd..0ed78ea72 100644
--- a/meson.build
+++ b/meson.build
@@ -129,8 +129,8 @@ if multiarch != ''
   subdir('helpers')
 endif
 
+subdir('bin')
 subdir('docs')
-subdir('examples')
 subdir('tests')
 
 # vim:set sw=2 sts=2 et:
diff --git a/tests/meson.build b/tests/meson.build
index 4a9d6e0d3..de2c93df2 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -25,13 +25,13 @@ test_env = environment()
 test_env.set('G_TEST_SRCDIR', meson.current_source_dir())
 test_env.set('G_TEST_BUILDDIR', meson.current_build_dir())
 test_env.set('SRT_HELPERS_PATH', join_paths(meson.current_build_dir(), '..', 'helpers'))
-test_env.prepend('PATH', join_paths(meson.current_build_dir(), '..', 'examples'))
+test_env.prepend('PATH', join_paths(meson.current_build_dir(), '..', 'bin'))
 
 tests = [
   'architecture',
-  'examples-system-info',
   'library',
   'system-info',
+  'system-info-cli',
 ]
 
 tests_dir = join_paths(
diff --git a/tests/examples-system-info.c b/tests/system-info-cli.c
similarity index 100%
rename from tests/examples-system-info.c
rename to tests/system-info-cli.c
-- 
GitLab