[arch-commits] Commit in marble/kde-unstable (PKGBUILD)
Antonio Rojas
arojas at archlinux.org
Wed Jul 29 09:13:42 UTC 2015
Date: Wednesday, July 29, 2015 @ 11:13:41
Author: arojas
Revision: 242817
Don't conflict with libmarble4
Modified:
marble/kde-unstable/PKGBUILD
----------+
PKGBUILD | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2015-07-29 09:06:53 UTC (rev 242816)
+++ PKGBUILD 2015-07-29 09:13:41 UTC (rev 242817)
@@ -7,7 +7,7 @@
pkgbase=marble
pkgname=(marble libastro)
pkgver=15.07.80
-pkgrel=1
+pkgrel=2
pkgdesc="Desktop Globe"
arch=(i686 x86_64)
url="https://www.kde.org/applications/system/marble"
@@ -48,6 +48,7 @@
package_libastro() {
pkgdesc='Marble astronomy library'
depends=(gcc-libs)
+ conflicts=('kdeedu-marble<15.04.3-3' marble-qt)
cd build/src/lib/astro
make DESTDIR="$pkgdir" install
@@ -60,7 +61,7 @@
'libwlocate: Position information based on neighboring WLAN networks'
'phonon-qt5: That enables the use of audio and video content'
'krunner: Krunner plugin')
- conflicts=(kdeedu-marble marble-qt)
+ conflicts=('kdeedu-marble<15.04.3-3' marble-qt)
replaces=(kdeedu-marble 'marble-qt<15.07')
groups=(kde-applications kdeedu)
install=marble.install
More information about the arch-commits
mailing list