Skip to Content.
Sympa Menu

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

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 (4954012d00d3bb261c3dabaaae5eae96816b63ef)
  • Date: Mon, 20 Nov 2006 13:40:33 -0600

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

php-pear/php/BUILD | 3 ++-
php-pear/php/DEPENDS | 1 +
php-pear/php/HISTORY | 5 ++++-
3 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 4954012d00d3bb261c3dabaaae5eae96816b63ef
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

Integrated #8605

Conflicts:

php-pear/php/BUILD
php-pear/php/CONFIGURE
php-pear/php/DEPENDS
php-pear/php/HISTORY

diff --git a/php-pear/php/BUILD b/php-pear/php/BUILD
index 19a09e5..a64c903 100755
--- a/php-pear/php/BUILD
+++ b/php-pear/php/BUILD
@@ -66,5 +66,6 @@ make
# safety precaution against earlier PHP installations removing httpd.conf
# we can remove this sedit after a couple of ISOs (today's 2003-11-05)
if [ -f $INSTALL_LOGS/$SPELL-* ]
- then sedit 's|.*/httpd\.conf.*||g' $INSTALL_LOGS/$SPELL-*
+ then sedit 's|.*/httpd\.conf.*||g' $INSTALL_LOGS/$SPELL-*
fi
+
diff --git a/php-pear/php/DEPENDS b/php-pear/php/DEPENDS
index 6be7caf..af89386 100755
--- a/php-pear/php/DEPENDS
+++ b/php-pear/php/DEPENDS
@@ -1,4 +1,5 @@
depends flex &&
+depends readline "--with-readline=/usr" &&

# Officially ZLib is optional, but we require it because some other
# optional extensions depend on it, and it"s omnipresent anyway.
diff --git a/php-pear/php/HISTORY b/php-pear/php/HISTORY
index 67423c9..26c8064 100644
--- a/php-pear/php/HISTORY
+++ b/php-pear/php/HISTORY
@@ -1,4 +1,7 @@
-2006-05-30 Treeve Jelbert <treeve01 AT pi.be>
+2006-10-09 George Sherwood <george AT beernabeer.com>
+ * DEPENDS: Add depends readline. Bug #8605
+
+2006-05-30 Treeve Jelbert <treeve01 AT pi.be>
* DETAILS: add BUILD_API=2, as nothing was bieng installed
change sha512, as sourece tarabls were updated (see web site for
details)
* DEPENDS: add various database dependencies



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

Archive powered by MHonArc 2.6.24.

Top of Page