You've already forked librespeed-go_aur
Merge remote-tracking branch 'aur/master'
This commit is contained in:
@@ -1,7 +1,12 @@
|
|||||||
pkgbase = librespeed-go
|
pkgbase = librespeed-go
|
||||||
pkgdesc = Go backend for LibreSpeed
|
pkgdesc = Go backend for LibreSpeed
|
||||||
|
<<<<<<< HEAD
|
||||||
pkgver = 1.1.5
|
pkgver = 1.1.5
|
||||||
pkgrel = 13
|
pkgrel = 13
|
||||||
|
=======
|
||||||
|
pkgver = 1.1.6
|
||||||
|
pkgrel = 3
|
||||||
|
>>>>>>> aur/master
|
||||||
url = https://github.com/librespeed/speedtest-go
|
url = https://github.com/librespeed/speedtest-go
|
||||||
arch = i386
|
arch = i386
|
||||||
arch = x86_64
|
arch = x86_64
|
||||||
@@ -16,12 +21,20 @@ pkgbase = librespeed-go
|
|||||||
conflicts = librespeed-rs
|
conflicts = librespeed-rs
|
||||||
backup = etc/librespeed/settings.toml
|
backup = etc/librespeed/settings.toml
|
||||||
backup = usr/share/librespeed/assets/index.html
|
backup = usr/share/librespeed/assets/index.html
|
||||||
|
<<<<<<< HEAD
|
||||||
source = git+https://gitea.balki.me/balki/speedtest-go.git#commit=abc8ac0a7b933c8c4b58a105337f377deb7fd005
|
source = git+https://gitea.balki.me/balki/speedtest-go.git#commit=abc8ac0a7b933c8c4b58a105337f377deb7fd005
|
||||||
|
=======
|
||||||
|
source = https://github.com/librespeed/speedtest-go/archive/v1.1.6.zip
|
||||||
|
>>>>>>> aur/master
|
||||||
source = librespeed.ico
|
source = librespeed.ico
|
||||||
source = librespeed.service
|
source = librespeed.service
|
||||||
source = librespeed.sysusers
|
source = librespeed.sysusers
|
||||||
source = librespeed.tmpfiles
|
source = librespeed.tmpfiles
|
||||||
|
<<<<<<< HEAD
|
||||||
b2sums = 673e24d4fc7dd13074bcf9e9805530a1a0665a2cd91840e8444e26cfb2cbc3e1f2bdc9235526e19c746e503abcd4ba445a0c90f086a2aa9c84330cde105d7218
|
b2sums = 673e24d4fc7dd13074bcf9e9805530a1a0665a2cd91840e8444e26cfb2cbc3e1f2bdc9235526e19c746e503abcd4ba445a0c90f086a2aa9c84330cde105d7218
|
||||||
|
=======
|
||||||
|
b2sums = 78f6067f9a21e5402a96569d52cfb8eabb972a2d7a1bf33d99e3badc476392bc4572a172f6e52b76b8ac0614fdc14ed998585004add197886c249b936100897f
|
||||||
|
>>>>>>> aur/master
|
||||||
b2sums = d561280edc2fe3f7228ce3366132bd22e345e7574f21d92e6f188f701642fe98ffab8c8b12e807ad72fea15a6016605d6febd08c3389395828c47767779540bc
|
b2sums = d561280edc2fe3f7228ce3366132bd22e345e7574f21d92e6f188f701642fe98ffab8c8b12e807ad72fea15a6016605d6febd08c3389395828c47767779540bc
|
||||||
b2sums = 6aa0ca421c7ee5ac2dd58df13c1a42a350186eb5a72bad7f83776b7a291b3032ae84e0789d0fafb8116f4371b73317b6bda476ea3f44f72337b236e7e2514761
|
b2sums = 6aa0ca421c7ee5ac2dd58df13c1a42a350186eb5a72bad7f83776b7a291b3032ae84e0789d0fafb8116f4371b73317b6bda476ea3f44f72337b236e7e2514761
|
||||||
b2sums = a7d3d6d4e7adb5b5d45e254fafad7c7180a54c1eec898657cbd8d457e218c746742067d7a024b81e2bf1fefb05a6ce3f7abebbdf233f70c99a34406edf047b6c
|
b2sums = a7d3d6d4e7adb5b5d45e254fafad7c7180a54c1eec898657cbd8d457e218c746742067d7a024b81e2bf1fefb05a6ce3f7abebbdf233f70c99a34406edf047b6c
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
# Maintainer: AlphaJack <alphajack at tuta dot io>
|
# Maintainer: AlphaJack <alphajack at tuta dot io>
|
||||||
|
|
||||||
pkgname="librespeed-go"
|
pkgname="librespeed-go"
|
||||||
pkgver=1.1.5
|
pkgver=1.1.6
|
||||||
_commit=abc8ac0a7b933c8c4b58a105337f377deb7fd005
|
_commit=abc8ac0a7b933c8c4b58a105337f377deb7fd005
|
||||||
pkgrel=13
|
pkgrel=13
|
||||||
pkgdesc="Go backend for LibreSpeed"
|
pkgdesc="Go backend for LibreSpeed"
|
||||||
|
|||||||
Reference in New Issue
Block a user