summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTaran Lynn2019-05-04 10:15:30 -0700
committerTaran Lynn2019-05-04 10:15:30 -0700
commit3da12730de70526809927d041e25074dda7838dc (patch)
treed1961f3187138897da60b56c8c0f1a78fb9c3e85
parentc8c6c926745d281e7b1286bc9b6d1cd99c25f57d (diff)
downloadaur-3da12730de70526809927d041e25074dda7838dc.tar.gz
Revert "Add sway as a conflict."
This reverts commit f7e27b1f855b119b4a4fb5d655b2141e2b74e40c.
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD5
2 files changed, 3 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1d08c0d56031..d84df73995e2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = swaybg-git
pkgdesc = Wallpaper tool for Wayland compositors
- pkgver = r93.cf62ace
+ pkgver = r94.25c6eaf
pkgrel = 1
url = https://swaywm.org
arch = i686
@@ -14,7 +14,6 @@ pkgbase = swaybg-git
depends = cairo
optdepends = gdk-pixbuf2: For background images other than PNG
provides = swaybg
- conflicts = sway
conflicts = swaybg
source = swaybg::git+https://github.com/swaywm/swaybg.git#branch=master
sha1sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 6ba30fd419a4..c6dfc5b68aa1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Taran Lynn <taranlynn0gmail.com>
pkgname=swaybg-git
_pkgname=swaybg
-pkgver=r93.cf62ace
+pkgver=r94.25c6eaf
pkgrel=1
license=("MIT")
pkgdesc="Wallpaper tool for Wayland compositors"
@@ -17,8 +17,7 @@ url="https://swaywm.org"
source=("${pkgname%-*}::git+https://github.com/swaywm/swaybg.git#branch=master")
sha1sums=("SKIP")
provides=("swaybg")
-# TODO: Remove sway when the main repo pushes sway 1.1.
-conflicts=("sway" "swaybg")
+conflicts=("swaybg")
pkgver() {
cd "${srcdir}/${_pkgname}"