Date: Saturday, April 7, 2012 @ 14:04:19 Author: pierre Revision: 155853
archrelease: copy trunk to testing-any Added: archlinux-keyring/repos/testing-any/PKGBUILD (from rev 155852, archlinux-keyring/trunk/PKGBUILD) archlinux-keyring/repos/testing-any/archlinux-keyring.install (from rev 155852, archlinux-keyring/trunk/archlinux-keyring.install) Deleted: archlinux-keyring/repos/testing-any/PKGBUILD archlinux-keyring/repos/testing-any/archlinux-keyring.install ---------------------------+ PKGBUILD | 40 ++++++++++++++++++++-------------------- archlinux-keyring.install | 24 ++++++++++++++---------- 2 files changed, 34 insertions(+), 30 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2012-04-07 18:02:58 UTC (rev 155852) +++ PKGBUILD 2012-04-07 18:04:19 UTC (rev 155853) @@ -1,20 +0,0 @@ -# $Id$ -# Maintainer: Pierre Schmitz <pie...@archlinux.de> - -pkgname=archlinux-keyring -pkgver=20120321 -pkgrel=1 -pkgdesc='Arch Linux PGP keyring' -arch=('any') -url='https://projects.archlinux.org/archlinux-keyring.git/' -license=('GPL') -install="${pkgname}.install" -source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz" - "ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz.sig") -md5sums=('7a8f0b9b46f72b72bc9579ed1123c208' - '4411b733a7c3ab9abe0c2fc8cf2e53ec') - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make PREFIX=/usr DESTDIR=${pkgdir} install -} Copied: archlinux-keyring/repos/testing-any/PKGBUILD (from rev 155852, archlinux-keyring/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2012-04-07 18:04:19 UTC (rev 155853) @@ -0,0 +1,20 @@ +# $Id$ +# Maintainer: Pierre Schmitz <pie...@archlinux.de> + +pkgname=archlinux-keyring +pkgver=20120407 +pkgrel=1 +pkgdesc='Arch Linux PGP keyring' +arch=('any') +url='https://projects.archlinux.org/archlinux-keyring.git/' +license=('GPL') +install="${pkgname}.install" +source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz" + "ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz.sig") +md5sums=('846e97918477f98046dcd1bd1dda9bda' + '87025603b192b87152e7e0e72c06aa72') + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make PREFIX=/usr DESTDIR=${pkgdir} install +} Deleted: archlinux-keyring.install =================================================================== --- archlinux-keyring.install 2012-04-07 18:02:58 UTC (rev 155852) +++ archlinux-keyring.install 2012-04-07 18:04:19 UTC (rev 155853) @@ -1,10 +0,0 @@ -post_upgrade() { - pacman-key --populate archlinux -} - -post_install() { - if which pacman-key >/dev/null 2>&1; then - pacman-key --init - post_upgrade - fi -} Copied: archlinux-keyring/repos/testing-any/archlinux-keyring.install (from rev 155852, archlinux-keyring/trunk/archlinux-keyring.install) =================================================================== --- archlinux-keyring.install (rev 0) +++ archlinux-keyring.install 2012-04-07 18:04:19 UTC (rev 155853) @@ -0,0 +1,14 @@ +post_upgrade() { + if usr/bin/pacman-key -l >/dev/null 2>&1; then + usr/bin/pacman-key --populate archlinux + else + echo " >>> Run \`pacman-key --init\` to set up your pacman keyring." + echo " >>> Then run \`pacman-key --populate archlinux\` to install the Arch Linux keyring." + fi +} + +post_install() { + if [ -x usr/bin/pacman-key ]; then + post_upgrade + fi +}