Date: Tuesday, May 12, 2015 @ 09:12:00 Author: arojas Revision: 238984
archrelease: copy trunk to extra-i686, extra-x86_64 Added: kdeedu-marble/repos/extra-i686/PKGBUILD (from rev 238983, kdeedu-marble/trunk/PKGBUILD) kdeedu-marble/repos/extra-i686/kdeedu-marble.install (from rev 238983, kdeedu-marble/trunk/kdeedu-marble.install) kdeedu-marble/repos/extra-i686/marble-qt.install (from rev 238983, kdeedu-marble/trunk/marble-qt.install) kdeedu-marble/repos/extra-x86_64/PKGBUILD (from rev 238983, kdeedu-marble/trunk/PKGBUILD) kdeedu-marble/repos/extra-x86_64/kdeedu-marble.install (from rev 238983, kdeedu-marble/trunk/kdeedu-marble.install) kdeedu-marble/repos/extra-x86_64/marble-qt.install (from rev 238983, kdeedu-marble/trunk/marble-qt.install) Deleted: kdeedu-marble/repos/extra-i686/PKGBUILD kdeedu-marble/repos/extra-i686/kdeedu-marble.install kdeedu-marble/repos/extra-i686/marble-qt.install kdeedu-marble/repos/extra-x86_64/PKGBUILD kdeedu-marble/repos/extra-x86_64/kdeedu-marble.install kdeedu-marble/repos/extra-x86_64/marble-qt.install ------------------------------------+ /PKGBUILD | 126 +++++++++++++++++++++++++++++++++++ /kdeedu-marble.install | 26 +++++++ /marble-qt.install | 26 +++++++ extra-i686/PKGBUILD | 63 ----------------- extra-i686/kdeedu-marble.install | 13 --- extra-i686/marble-qt.install | 13 --- extra-x86_64/PKGBUILD | 63 ----------------- extra-x86_64/kdeedu-marble.install | 13 --- extra-x86_64/marble-qt.install | 13 --- 9 files changed, 178 insertions(+), 178 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2015-05-12 07:11:33 UTC (rev 238983) +++ extra-i686/PKGBUILD 2015-05-12 07:12:00 UTC (rev 238984) @@ -1,63 +0,0 @@ -# $Id$ -# Maintainer: Felix Yan <felixonm...@archlinux.org> -# Contributor: Andrea Scarpino <and...@archlinux.org> - -pkgbase=kdeedu-marble -pkgname=('kdeedu-marble' 'marble-qt') -pkgver=15.04.0 -pkgrel=2 -pkgdesc="Desktop Globe" -url="http://kde.org/applications/education/marble/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -makedepends=('kdelibs' 'qt5-svg' 'qt5-webkit' 'qt5-script' 'qt5-tools' 'cmake' 'automoc4' 'gpsd' 'quazip' 'libwlocate') -source=("http://download.kde.org/stable/applications/${pkgver}/src/marble-${pkgver}.tar.xz") -sha1sums=('2924d0446777c45df17fdf7be2c547e51662e37b') - -prepare() { - mkdir -p build{,-qt} -} - -build() { - cd build - cmake ../marble-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DKDE4_BUILD_TESTS=OFF \ - -DCMAKE_INSTALL_PREFIX=/usr - make - - cd ../build-qt - cmake ../marble-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DQT5BUILD=TRUE \ - -DCMAKE_INSTALL_PREFIX=/usr -} - -package_kdeedu-marble() { - depends=('kdebase-runtime') - optdepends=('gpsd: GPS support' 'libwlocate: WLAN based geolocation' - 'quazip: reading and displaying KMZ files') - groups=('kde-applications' 'kdeedu') - install=$pkgname.install - - cd build - make DESTDIR="${pkgdir}" install -# remove mobile and qt4 versions - rm -r "$pkgdir"/usr/bin/marble-* - rm -r "$pkgdir"/usr/share/applications/kde4/marble-* -} - -package_marble-qt() { - pkgdesc="Desktop Globe (Qt version)" - depends=('qt5-svg' 'qt5-webkit' 'qt5-script') - optdepends=('gpsd: GPS support' 'libwlocate: WLAN based geolocation' - 'quazip: reading and displaying KMZ files') - conflicts=('kdeedu-marble') - install=$pkgname.install - - cd build-qt - make DESTDIR="${pkgdir}" install -# remove mobile version - rm -r "$pkgdir"/usr/bin/marble-{mobile,touch} - rm -r "$pkgdir"/usr/share/applications/marble-{mobile,touch}.desktop -} Copied: kdeedu-marble/repos/extra-i686/PKGBUILD (from rev 238983, kdeedu-marble/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2015-05-12 07:12:00 UTC (rev 238984) @@ -0,0 +1,63 @@ +# $Id$ +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Contributor: Andrea Scarpino <and...@archlinux.org> + +pkgbase=kdeedu-marble +pkgname=('kdeedu-marble' 'marble-qt') +pkgver=15.04.1 +pkgrel=1 +pkgdesc="Desktop Globe" +url="http://kde.org/applications/education/marble/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +makedepends=('kdelibs' 'qt5-svg' 'qt5-webkit' 'qt5-script' 'qt5-tools' 'cmake' 'automoc4' 'gpsd' 'quazip' 'libwlocate') +source=("http://download.kde.org/stable/applications/${pkgver}/src/marble-${pkgver}.tar.xz") +sha1sums=('0da84b2bb6847297b09962619eb4cf5f41ef482d') + +prepare() { + mkdir -p build{,-qt} +} + +build() { + cd build + cmake ../marble-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DKDE4_BUILD_TESTS=OFF \ + -DCMAKE_INSTALL_PREFIX=/usr + make + + cd ../build-qt + cmake ../marble-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DQT5BUILD=TRUE \ + -DCMAKE_INSTALL_PREFIX=/usr +} + +package_kdeedu-marble() { + depends=('kdebase-runtime') + optdepends=('gpsd: GPS support' 'libwlocate: WLAN based geolocation' + 'quazip: reading and displaying KMZ files') + groups=('kde-applications' 'kdeedu') + install=$pkgname.install + + cd build + make DESTDIR="${pkgdir}" install +# remove mobile and qt4 versions + rm -r "$pkgdir"/usr/bin/marble-* + rm -r "$pkgdir"/usr/share/applications/kde4/marble-* +} + +package_marble-qt() { + pkgdesc="Desktop Globe (Qt version)" + depends=('qt5-svg' 'qt5-webkit' 'qt5-script') + optdepends=('gpsd: GPS support' 'libwlocate: WLAN based geolocation' + 'quazip: reading and displaying KMZ files') + conflicts=('kdeedu-marble') + install=$pkgname.install + + cd build-qt + make DESTDIR="${pkgdir}" install +# remove mobile version + rm -r "$pkgdir"/usr/bin/marble-{mobile,touch} + rm -r "$pkgdir"/usr/share/applications/marble-{mobile,touch}.desktop +} Deleted: extra-i686/kdeedu-marble.install =================================================================== --- extra-i686/kdeedu-marble.install 2015-05-12 07:11:33 UTC (rev 238983) +++ extra-i686/kdeedu-marble.install 2015-05-12 07:12:00 UTC (rev 238984) @@ -1,13 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q - update-mime-database usr/share/mime &> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} Copied: kdeedu-marble/repos/extra-i686/kdeedu-marble.install (from rev 238983, kdeedu-marble/trunk/kdeedu-marble.install) =================================================================== --- extra-i686/kdeedu-marble.install (rev 0) +++ extra-i686/kdeedu-marble.install 2015-05-12 07:12:00 UTC (rev 238984) @@ -0,0 +1,13 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q + update-mime-database usr/share/mime &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} Deleted: extra-i686/marble-qt.install =================================================================== --- extra-i686/marble-qt.install 2015-05-12 07:11:33 UTC (rev 238983) +++ extra-i686/marble-qt.install 2015-05-12 07:12:00 UTC (rev 238984) @@ -1,13 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q - update-mime-database usr/share/mime &> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} Copied: kdeedu-marble/repos/extra-i686/marble-qt.install (from rev 238983, kdeedu-marble/trunk/marble-qt.install) =================================================================== --- extra-i686/marble-qt.install (rev 0) +++ extra-i686/marble-qt.install 2015-05-12 07:12:00 UTC (rev 238984) @@ -0,0 +1,13 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q + update-mime-database usr/share/mime &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2015-05-12 07:11:33 UTC (rev 238983) +++ extra-x86_64/PKGBUILD 2015-05-12 07:12:00 UTC (rev 238984) @@ -1,63 +0,0 @@ -# $Id$ -# Maintainer: Felix Yan <felixonm...@archlinux.org> -# Contributor: Andrea Scarpino <and...@archlinux.org> - -pkgbase=kdeedu-marble -pkgname=('kdeedu-marble' 'marble-qt') -pkgver=15.04.0 -pkgrel=2 -pkgdesc="Desktop Globe" -url="http://kde.org/applications/education/marble/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -makedepends=('kdelibs' 'qt5-svg' 'qt5-webkit' 'qt5-script' 'qt5-tools' 'cmake' 'automoc4' 'gpsd' 'quazip' 'libwlocate') -source=("http://download.kde.org/stable/applications/${pkgver}/src/marble-${pkgver}.tar.xz") -sha1sums=('2924d0446777c45df17fdf7be2c547e51662e37b') - -prepare() { - mkdir -p build{,-qt} -} - -build() { - cd build - cmake ../marble-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DKDE4_BUILD_TESTS=OFF \ - -DCMAKE_INSTALL_PREFIX=/usr - make - - cd ../build-qt - cmake ../marble-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DQT5BUILD=TRUE \ - -DCMAKE_INSTALL_PREFIX=/usr -} - -package_kdeedu-marble() { - depends=('kdebase-runtime') - optdepends=('gpsd: GPS support' 'libwlocate: WLAN based geolocation' - 'quazip: reading and displaying KMZ files') - groups=('kde-applications' 'kdeedu') - install=$pkgname.install - - cd build - make DESTDIR="${pkgdir}" install -# remove mobile and qt4 versions - rm -r "$pkgdir"/usr/bin/marble-* - rm -r "$pkgdir"/usr/share/applications/kde4/marble-* -} - -package_marble-qt() { - pkgdesc="Desktop Globe (Qt version)" - depends=('qt5-svg' 'qt5-webkit' 'qt5-script') - optdepends=('gpsd: GPS support' 'libwlocate: WLAN based geolocation' - 'quazip: reading and displaying KMZ files') - conflicts=('kdeedu-marble') - install=$pkgname.install - - cd build-qt - make DESTDIR="${pkgdir}" install -# remove mobile version - rm -r "$pkgdir"/usr/bin/marble-{mobile,touch} - rm -r "$pkgdir"/usr/share/applications/marble-{mobile,touch}.desktop -} Copied: kdeedu-marble/repos/extra-x86_64/PKGBUILD (from rev 238983, kdeedu-marble/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2015-05-12 07:12:00 UTC (rev 238984) @@ -0,0 +1,63 @@ +# $Id$ +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Contributor: Andrea Scarpino <and...@archlinux.org> + +pkgbase=kdeedu-marble +pkgname=('kdeedu-marble' 'marble-qt') +pkgver=15.04.1 +pkgrel=1 +pkgdesc="Desktop Globe" +url="http://kde.org/applications/education/marble/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +makedepends=('kdelibs' 'qt5-svg' 'qt5-webkit' 'qt5-script' 'qt5-tools' 'cmake' 'automoc4' 'gpsd' 'quazip' 'libwlocate') +source=("http://download.kde.org/stable/applications/${pkgver}/src/marble-${pkgver}.tar.xz") +sha1sums=('0da84b2bb6847297b09962619eb4cf5f41ef482d') + +prepare() { + mkdir -p build{,-qt} +} + +build() { + cd build + cmake ../marble-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DKDE4_BUILD_TESTS=OFF \ + -DCMAKE_INSTALL_PREFIX=/usr + make + + cd ../build-qt + cmake ../marble-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DQT5BUILD=TRUE \ + -DCMAKE_INSTALL_PREFIX=/usr +} + +package_kdeedu-marble() { + depends=('kdebase-runtime') + optdepends=('gpsd: GPS support' 'libwlocate: WLAN based geolocation' + 'quazip: reading and displaying KMZ files') + groups=('kde-applications' 'kdeedu') + install=$pkgname.install + + cd build + make DESTDIR="${pkgdir}" install +# remove mobile and qt4 versions + rm -r "$pkgdir"/usr/bin/marble-* + rm -r "$pkgdir"/usr/share/applications/kde4/marble-* +} + +package_marble-qt() { + pkgdesc="Desktop Globe (Qt version)" + depends=('qt5-svg' 'qt5-webkit' 'qt5-script') + optdepends=('gpsd: GPS support' 'libwlocate: WLAN based geolocation' + 'quazip: reading and displaying KMZ files') + conflicts=('kdeedu-marble') + install=$pkgname.install + + cd build-qt + make DESTDIR="${pkgdir}" install +# remove mobile version + rm -r "$pkgdir"/usr/bin/marble-{mobile,touch} + rm -r "$pkgdir"/usr/share/applications/marble-{mobile,touch}.desktop +} Deleted: extra-x86_64/kdeedu-marble.install =================================================================== --- extra-x86_64/kdeedu-marble.install 2015-05-12 07:11:33 UTC (rev 238983) +++ extra-x86_64/kdeedu-marble.install 2015-05-12 07:12:00 UTC (rev 238984) @@ -1,13 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q - update-mime-database usr/share/mime &> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} Copied: kdeedu-marble/repos/extra-x86_64/kdeedu-marble.install (from rev 238983, kdeedu-marble/trunk/kdeedu-marble.install) =================================================================== --- extra-x86_64/kdeedu-marble.install (rev 0) +++ extra-x86_64/kdeedu-marble.install 2015-05-12 07:12:00 UTC (rev 238984) @@ -0,0 +1,13 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q + update-mime-database usr/share/mime &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} Deleted: extra-x86_64/marble-qt.install =================================================================== --- extra-x86_64/marble-qt.install 2015-05-12 07:11:33 UTC (rev 238983) +++ extra-x86_64/marble-qt.install 2015-05-12 07:12:00 UTC (rev 238984) @@ -1,13 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q - update-mime-database usr/share/mime &> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} Copied: kdeedu-marble/repos/extra-x86_64/marble-qt.install (from rev 238983, kdeedu-marble/trunk/marble-qt.install) =================================================================== --- extra-x86_64/marble-qt.install (rev 0) +++ extra-x86_64/marble-qt.install 2015-05-12 07:12:00 UTC (rev 238984) @@ -0,0 +1,13 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q + update-mime-database usr/share/mime &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +}