Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Elisamuel Resto (ee022de19690699d84b9f19e1dbf7b8e292b834d)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Elisamuel Resto <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Elisamuel Resto (ee022de19690699d84b9f19e1dbf7b8e292b834d)
  • Date: Tue, 2 Sep 2008 16:47:33 -0500

GIT changes to master grimoire by Elisamuel Resto <ryuji AT sourcemage.org>:

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

New commits:
commit ee022de19690699d84b9f19e1dbf7b8e292b834d
Author: Elisamuel Resto <ryuji AT sourcemage.org>
Commit: Elisamuel Resto <ryuji AT sourcemage.org>

php-pear/php: fixed a extra 'fi' introduced by the xorg-modular merge

diff --git a/php-pear/php/DEPENDS b/php-pear/php/DEPENDS
index 7d28fcc..02f1922 100755
--- a/php-pear/php/DEPENDS
+++ b/php-pear/php/DEPENDS
@@ -150,11 +150,10 @@ optional_depends libexif \
"for image metadata support" &&

if [[ "${PHP5_GD}" != "none" ]]; then
-if [ "$PHP5_X11LIBS" == "y" ]; then
- depends xorg-libs &&
- depends libxpm "--with-xpm-dir=${INSTALL_ROOT}/usr"
-fi
-fi &&
+ if [[ "${PHP5_X11LIBS}" == "y" ]]; then
+ depends xorg-libs &&
+ depends libxpm "--with-xpm-dir=${INSTALL_ROOT}/usr"
+ fi &&

optional_depends jpeg \
"--with-jpeg-dir=${INSTALL_ROOT}/usr"
"--without-jpeg-dir" \
diff --git a/php-pear/php/HISTORY b/php-pear/php/HISTORY
index 8ff477f..b32b83b 100644
--- a/php-pear/php/HISTORY
+++ b/php-pear/php/HISTORY
@@ -1,3 +1,6 @@
+2008-09-02 Elisamuel Resto <ryuji AT sourcemage.org>
+ * DEPENDS: fixed a extra 'fi' introduced by the xorg-modular merge
+
2008-08-13 Elisamuel Resto <ryuji AT sourcemage.org>
* CONFLICTS: removed padding
* DETAILS: PATCHLEVEL++



  • [SM-Commit] GIT changes to master grimoire by Elisamuel Resto (ee022de19690699d84b9f19e1dbf7b8e292b834d), Elisamuel Resto, 09/02/2008

Archive powered by MHonArc 2.6.24.

Top of Page