[arch-commits] Commit in abs/repos (4 files)

[Allan McRae]

    Date: Friday, March 13, 2009 @ 00:15:17
  Author: allan
Revision: 29878

Merged revisions 29876 via svnmerge from 
svn+ssh://archlinux.org/srv/svn-packages/abs/trunk

........
  r29876 | allan | 2009-03-13 14:13:14 +1000 (Fri, 13 Mar 2009) | 1 line
  
  upgpkg: abs 2.3.1-1
........

Modified:
  abs/repos/extra-x86_64/	(properties)
  abs/repos/extra-x86_64/ChangeLog
  abs/repos/extra-x86_64/PKGBUILD
Deleted:
  abs/repos/extra-x86_64/abs.install

-------------+
 ChangeLog   |    7 +++++++
 PKGBUILD    |    7 +++----
 abs.install |   15 ---------------
 3 files changed, 10 insertions(+), 19 deletions(-)


Property changes on: abs/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /abs/trunk:1-17308
   + /abs/trunk:1-29877

Modified: extra-x86_64/ChangeLog
===================================================================
--- extra-x86_64/ChangeLog	2009-03-13 04:14:05 UTC (rev 29877)
+++ extra-x86_64/ChangeLog	2009-03-13 04:15:17 UTC (rev 29878)
@@ -1,3 +1,10 @@
+2009-03-13 Allan McRae <allan at archlinux.org>
+
+	* 2.3.1-1
+	Upstream update
+	- various prototype updates
+	Removed install file
+
 2008-10-28 Allan McRae <allan at archlinux.org>
 
 	* 2.3-1

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-03-13 04:14:05 UTC (rev 29877)
+++ extra-x86_64/PKGBUILD	2009-03-13 04:15:17 UTC (rev 29878)
@@ -2,7 +2,7 @@
 # Maintainer: Allan McRae <allan at archlinux.org>
 
 pkgname=abs
-pkgver=2.3
+pkgver=2.3.1
 pkgrel=1
 pkgdesc="Utilities to download and work with the Arch Build System (ABS)"
 arch=('i686' 'x86_64')
@@ -10,9 +10,8 @@
 license=('GPL')
 depends=('bash' 'rsync')
 backup=(etc/abs.conf)
-install=abs.install
 source=(ftp://ftp.archlinux.org/other/abs/${pkgname}-${pkgver}.tar.gz)
-md5sums=('d6fd791aa487ba8bb5ff48c3ace20592')
+md5sums=('fbf9e8d329b336cac85764d2f5096810')
 
 build() {
   cd ${srcdir}/${pkgname}
@@ -26,7 +25,7 @@
 
   # change ABS tags for x86_64 to correct values
   if [ "$CARCH" = "x86_64" ]; then
-    sed -i "s|i686|x86_64|g" ${pkgdir}/etc/abs.conf
+    sed -i 's|"i686"|"x86_64"|g' ${pkgdir}/etc/abs.conf
   fi
 }
 

Deleted: extra-x86_64/abs.install
===================================================================
--- extra-x86_64/abs.install	2009-03-13 04:14:05 UTC (rev 29877)
+++ extra-x86_64/abs.install	2009-03-13 04:15:17 UTC (rev 29878)
@@ -1,15 +0,0 @@
-## arg 1:  the new package version
-## arg 2:  the old package version
-pre_upgrade() {
-  if [ "$(vercmp $2 2.0-1)" -lt 0 ]; then
-    echo "==> ABS now uses rsync, instead of cvsup, to synchronize your tree."
-    echo "==> Please note the new configuration in /etc/abs.conf"
-  fi
-
-  if [ "$(vercmp $2 2.0-4)" -lt 0 ]; then
-    echo "==> Warning: abs clears out the contents of /var/abs when syncing."
-    echo "==> Keep all local PKGBUILDs in /var/abs/local, or they will disappear"
-  fi
-}
-
-# vim:set ts=2 sw=2 et: