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

Douglas Soares de Andrade douglas at archlinux.org
Sat Jul 5 00:03:36 EDT 2008


    Date: Saturday, July 5, 2008 @ 00:03:35
  Author: douglas
Revision: 4190

Fixing upload conflicts

Added:
  monotone/repos/extra-i686/ChangeLog
    (from rev 4189, monotone/trunk/ChangeLog)
Modified:
  monotone/repos/extra-i686/	(properties)
  monotone/repos/extra-i686/PKGBUILD
Deleted:
  monotone/repos/extra-i686/limits.patch

--------------+
 ChangeLog    |    6 ++++++
 PKGBUILD     |   18 ++++++++----------
 limits.patch |   11 -----------
 3 files changed, 14 insertions(+), 21 deletions(-)


Property changes on: monotone/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /monotone/trunk:1
   + /monotone/trunk:1-4189

Copied: monotone/repos/extra-i686/ChangeLog (from rev 4189, monotone/trunk/ChangeLog)
===================================================================
--- extra-i686/ChangeLog	                        (rev 0)
+++ extra-i686/ChangeLog	2008-07-05 04:03:35 UTC (rev 4190)
@@ -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-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-07-05 03:54:35 UTC (rev 4189)
+++ extra-i686/PKGBUILD	2008-07-05 04:03:35 UTC (rev 4190)
@@ -1,19 +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"
+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 )
+source=(http://www.monotone.ca/downloads/$pkgver/$pkgname-$pkgver.tar.gz)
 
+md5sums=('4d90776beaff7445e7a2d8774378fbba')
+
 build() {
   cd $startdir/src/$pkgname-$pkgver
   
@@ -27,8 +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
 }
-
-md5sums=('c1a0d2619f451a664289b042c104860d'
-         '7dbb57c7823a815dc4ac0718d565a1e9')
-sha1sums=('6c546ec6122f56dfc8253323e8dc45167d0918c4'
-          '6c6e7b6d1a1ea8a3603f649a6350404496a6f242')

Deleted: extra-i686/limits.patch
===================================================================
--- extra-i686/limits.patch	2008-07-05 03:54:35 UTC (rev 4189)
+++ extra-i686/limits.patch	2008-07-05 04:03:35 UTC (rev 4190)
@@ -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