diff options
| author | bartus | 2019-09-16 21:20:33 +0200 |
|---|---|---|
| committer | bartus | 2019-09-16 21:49:33 +0200 |
| commit | f901cad2b779d47546a26ac60234b584e2b38551 (patch) | |
| tree | 26f868b0c79f6977df0b0fb45d1c73e678cc330d | |
| parent | a3a18b265ef17950e7101d6cdfd8a60cc849f5de (diff) | |
| download | aur-f901cad2b779d47546a26ac60234b584e2b38551.tar.gz | |
Merge gimp-develop-git.
Merge history from gimp-develop-git
Pop epoch as pkgver is lower for gimp-develp-git
Replace gimp-develop-git, gimp-noconflict-git with gimp-git.
| -rw-r--r-- | .SRCINFO | 10 | ||||
| -rw-r--r-- | PKGBUILD | 10 | ||||
| -rw-r--r-- | PKGBUILD.in | 8 |
3 files changed, 17 insertions, 11 deletions
@@ -1,8 +1,8 @@ -pkgbase = gimp-develop-git +pkgbase = gimp-git pkgdesc = GNU Image Manipulation Program (non-conflicting git version) - pkgver = 2.99.1.r3723.65530b6aa7 + pkgver = 2.99.1.r3759.8edb75d78f pkgrel = 1 - epoch = 1 + epoch = 2 url = https://www.gimp.org arch = i686 arch = x86_64 @@ -63,10 +63,12 @@ pkgbase = gimp-develop-git optdepends = zlib: Compression routines optdepends = gjs: JavaScript scripting support optdepends = luajit: LUA scripting support + replaces = gimp-noconflict-git + replaces = gimp-develop-git source = git+https://gitlab.gnome.org/GNOME/gimp.git source = linux.gpl sha512sums = SKIP sha512sums = 6f33d57f242fa8ce04b65e06a712bd54677306a45b22cb853fbe348089cd4673bd4ed91073074fe067166fe8951c370f8bbbc386783e3ed5170d52e9062666fe -pkgname = gimp-develop-git +pkgname = gimp-git @@ -1,13 +1,15 @@ # Maintainer : bartus <arch-user-repoᘓbartus.33mail.com> +# shellcheck disable=SC2034 # Contributor: Filipe Laíns (FFY00) <filipe.lains@gmail.com> # Contributor: Iru Cai <mytbk920423@gmail.com> # Contributor: Alexander Hunziker <alex.hunziker@gmail.com> # Contributor: Alessio Biancalana <dottorblaster@gmail.com> -pkgname=gimp-develop-git -_pkgname=${pkgname%-develop-git} -epoch=1 -pkgver=2.99.1.r3723.65530b6aa7 +pkgname=gimp-git +_pkgname=${pkgname%-git} +replaces=(gimp-noconflict-git gimp-develop-git) +epoch=2 +pkgver=2.99.1.r3759.8edb75d78f pkgrel=1 pkgdesc="GNU Image Manipulation Program (non-conflicting git version)" arch=('i686' 'x86_64') diff --git a/PKGBUILD.in b/PKGBUILD.in index ec3c2c1a8af3..6dcb7ae40d80 100644 --- a/PKGBUILD.in +++ b/PKGBUILD.in @@ -1,12 +1,14 @@ # Maintainer : bartus <arch-user-repoᘓbartus.33mail.com> +# shellcheck disable=SC2034 # Contributor: Filipe Laíns (FFY00) <filipe.lains@gmail.com> # Contributor: Iru Cai <mytbk920423@gmail.com> # Contributor: Alexander Hunziker <alex.hunziker@gmail.com> # Contributor: Alessio Biancalana <dottorblaster@gmail.com> -pkgname=gimp-develop-git -_pkgname=${pkgname%-develop-git} -epoch=1 +pkgname=gimp-git +_pkgname=${pkgname%-git} +replaces=(gimp-noconflict-git gimp-develop-git) +epoch=2 pkgver=2.99.1.r1398.f7ac033777 pkgrel=1 pkgdesc="GNU Image Manipulation Program (non-conflicting git version)" |