[arch-commits] Commit in automake/repos (5 files)

[Allan McRae]

    Date: Monday, April 16, 2012 @ 00:41:46
  Author: allan
Revision: 156207

fix conflict

Added:
  automake/repos/testing-any/
  automake/repos/testing-any/PKGBUILD
    (from rev 156206, automake/trunk/PKGBUILD)
  automake/repos/testing-any/automake.install
    (from rev 156206, automake/trunk/automake.install)
Deleted:
  automake/repos/testing-any/PKGBUILD
  automake/repos/testing-any/automake.install

------------------+
 PKGBUILD         |   69 ++++++++++++++++++++++++++---------------------------
 automake.install |   44 ++++++++++++++++-----------------
 2 files changed, 56 insertions(+), 57 deletions(-)

Deleted: testing-any/PKGBUILD
===================================================================
--- testing-any/PKGBUILD        2012-04-04 09:05:52 UTC (rev 155494)
+++ testing-any/PKGBUILD        2012-04-16 04:41:46 UTC (rev 156207)
@@ -1,35 +0,0 @@
-# $Id$
-# Maintainer: Allan McRae <al...@archlinux.org>
-# Contributor: judd <jvi...@zeroflux.org>
-
-pkgname=automake
-pkgver=1.11.4
-pkgrel=1
-pkgdesc="A GNU tool for automatically creating Makefiles"
-arch=('any')
-license=('GPL')
-url="http://www.gnu.org/software/automake";
-groups=('base-devel')
-depends=('perl' 'bash')
-makedepends=('autoconf')
-install=automake.install
-source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.sig})
-md5sums=('f4c545f01252089d2c3837e1d1d3e21b'
-         '290d7b0dc40011b3956decc1effb0bb1')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr
-  make
-}
-
-check()
-{
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make check
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-}

Copied: automake/repos/testing-any/PKGBUILD (from rev 156206, 
automake/trunk/PKGBUILD)
===================================================================
--- testing-any/PKGBUILD                                (rev 0)
+++ testing-any/PKGBUILD        2012-04-16 04:41:46 UTC (rev 156207)
@@ -0,0 +1,34 @@
+# $Id$
+# Maintainer: Allan McRae <al...@archlinux.org>
+# Contributor: judd <jvi...@zeroflux.org>
+
+pkgname=automake
+pkgver=1.11.5
+pkgrel=1
+pkgdesc="A GNU tool for automatically creating Makefiles"
+arch=('any')
+license=('GPL')
+url="http://www.gnu.org/software/automake";
+groups=('base-devel')
+depends=('perl' 'bash')
+makedepends=('autoconf')
+install=automake.install
+source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig})
+md5sums=('13f6a9522339ac0885110506cb7abad8'
+         'c1170aad0acbe57b87d17b5eaf3f9061')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr
+  make
+}
+
+check() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make check
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+}

Deleted: testing-any/automake.install
===================================================================
--- testing-any/automake.install        2012-04-04 09:05:52 UTC (rev 155494)
+++ testing-any/automake.install        2012-04-16 04:41:46 UTC (rev 156207)
@@ -1,22 +0,0 @@
-infodir=/usr/share/info
-filelist=(automake.info automake.info-1 automake.info-2)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-# vim:set ts=2 sw=2 et:

Copied: automake/repos/testing-any/automake.install (from rev 156206, 
automake/trunk/automake.install)
===================================================================
--- testing-any/automake.install                                (rev 0)
+++ testing-any/automake.install        2012-04-16 04:41:46 UTC (rev 156207)
@@ -0,0 +1,22 @@
+infodir=/usr/share/info
+filelist=(automake.info automake.info-1 automake.info-2)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
+
+# vim:set ts=2 sw=2 et: