From 3ad1ed7a186fa72f2fe135672ada0959876cfec2 Mon Sep 17 00:00:00 2001 From: Tobias Reisinger Date: Wed, 1 Jul 2020 23:40:40 +0200 Subject: [PATCH] fix: naming and conflicts --- controller/PKGBUILD | 2 +- core/PKGBUILD | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/controller/PKGBUILD b/controller/PKGBUILD index cbc5f97..67bc811 100644 --- a/controller/PKGBUILD +++ b/controller/PKGBUILD @@ -10,7 +10,7 @@ license=('unknown') groups=() depends=('glibc' 'lmdb') makedepends=('make' 'cmake' 'gcc') -conflicts=('emgauwa-controller') +conflicts=('emgauwa-controller-testing') backup=('etc/emgauwa/controller.ini') source=("https://git.serguzim.me/emgauwa/controller/archive/v$pkgver.tar.gz" "controller.ini" diff --git a/core/PKGBUILD b/core/PKGBUILD index da0d26a..bcd1e10 100644 --- a/core/PKGBUILD +++ b/core/PKGBUILD @@ -10,13 +10,13 @@ license=('unknown') groups=() depends=('glibc' 'sqlite') makedepends=('make' 'cmake' 'gcc') -conflicts=('emgauwa-core') +conflicts=('emgauwa-core-testing') backup=('etc/emgauwa/core.ini') source=("https://git.serguzim.me/emgauwa/core/archive/v$pkgver.tar.gz" "core.ini" - "emgauwa-core-testing.service" - "emgauwa-core-testing.sysusers" - "emgauwa-core-testing.tmpfiles") + "emgauwa-core.service" + "emgauwa-core.sysusers" + "emgauwa-core.tmpfiles") sha256sums=('82984c9742a63f9e8a561229b00926a85ff27a283054aa92f8ec712d67f87222' '03d7af2f2a47b73d17467f98967be3a334fe4eff98b86b701500843478df1e87' '559c675302f626dfded86660866554fb78f3fcbae51e5879eee65c9384a06d52'