summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Düll2021-10-04 13:30:30 +0200
committerMichael Düll2021-10-04 13:30:30 +0200
commit37747c21f00a73911652fd9ed44cae3384f1970d (patch)
treedb2959df6523581d75a148e4f46d13e897a1edf5
parent8ee9f1e251f3abd2b8e1aae30a6a29503a415f9e (diff)
downloadaur-37747c21f00a73911652fd9ed44cae3384f1970d.tar.gz
Remove conflicts from PKGBUILD because 'provides' already specified
btrbk.
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD3
2 files changed, 2 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8f5dc2f88c08..6ae4a7941f5a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = btrbk-git
pkgdesc = A backup tool for btrfs subvolumes, taking advantage of btrfs specific capabilities to create atomic snapshots and transfer them incrementally to your backup locations.
- pkgver = 0.30.0.r0.gf40e3ad
+ pkgver = 0.31.3.r67.g4234fb2
pkgrel = 1
url = http://digint.ch/btrbk
arch = any
@@ -12,10 +12,8 @@ pkgbase = btrbk-git
optdepends = openssh: remote backup support,
optdepends = mbuffer: --progress support and add buffering to send-stream
provides = btrbk
- conflicts = btrbk
options = !makeflags
source = git+https://github.com/digint/btrbk.git
sha256sums = SKIP
pkgname = btrbk-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 38b7263b0739..d7f395969b39 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,13 +1,12 @@
# Maintainer: Michael Duell < mail at akurei dot me >
# Contributor: Daniel J. Campos <dcampos2015 at my dot fit dot edu>
pkgname=btrbk-git
-pkgver=0.30.0.r0.gf40e3ad
+pkgver=0.31.3.r67.g4234fb2
pkgrel=1
pkgdesc="A backup tool for btrfs subvolumes, taking advantage of btrfs specific capabilities to create atomic snapshots and transfer them incrementally to your backup locations."
url="http://digint.ch/btrbk"
arch=('any')
license=('GPL3')
-conflicts=('btrbk')
provides=('btrbk')
depends=('perl' 'btrfs-progs')
makedepends=('asciidoctor' 'git')