upgpkg: 0.15.0-1

This commit is contained in:
George Rawlinson 2024-04-12 23:05:19 +00:00
parent a6b6e75191
commit bc24f38266
No known key found for this signature in database
GPG Key ID: E0959FEA8B550539

View File

@ -1,12 +1,6 @@
pkgbase = gotosocial pkgbase = gotosocial
pkgdesc = ActivityPub social network server written in Golang pkgdesc = ActivityPub social network server written in Golang
<<<<<<< HEAD
pkgver = 0.14.2
||||||| parent of 6bb58b8 (upgpkg: 0.15.0-1)
pkgver = 0.12.2
=======
pkgver = 0.15.0 pkgver = 0.15.0
>>>>>>> 6bb58b8 (upgpkg: 0.15.0-1)
pkgrel = 1 pkgrel = 1
url = https://gotosocial.org url = https://gotosocial.org
arch = x86_64 arch = x86_64
@ -41,13 +35,7 @@ pkgbase = gotosocial
backup = etc/gotosocial/template/status.tmpl backup = etc/gotosocial/template/status.tmpl
backup = etc/gotosocial/template/tag.tmpl backup = etc/gotosocial/template/tag.tmpl
backup = etc/gotosocial/template/thread.tmpl backup = etc/gotosocial/template/thread.tmpl
<<<<<<< HEAD
source = gotosocial::git+https://github.com/superseriousbusiness/gotosocial#commit=0bd95d7b71ae71d801b0fbb643598eb0ccd1b8f5
||||||| parent of 6bb58b8 (upgpkg: 0.15.0-1)
source = gotosocial::git+https://github.com/superseriousbusiness/gotosocial#commit=096c517cc332ce2832a8c5dfbd1cd827ab7d0ecb
=======
source = gotosocial::git+https://github.com/superseriousbusiness/gotosocial#tag=v0.15.0 source = gotosocial::git+https://github.com/superseriousbusiness/gotosocial#tag=v0.15.0
>>>>>>> 6bb58b8 (upgpkg: 0.15.0-1)
source = sysusers.conf source = sysusers.conf
source = tmpfiles.conf source = tmpfiles.conf
source = use-fhs-directories.patch source = use-fhs-directories.patch