[arch-commits] Commit in monotone/repos (4 files)
Eric Belanger
eric at archlinux.org
Sat Jul 5 19:30:46 UTC 2008
Date: Saturday, July 5, 2008 @ 15:30:45
Author: eric
Revision: 4238
fixing svn conflict
Added:
monotone/repos/extra-x86_64/ChangeLog
(from rev 4189, monotone/trunk/ChangeLog)
Modified:
monotone/repos/extra-x86_64/ (properties)
monotone/repos/extra-x86_64/PKGBUILD
Deleted:
monotone/repos/extra-x86_64/limits.patch
--------------+
ChangeLog | 6 ++++++
PKGBUILD | 15 +++++++--------
limits.patch | 11 -----------
3 files changed, 13 insertions(+), 19 deletions(-)
Property changes on: monotone/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
- /monotone/trunk:1
+ /monotone/trunk:1-4237
Copied: monotone/repos/extra-x86_64/ChangeLog (from rev 4189, monotone/trunk/ChangeLog)
===================================================================
--- extra-x86_64/ChangeLog (rev 0)
+++ extra-x86_64/ChangeLog 2008-07-05 19:30:45 UTC (rev 4238)
@@ -0,0 +1,6 @@
+
+2008-07-05 Douglas Soares de Andrade <douglas at archlinux.org>
+
+ * Updated for i686 - 0.40
+ * Removed the limits patch as it is not needed anymore
+
Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2008-07-05 19:17:35 UTC (rev 4237)
+++ extra-x86_64/PKGBUILD 2008-07-05 19:30:45 UTC (rev 4238)
@@ -1,20 +1,22 @@
# $Id$
-# Maintainer: Jeff 'codemac' Mickey <jeff at archlinux.org>
+# Maintainer: Douglas Soares de Andrade <douglas at archlinux.org>
+# Contributor: Jeff 'codemac' Mickey <jeff at archlinux.org>
# Contributor: Dan McGee <dpmcgee at gmail.com>
pkgname=monotone
-pkgver=0.38
+pkgver=0.40
pkgrel=1
pkgdesc="A modern distributed version control system, like hg, darcs, or git"
url="http://www.monotone.ca"
license=("GPL")
arch=(i686 x86_64)
depends=('boost')
+makedepends=('zlib' 'gcc-libs')
install=monotone.install
-source=(http://www.monotone.ca/downloads/$pkgver/$pkgname-$pkgver.tar.gz \
- limits.patch )
-md5sums=('c1a0d2619f451a664289b042c104860d' '7dbb57c7823a815dc4ac0718d565a1e9')
+source=(http://www.monotone.ca/downloads/$pkgver/$pkgname-$pkgver.tar.gz)
+md5sums=('4d90776beaff7445e7a2d8774378fbba')
+
build() {
cd $startdir/src/$pkgname-$pkgver
@@ -28,6 +30,3 @@
install -m644 contrib/monotone.bash_completion $startdir/pkg/etc/bash_completion.d/monotone
install -m644 contrib/monotone.zsh_completion $startdir/pkg/usr/share/zsh/site-functions/monotone
}
-
-sha1sums=('6c546ec6122f56dfc8253323e8dc45167d0918c4'
- '6c6e7b6d1a1ea8a3603f649a6350404496a6f242')
Deleted: extra-x86_64/limits.patch
===================================================================
--- extra-x86_64/limits.patch 2008-07-05 19:17:35 UTC (rev 4237)
+++ extra-x86_64/limits.patch 2008-07-05 19:30:45 UTC (rev 4238)
@@ -1,11 +0,0 @@
-diff -Naur monotone-0.35/numeric_vocab.hh monotone-patched/numeric_vocab.hh
---- monotone-0.35/numeric_vocab.hh 2007-05-07 10:13:44.000000000 -0400
-+++ monotone-patched/numeric_vocab.hh 2007-06-26 03:15:19.000000000 -0400
-@@ -11,6 +11,7 @@
- // PURPOSE.
-
- #include <cstddef>
-+#include <climits>
- #include <limits>
-
- #include "mt-stdint.h"
More information about the arch-commits
mailing list