Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

eos-paygd: Fix meson conflation between eos-paygd.conf output files #17

Merged
merged 1 commit into from
Mar 30, 2018
Merged

eos-paygd: Fix meson conflation between eos-paygd.conf output files #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion debian/eos-paygd.install
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
lib/systemd/system/eos-paygd.service
usr/lib/*/eos-paygd1
usr/lib/sysusers.d/eos-paygd.conf
usr/lib/tmpfiles.d/eos-paygd.conf
usr/lib/tmpfiles.d/eos-paygd-state.conf
usr/share/dbus-1/system.d/com.endlessm.Payg1.conf
usr/share/dbus-1/system-services/com.endlessm.Payg1.service
usr/share/man/man5/eos-payg.conf.5*
Expand Down
2 changes: 1 addition & 1 deletion debian/eos-paygd.postinst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ set -e

if [ "$1" = configure ]; then
systemd-sysusers /lib/sysusers.d/eos-paygd.conf
systemd-tmpfiles --create /lib/tmpfiles.d/eos-paygd.conf
systemd-tmpfiles --create /lib/tmpfiles.d/eos-paygd-state.conf
fi

#DEBHELPER#
0 eos-paygd/eos-paygd.tmpfiles.conf.in → eos-paygd/eos-paygd-state.conf.in
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions eos-paygd/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ configure_file(
configuration: config,
)
configure_file(
input: 'eos-paygd.tmpfiles.conf.in',
output: 'eos-paygd.conf',
input: 'eos-paygd-state.conf.in',
output: 'eos-paygd-state.conf',
install_dir: dependency('systemd').get_pkgconfig_variable('tmpfilesdir'),
configuration: config,
)
Expand Down