summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhoton892017-12-30 16:53:27 +0100
committerPhoton892017-12-30 16:53:27 +0100
commitad4e9c31dafd757127a2ccc5aedd9fbc8db335ba (patch)
tree045fd7bdcfe1e22db84f6bdac22318aaab5da536
parent1de655c0150bad2c15ce6bd1100bc4eb1831e284 (diff)
downloadaur-ad4e9c31dafd757127a2ccc5aedd9fbc8db335ba.tar.gz
Split off conflicting locale files to extra package
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD9
2 files changed, 7 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d10c2a9c35c8..d94c9492d8bc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = multiload-ng-standalone-gtk2
pkgdesc = Modern graphical system monitor, standalone version
pkgver = 1.5.2
- pkgrel = 1
+ pkgrel = 3
url = https://udda.github.io/multiload-ng/
arch = i686
arch = x86_64
@@ -9,6 +9,7 @@ pkgbase = multiload-ng-standalone-gtk2
makedepends = intltool
depends = gtk2>=2.20.0
depends = cairo
+ depends = multiload-ng-common
conflicts = multiload-ng-standalone-gtk3
conflicts = multiload-ng-standalone-gtk2-git
conflicts = multiload-ng-standalone-gtk3-git
diff --git a/PKGBUILD b/PKGBUILD
index a2a6eb4cdad1..f6c6fad9c7c8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,15 +1,15 @@
-# Maintainer: Mario Cianciolo <mr.udda at gmail dot com>
-# Co-maintainer: Michael Kogan <michael.kogan at gmx dot net>
+# Maintainer: Michael Kogan <michael.kogan at gmx dot net>
+# Co-maintainer: Mario Cianciolo <mr.udda at gmail dot com>
# This file is automatically generated from multiload-ng source.
pkgname='multiload-ng-standalone-gtk2'
pkgdesc='Modern graphical system monitor, standalone version'
pkgver=1.5.2
-pkgrel=1
+pkgrel=3
makedepends=('intltool')
-depends=('gtk2>=2.20.0' 'cairo')
+depends=('gtk2>=2.20.0' 'cairo' 'multiload-ng-common')
conflicts=('multiload-ng-standalone-gtk3' 'multiload-ng-standalone-gtk2-git' 'multiload-ng-standalone-gtk3-git')
@@ -30,4 +30,5 @@ build() {
package() {
cd "multiload-ng-$pkgver"
make DESTDIR="$pkgdir" install
+ rm -r "$pkgdir/usr/share/locale"
}