summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authoralium2018-12-03 20:57:18 +0100
committeralium2018-12-03 20:57:18 +0100
commit15188e4ec62cae531d58a27e198d533e857b6e49 (patch)
tree5acc7711026620aef79fd4a4f5e8d235e0d06e9e
parent31d09d8afe7c62dc9fc5f0a1a13f86ae1a3b1a38 (diff)
downloadaur-15188e4ec62cae531d58a27e198d533e857b6e49.tar.gz
Switch to master
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD12
2 files changed, 5 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9b779f32f560..fd56a7a9f345 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -16,7 +16,8 @@ pkgbase = pdfarranger-git
depends = ghostscript
conflicts = pdfshuffler
conflicts = pdfshuffler-git
- source = pdfarranger-git::git+https://github.com/jeromerobert/pdfarranger#commit=
+ conflicts = pdfarranger
+ source = pdfarranger-git::git+https://github.com/jeromerobert/pdfarranger
md5sums = SKIP
pkgname = pdfarranger-git
diff --git a/PKGBUILD b/PKGBUILD
index 1d6fe34c4c3b..e0404b87a302 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,4 @@
# Maintainer: Alois Nespor <alium at artixlinux.org>
-# Contributor: M.Reynolds <blackboxnetworkproject@gmail.com>
-# Contributor: speps <speps at aur dot archlinux dot org>
-# Contributor: Anton Bazhenov <anton.bazhenov at gmail>
-# Contributor: Tuan Nguyen
-# Contributor: Farid <farid at archlinux-br dot org>
pkgname=pdfarranger-git
pkgver=r157.66f1463
@@ -14,9 +9,8 @@ url="https://github.com/jeromerobert/pdfarranger"
license=('GPL3')
depends=('gtk3' 'python-gobject' 'python-cairo' 'poppler-glib' 'python-pypdf2' 'ghostscript' )
makedepends=('git' 'python-distutils-extra' 'python-setuptools')
-conflicts=('pdfshuffler' 'pdfshuffler-git')
-source=($pkgname::"git+https://github.com/jeromerobert/pdfarranger#commit=${_gitcommit}")
-_gitcommit=66f1463057b0a4a547a97369e926cc0bd474687a
+conflicts=('pdfshuffler' 'pdfshuffler-git' 'pdfarranger')
+source=($pkgname::"git+https://github.com/jeromerobert/pdfarranger")
md5sums=('SKIP')
pkgver () {
@@ -32,7 +26,7 @@ build () {
package () {
cd "$srcdir/$pkgname"
python setup.py install --prefix=/usr --root="$pkgdir/"
-
+
rm -rf "$pkgdir/usr/share/pdfshuffler/icons"
install -Dm 644 "data/icons/scalable/apps/pdfarranger.svg" \