[arch-commits] Commit in archlinux-keyring/repos/core-any (4 files)

[Thomas Bächler]

    Date: Saturday, May 23, 2015 @ 23:28:22
  Author: thomas
Revision: 239682

archrelease: copy trunk to core-any

Added:
  archlinux-keyring/repos/core-any/PKGBUILD
    (from rev 239681, archlinux-keyring/trunk/PKGBUILD)
  archlinux-keyring/repos/core-any/archlinux-keyring.install
    (from rev 239681, archlinux-keyring/trunk/archlinux-keyring.install)
Deleted:
  archlinux-keyring/repos/core-any/PKGBUILD
  archlinux-keyring/repos/core-any/archlinux-keyring.install

---------------------------+
 PKGBUILD                  |   45 +++++++++++++++++++++++---------------------
 archlinux-keyring.install |   44 +++++++++++++++++++++----------------------
 2 files changed, 46 insertions(+), 43 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2015-05-23 21:28:15 UTC (rev 239681)
+++ PKGBUILD	2015-05-23 21:28:22 UTC (rev 239682)
@@ -1,21 +0,0 @@
-# $Id$
-# Maintainer: Pierre Schmitz <pierre at archlinux.de>
-
-pkgname=archlinux-keyring
-pkgver=20150212
-pkgrel=1
-pkgdesc='Arch Linux PGP keyring'
-arch=('any')
-url='https://projects.archlinux.org/archlinux-keyring.git/'
-license=('GPL')
-install="${pkgname}.install"
-source=("https://sources.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-        "https://sources.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz.sig")
-md5sums=('6f1c01af59098e16918f97ff947f7e54'
-         'SKIP')
-validpgpkeys=('4AA4767BBC9C4B1D18AE28B77F2D434B9741E8AC')
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make PREFIX=/usr DESTDIR=${pkgdir} install
-}

Copied: archlinux-keyring/repos/core-any/PKGBUILD (from rev 239681, archlinux-keyring/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2015-05-23 21:28:22 UTC (rev 239682)
@@ -0,0 +1,24 @@
+# $Id$
+# Maintainer: Pierre Schmitz <pierre at archlinux.de>
+
+pkgname=archlinux-keyring
+pkgver=20150523
+pkgrel=1
+pkgdesc='Arch Linux PGP keyring'
+arch=('any')
+url='https://projects.archlinux.org/archlinux-keyring.git/'
+license=('GPL')
+install="${pkgname}.install"
+source=("https://sources.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+        "https://sources.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz.sig")
+md5sums=('ea1a42fbdc3eaa023ca0095a2c6526b3'
+         'SKIP')
+validpgpkeys=(
+              '4AA4767BBC9C4B1D18AE28B77F2D434B9741E8AC' # Pierre
+              'A314827C4E4250A204CE6E13284FC34C8E4B1A25' # Thomas
+             )
+
+package() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make PREFIX=/usr DESTDIR=${pkgdir} install
+}

Deleted: archlinux-keyring.install
===================================================================
--- archlinux-keyring.install	2015-05-23 21:28:15 UTC (rev 239681)
+++ archlinux-keyring.install	2015-05-23 21:28:22 UTC (rev 239682)
@@ -1,22 +0,0 @@
-post_upgrade() {
-	if usr/bin/pacman-key -l >/dev/null 2>&1; then
-		usr/bin/pacman-key --populate archlinux
-
-		# Re-enable key of dwallace
-		# See https://bugs.archlinux.org/task/35478
-		if [ -z "$2" ] || [ "$2" = "20130525-1" ]; then
-			printf 'enable\nquit\n' | LANG=C \
-				gpg --homedir /etc/pacman.d/gnupg \
-				--no-permission-warning --command-fd 0 \
-				--quiet --batch --edit-key \
-				5559BC1A32B8F76B3FCCD9555FA5E5544F010D48 \
-				2>/dev/null
-		fi
-	fi
-}
-
-post_install() {
-	if [ -x usr/bin/pacman-key ]; then
-		post_upgrade
-	fi
-}

Copied: archlinux-keyring/repos/core-any/archlinux-keyring.install (from rev 239681, archlinux-keyring/trunk/archlinux-keyring.install)
===================================================================
--- archlinux-keyring.install	                        (rev 0)
+++ archlinux-keyring.install	2015-05-23 21:28:22 UTC (rev 239682)
@@ -0,0 +1,22 @@
+post_upgrade() {
+	if usr/bin/pacman-key -l >/dev/null 2>&1; then
+		usr/bin/pacman-key --populate archlinux
+
+		# Re-enable key of dwallace
+		# See https://bugs.archlinux.org/task/35478
+		if [ -z "$2" ] || [ "$2" = "20130525-1" ]; then
+			printf 'enable\nquit\n' | LANG=C \
+				gpg --homedir /etc/pacman.d/gnupg \
+				--no-permission-warning --command-fd 0 \
+				--quiet --batch --edit-key \
+				5559BC1A32B8F76B3FCCD9555FA5E5544F010D48 \
+				2>/dev/null
+		fi
+	fi
+}
+
+post_install() {
+	if [ -x usr/bin/pacman-key ]; then
+		post_upgrade
+	fi
+}