Date: Tuesday, August 25, 2015 @ 04:24:30 Author: bisson Revision: 138740
fix cmake file conflict with marble Modified: subsurface-marble/trunk/PKGBUILD ----------+ PKGBUILD | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-08-25 02:23:53 UTC (rev 138739) +++ PKGBUILD 2015-08-25 02:24:30 UTC (rev 138740) @@ -4,7 +4,7 @@ pkgname=subsurface-marble pkgver=4.4.1 -pkgrel=2 +pkgrel=3 pkgdesc='Virtual Globe' url='http://git.subsurface-divelog.org/' license=('GPL' 'LGPL' 'FDL') @@ -49,5 +49,6 @@ rm -fr share/{appdata,icons} # Provided by marble-data, avoids conflicts. + rm share/marble/cmake/FindMarble.cmake rm -fr share/marble/data }
