Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-0.4 grimoire by Jaka Kranjc (54b77a1ec891bbcd331b0064e5ddb2ca9dc97e70)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jaka Kranjc <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-0.4 grimoire by Jaka Kranjc (54b77a1ec891bbcd331b0064e5ddb2ca9dc97e70)
  • Date: Mon, 20 Nov 2006 14:29:11 -0600

GIT changes to stable-0.4 grimoire by Jaka Kranjc
<lynxlynxlynx AT sourcemage.org>:

collab/subversion/CONFIGURE | 3 +++
collab/subversion/DEPENDS | 9 +++++++--
collab/subversion/DETAILS | 4 ++--
collab/subversion/HISTORY | 5 +++++
4 files changed, 17 insertions(+), 4 deletions(-)

New commits:
commit 54b77a1ec891bbcd331b0064e5ddb2ca9dc97e70
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

Updated subversion to 1.4.0. Also my attempt to fix Bug #10721 and make
subversion build more regularly.

Conflicts:

collab/subversion/DETAILS
collab/subversion/HISTORY

diff --git a/collab/subversion/CONFIGURE b/collab/subversion/CONFIGURE
index ce93cc6..38b5e82 100755
--- a/collab/subversion/CONFIGURE
+++ b/collab/subversion/CONFIGURE
@@ -5,5 +5,8 @@ function spell_ok_yesno {

config_query SVN_HEAD 'Download latest Subversion source code?' n &&
config_query SVN_PERL 'Install Subversion bindings for Perl?'
$(spell_ok_yesno perl) &&
+if [ "$SVN_PERL" == "y" ]; then
+ NEEDSAPR0=y
+fi &&
config_query SVN_PYTHON 'Install Subversion bindings for Python?'
$(spell_ok_yesno python) &&
config_query SVN_RUBY 'Install Subversion bindings for Ruby?'
$(spell_ok_yesno ruby)
diff --git a/collab/subversion/DEPENDS b/collab/subversion/DEPENDS
index 8641cc5..3dc4847 100755
--- a/collab/subversion/DEPENDS
+++ b/collab/subversion/DEPENDS
@@ -2,8 +2,13 @@ depends autoconf &&
depends libtool &&
depends bison &&

-depends APR '--with-apr=/usr' &&
-depends APU '--with-apr-util=/usr' &&
+if [ "$NEEDSAPR0" == "y" ]; then
+ depends apr0 '--with-apr=/usr' &&
+ depends apr-util0 '--with-apr-util=/usr'
+else
+ depends APR '--with-apr=/usr' &&
+ depends APU '--with-apr-util=/usr'
+fi &&

if [[ "$SVN_HEAD" == y ]]; then
depends python
diff --git a/collab/subversion/DETAILS b/collab/subversion/DETAILS
index dba6acc..2e66b1f 100755
--- a/collab/subversion/DETAILS
+++ b/collab/subversion/DETAILS
@@ -1,5 +1,5 @@
SPELL=subversion
- VERSION=1.3.0
+ VERSION=1.4.0
if [[ "$SVN_HEAD" == y ]]; then VERSION=${VERSION%.*}-HEAD; fi
SOURCE=$SPELL-$VERSION.tar.bz2
if [[ "$SVN_HEAD" == y ]]; then
@@ -9,7 +9,7 @@ if [[ "$SVN_HEAD" == y ]]; then
else
SOURCE=$SPELL-$VERSION.tar.gz # temporary measure, download
doesn't work for bz2
SOURCE_URL[0]=http://subversion.tigris.org/downloads/$SOURCE
-
SOURCE_HASH=sha512:5da25741791f39c1f4e5387908bfeece53a9ce5746f40cf811ed773a502b822832877fb346009eabb047da230e5c913500550c94c093a06eea5302080a60cc8d
+
SOURCE_HASH=sha512:9410be2de91ea2236fd6b514f2506985cc9ffdd4a540c7e6e0eaa25cf553a5efc16d27f3a70acbc03a22651b43c20f1fafc5463b9f9ab2b01f3150a446eaf896
fi
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://subversion.tigris.org/
diff --git a/collab/subversion/HISTORY b/collab/subversion/HISTORY
index de91a7b..0daf84c 100644
--- a/collab/subversion/HISTORY
+++ b/collab/subversion/HISTORY
@@ -1,3 +1,8 @@
+2006-10-08 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version 1.4.0
+ * CONFIGURE: If building with perl bindings requires apr0/apr-util0
+ * DEPENDS: If with perl require apr0/apr-util0. Bug 10721.
+
2006-02-07 Arwed v. Merkatz <v.merkatz AT gmx.net>
* BUILD: add --disable-neon-version-check to OPTS or subversion will
randomly not build with http support on neon version updates



  • [SM-Commit] GIT changes to stable-0.4 grimoire by Jaka Kranjc (54b77a1ec891bbcd331b0064e5ddb2ca9dc97e70), Jaka Kranjc, 11/20/2006

Archive powered by MHonArc 2.6.24.

Top of Page