diff options
| author | Florian Dold <florian@dold.me> | 2024-12-03 00:06:54 +0100 |
|---|---|---|
| committer | Florian Dold <florian@dold.me> | 2024-12-03 00:06:54 +0100 |
| commit | eb697cfbd6851dedc4831c3226a459dd6616bce7 (patch) | |
| tree | 594be0040106f07e874a699269d2276760791561 | |
| parent | 469cc3d84dca092d750ee4a3547b92e255c40d56 (diff) | |
config: add missing overrides, fix pathsv0.14.1-dev.10
| -rw-r--r-- | debian/.gitignore | 54 | ||||
| -rw-r--r-- | debian/etc/taler-merchant/overrides.conf | 1 | ||||
| -rw-r--r-- | src/util/os_installation.c | 4 |
3 files changed, 30 insertions, 29 deletions
diff --git a/debian/.gitignore b/debian/.gitignore index f1850388..31d49198 100644 --- a/debian/.gitignore +++ b/debian/.gitignore @@ -1,27 +1,27 @@ -.debhelper/ -autoreconf.after -autoreconf.before -debhelper-build-stamp -files -libtalerexchange.debhelper.log -libtalerexchange.substvars -libtalerexchange/ -taler-exchange-dev.debhelper.log -taler-exchange-dev.substvars -taler-exchange-dev/ -taler-exchange.debhelper.log -taler-exchange.substvars -taler-exchange/ -tmp/ -libtalermerchant-dev.debhelper.log -libtalermerchant-dev.substvars -libtalermerchant-dev/ -libtalermerchant.debhelper.log -libtalermerchant/ -taler-merchant.debhelper.log -taler-merchant/ -libtalermerchant.substvars -taler-merchant.substvars -taler-merchant.postrm.debhelper -taler-merchant.links -taler-merchant.postinst.debhelper +/.debhelper/ +/autoreconf.after +/autoreconf.before +/debhelper-build-stamp +/files +/libtalerexchange.debhelper.log +/libtalerexchange.substvars +/libtalerexchange/ +/taler-exchange-dev.debhelper.log +/taler-exchange-dev.substvars +/taler-exchange-dev/ +/taler-exchange.debhelper.log +/taler-exchange.substvars +/taler-exchange/ +/tmp/ +/libtalermerchant-dev.debhelper.log +/libtalermerchant-dev.substvars +/libtalermerchant-dev/ +/libtalermerchant.debhelper.log +/libtalermerchant/ +/taler-merchant.debhelper.log +/taler-merchant/ +/libtalermerchant.substvars +/taler-merchant.substvars +/taler-merchant.postrm.debhelper +/taler-merchant.links +/taler-merchant.postinst.debhelper diff --git a/debian/etc/taler-merchant/overrides.conf b/debian/etc/taler-merchant/overrides.conf new file mode 100644 index 00000000..60296ead --- /dev/null +++ b/debian/etc/taler-merchant/overrides.conf @@ -0,0 +1 @@ +# This configuration will be changed by tooling. Do not touch it manually. diff --git a/src/util/os_installation.c b/src/util/os_installation.c index 2dc5d01a..267205d5 100644 --- a/src/util/os_installation.c +++ b/src/util/os_installation.c @@ -40,8 +40,8 @@ static const struct GNUNET_OS_ProjectData merchant_pd = { .base_config_varname = "TALER_BASE_CONFIG", .bug_email = "taler@lists.gnu.org", .homepage = "http://www.gnu.org/s/taler/", - .config_file = "taler.conf", - .user_config_file = "~/.config/taler.conf", + .config_file = "taler-merchant.conf", + .user_config_file = "~/.config/taler-merchant.conf", .version = PACKAGE_VERSION, .is_gnu = 1, .gettext_domain = "taler", |