summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel M. Capella2016-03-08 09:03:40 -0500
committerDaniel M. Capella2016-03-08 09:03:40 -0500
commit448a1883e9483da48e04b32bc0acd1f8a19fe135 (patch)
tree0cdc51275d07b2ebd24bf0530fed3a1da615cc40
parentbcf555d6ea099ba2b8372f77498adde13c54b7a1 (diff)
downloadaur-448a1883e9483da48e04b32bc0acd1f8a19fe135.tar.gz
remove conflict
Surprised nobody complained about this.
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD3
2 files changed, 2 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0651c6111eac..4ca06acdfd69 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,11 @@
pkgbase = firefox-extension-umatrix
pkgdesc = Point and click matrix to filter net requests by source, destination and type
pkgver = 0.9.3.3
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/gorhill/uMatrix
arch = any
license = GPL3
depends = firefox
- conflicts = firefox-extension-ublock
noextract = umatrix-0.9.3.3-sm+fx.xpi
source = https://addons.cdn.mozilla.net/user-media/addons/613250/umatrix-0.9.3.3-sm+fx.xpi
sha256sums = e3f147407433d4809d6636b56366aa6a2c7cac31cec02f81e4f38e7f889e92cd
diff --git a/PKGBUILD b/PKGBUILD
index 17963fe4715b..cff9098f2f3f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,13 +2,12 @@
pkgname=firefox-extension-umatrix
pkgver=0.9.3.3
-pkgrel=1
+pkgrel=2
pkgdesc='Point and click matrix to filter net requests by source, destination and type'
url=https://github.com/gorhill/uMatrix
arch=('any')
license=('GPL3')
depends=('firefox')
-conflicts=('firefox-extension-ublock')
source=("https://addons.cdn.mozilla.net/user-media/addons/613250/umatrix-$pkgver-sm+fx.xpi")
noextract=("${source##*/}")
sha256sums=('e3f147407433d4809d6636b56366aa6a2c7cac31cec02f81e4f38e7f889e92cd')