summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcin Mikołajczak2017-04-18 14:13:03 +0200
committerMarcin Mikołajczak2017-04-18 14:13:13 +0200
commit8dfb4a6a76c8a1db1b164e27a96e604f9b9e3bf3 (patch)
tree6ebe2af4d2a5c053d21f6c501f68e03b5b2e8b8c
parentf1baf90def93e9157ae80611aa22579aed387caa (diff)
downloadaur-8dfb4a6a76c8a1db1b164e27a96e604f9b9e3bf3.tar.gz
fixed conflicts, no need to update pkgrel
Signed-off-by: Marcin Mikołajczak <m4sk1n@vivaldi.net>
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD4
2 files changed, 3 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a443f3348df5..a47e97369de7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -15,7 +15,7 @@ pkgbase = otter-browser-weekly
optdepends = hunspell>=1.3.0: for spell checking
optdepends = qt5-webengine: for experimental backend using the Chromium browser project
conflicts = otter-browser-git
- conflicts = otter-browser-weekly
+ conflicts = otter-browser
source = otter-browser-0.9.91.dev171.tar.bz2::http://netcologne.dl.sourceforge.net/project/otter-browser/otter-browser-weekly171/otter-browser-0.9.91-dev171.tar.bz2
md5sums = 66778d0da47dab3860d1a52b3f967eec
diff --git a/PKGBUILD b/PKGBUILD
index 787b02ed01f4..bb78a00613d2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,7 +15,7 @@ depends=( 'qt5-script>=5.4' 'qt5-webkit' 'qt5-multimedia>=5.4' 'qt5-xmlpatterns>
makedepends=('cmake' 'qt5-declarative>=5.4')
optdepends=('hunspell>=1.3.0: for spell checking'
'qt5-webengine: for experimental backend using the Chromium browser project')
-conflicts=('otter-browser-git' 'otter-browser-weekly')
+conflicts=('otter-browser-git' 'otter-browser')
source=("${_productname}-$pkgver.tar.bz2::http://netcologne.dl.sourceforge.net/project/otter-browser/${_productname}-${_foldername}/${_productname}-${_filename}.tar.bz2")
md5sums=('66778d0da47dab3860d1a52b3f967eec')
@@ -29,4 +29,4 @@ build() {
package() {
cd ${_productname}-${_filename}
make DESTDIR=$pkgdir install
-} \ No newline at end of file
+}