From f6032abc00c03dfc179bc605278bdd322db4af3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
Date: Sun, 22 Jul 2018 15:25:04 +0200
Subject: [PATCH] Install rooston.ini via meson
This makes sure other packaging formats get the configuration too.
---
data/meson.build | 2 ++
rootston.ini => data/rootston.ini | 0
debian/phosh.examples | 1 -
debian/rules | 4 ----
4 files changed, 2 insertions(+), 5 deletions(-)
rename rootston.ini => data/rootston.ini (100%)
delete mode 100644 debian/phosh.examples
diff --git a/data/meson.build b/data/meson.build
index 30daa8635..6781ec621 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -62,3 +62,5 @@ install_data(
schemas,
install_dir: 'share/glib-2.0/schemas'
)
+
+install_data('rootston.ini', install_dir : pkgdatadir)
diff --git a/rootston.ini b/data/rootston.ini
similarity index 100%
rename from rootston.ini
rename to data/rootston.ini
diff --git a/debian/phosh.examples b/debian/phosh.examples
deleted file mode 100644
index 537eeb1c4..000000000
--- a/debian/phosh.examples
+++ /dev/null
@@ -1 +0,0 @@
-rootston.ini
diff --git a/debian/rules b/debian/rules
index b2d064b1a..e0f1b809b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,10 +5,6 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
%:
dh $@ --builddirectory=_build
-override_dh_auto_install:
- dh_auto_install
- cp rootston.ini debian/phosh/usr/share/phosh/
-
override_dh_installsystemd:
dh_installsystemd --no-start --no-enable
--
GitLab