sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to stable-0.24 grimoire by Jaka Kranjc (ae95361620555ab1460f0ab766b5cf6c4b31b6aa)
- From: Jaka Kranjc <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to stable-0.24 grimoire by Jaka Kranjc (ae95361620555ab1460f0ab766b5cf6c4b31b6aa)
- Date: Thu, 28 Aug 2008 16:53:10 -0500
GIT changes to stable-0.24 grimoire by Jaka Kranjc
<lynxlynxlynx AT sourcemage.org>:
gnome2-libs/evolution-data-server/HISTORY | 4 +++
gnome2-libs/evolution-data-server/PRE_SUB_DEPENDS | 4 +++
gnome2-libs/evolution-data-server/REPAIR^none^PRE_SUB_DEPENDS | 4 +++
gnome2-libs/evolution-data-server/SUB_DEPENDS | 5 +++
gnome2-libs/evolution-exchange/DEPENDS | 9 +-----
gnome2-libs/evolution-exchange/HISTORY | 4 +++
gnome2-libs/ximian-connector/BUILD | 4 ---
gnome2-libs/ximian-connector/DEPENDS | 13
----------
gnome2-libs/ximian-connector/DETAILS | 11 ++++----
gnome2-libs/ximian-connector/HISTORY | 4 +++
gnome2-libs/ximian-connector/INSTALL | 1
gnome2-libs/ximian-connector/PRE_BUILD | 1
gnome2-libs/ximian-connector/TRIGGERS | 1
13 files changed, 38 insertions(+), 27 deletions(-)
New commits:
commit ae95361620555ab1460f0ab766b5cf6c4b31b6aa
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
evolution-exchange: need openldap, add LDAP subdep with
evolution-data-server
(cherry-picked from commit dbc47c47eb9ab7a0f5f1df1893152086bab3a8e1)
commit 3d4dfee0b7bbf1c2f70d6a070fda1eaccc3d0867
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
evolution-data-server: provide LDAP sup dependency
(cherry-picked from commit 08d41a7d58f1d3c3dfdd67a68e4abb20a460cb12)
commit 12d27e30b121894dc87ebe0a6ff164303a7e9c63
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
ximian-connector: deprecated
(cherry-picked from commit 66cdbe2eed2d9745e184acd6ba2aa431f05c7119)
diff --git a/gnome2-libs/evolution-data-server/HISTORY
b/gnome2-libs/evolution-data-server/HISTORY
index bddfabb..a353a2d 100644
--- a/gnome2-libs/evolution-data-server/HISTORY
+++ b/gnome2-libs/evolution-data-server/HISTORY
@@ -1,3 +1,7 @@
+2008-08-19 Thomas Orgis <sobukus AT sourcemage.org>
+ * SUB_DEPENDS, PRE_SUB_DEPENDS, REPAIR^none^PRE_SUB_DEPENDS:
+ provide LDAP sub dependency
+
2008-07-24 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.22.3
diff --git a/gnome2-libs/evolution-data-server/PRE_SUB_DEPENDS
b/gnome2-libs/evolution-data-server/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..f1db034
--- /dev/null
+++ b/gnome2-libs/evolution-data-server/PRE_SUB_DEPENDS
@@ -0,0 +1,4 @@
+case $THIS_SUB_DEPENDS in
+ LDAP) is_depends_enabled $SPELL openldap && return 0;;
+esac
+return 1
diff --git a/gnome2-libs/evolution-data-server/REPAIR^none^PRE_SUB_DEPENDS
b/gnome2-libs/evolution-data-server/REPAIR^none^PRE_SUB_DEPENDS
new file mode 100755
index 0000000..f1db034
--- /dev/null
+++ b/gnome2-libs/evolution-data-server/REPAIR^none^PRE_SUB_DEPENDS
@@ -0,0 +1,4 @@
+case $THIS_SUB_DEPENDS in
+ LDAP) is_depends_enabled $SPELL openldap && return 0;;
+esac
+return 1
diff --git a/gnome2-libs/evolution-data-server/SUB_DEPENDS
b/gnome2-libs/evolution-data-server/SUB_DEPENDS
new file mode 100755
index 0000000..6e0b4a8
--- /dev/null
+++ b/gnome2-libs/evolution-data-server/SUB_DEPENDS
@@ -0,0 +1,5 @@
+case $THIS_SUB_DEPENDS in
+ LDAP)
+ depends openldap --with-openldap=yes "(because sub depends forced it)"
+ ;;
+esac
diff --git a/gnome2-libs/evolution-exchange/DEPENDS
b/gnome2-libs/evolution-exchange/DEPENDS
index a21bd56..93462ed 100755
--- a/gnome2-libs/evolution-exchange/DEPENDS
+++ b/gnome2-libs/evolution-exchange/DEPENDS
@@ -1,6 +1,6 @@
depends gconf2 &&
depends evolution &&
-depends evolution-data-server &&
+depends -sub LDAP evolution-data-server &&
depends krb5 &&
depends libbonobo &&
depends libsoup &&
@@ -9,9 +9,4 @@ depends libxml2 &&
optional_depends "gtk-doc" \
"--enable-gtk-doc" \
"--disable-gtk-doc" \
- "Enable gtk-doc to build documentation" &&
-
-optional_depends "openldap" \
- "--with-openldap=yes" \
- "--with-openldap=no" \
- "Enable OpenLDAP support"
+ "Enable gtk-doc to build documentation"
diff --git a/gnome2-libs/evolution-exchange/HISTORY
b/gnome2-libs/evolution-exchange/HISTORY
old mode 100644
new mode 100755
index e0c5b2a..b86e939
--- a/gnome2-libs/evolution-exchange/HISTORY
+++ b/gnome2-libs/evolution-exchange/HISTORY
@@ -1,3 +1,7 @@
+2008-08-19 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS: openldap is mandatory, need LDAP sub dep
+ from evolution-data-server
+
2008-05-05 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.22.1.1
diff --git a/gnome2-libs/ximian-connector/BUILD
b/gnome2-libs/ximian-connector/BUILD
index feceeab..27ba77d 100755
--- a/gnome2-libs/ximian-connector/BUILD
+++ b/gnome2-libs/ximian-connector/BUILD
@@ -1,3 +1 @@
-make_single &&
-default_build &&
-make_normal
+true
diff --git a/gnome2-libs/ximian-connector/DEPENDS
b/gnome2-libs/ximian-connector/DEPENDS
index a623d79..c0f4839 100755
--- a/gnome2-libs/ximian-connector/DEPENDS
+++ b/gnome2-libs/ximian-connector/DEPENDS
@@ -1,12 +1 @@
-depends evolution &&
-depends krb5 &&
-
-optional_depends "gtk-doc" \
- "--enable-gtk-doc" \
- "--disable-gtk-doc" \
- "Enable gtk-doc to build documentation" &&
-
-optional_depends "openldap" \
- "--with-openldap=yes" \
- "--with-openldap=no" \
- "Enable OpenLDAP support"
+depends evolution-exchange
diff --git a/gnome2-libs/ximian-connector/DETAILS
b/gnome2-libs/ximian-connector/DETAILS
index 289c1bc..60f4962 100755
--- a/gnome2-libs/ximian-connector/DETAILS
+++ b/gnome2-libs/ximian-connector/DETAILS
@@ -1,17 +1,18 @@
SPELL=ximian-connector
VERSION=2.2.3
BRANCH=`echo $VERSION | cut -d . -f 1,2`
- SOURCE=$SPELL-$VERSION.tar.bz2
+# SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
-
SOURCE_HASH=sha512:8d811611bc12d60c4568f22e3eff36e44101324fe8f562ee3380a07269d7bc7abc97b7b86da888e5f5a64daa40242f847d026b9941f95d2f4a960fb895a69a05
+# SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
+#
SOURCE_HASH=sha512:8d811611bc12d60c4568f22e3eff36e44101324fe8f562ee3380a07269d7bc7abc97b7b86da888e5f5a64daa40242f847d026b9941f95d2f4a960fb895a69a05
LICENSE[0]=GPL
LICENSE[1]=FDL
WEB_SITE=http://developer.ximian.com
ENTERED=20040904
UPDATED=20050605
KEYWORDS="evolution gnome2 libs"
- SHORT="To enable Evolution to connect to an Exchange server"
+PATCHLEVEL=1
+ SHORT="Evolution to Exchange connector. Deprecated!"
cat << EOF
-Ximian Connector allows Evolution to connect to an Exchange Server.
+Please use evolution-exchange instead.
EOF
diff --git a/gnome2-libs/ximian-connector/HISTORY
b/gnome2-libs/ximian-connector/HISTORY
index 7ea191f..44e70d4 100644
--- a/gnome2-libs/ximian-connector/HISTORY
+++ b/gnome2-libs/ximian-connector/HISTORY
@@ -1,3 +1,7 @@
+2008-08-19 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS, DEPENDS, TRIGGERS, BUILD, PRE_BUILD, INSTALL:
+ deprecated, evolution-exchange is to be used nowadays.
+
2007-05-20 Arwed v. Merkatz <v.merkatz AT gmx.net>
* DEPENDS: changed evolution2 to evolution
diff --git a/gnome2-libs/ximian-connector/INSTALL
b/gnome2-libs/ximian-connector/INSTALL
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/gnome2-libs/ximian-connector/INSTALL
@@ -0,0 +1 @@
+true
diff --git a/gnome2-libs/ximian-connector/PRE_BUILD
b/gnome2-libs/ximian-connector/PRE_BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/gnome2-libs/ximian-connector/PRE_BUILD
@@ -0,0 +1 @@
+true
diff --git a/gnome2-libs/ximian-connector/TRIGGERS
b/gnome2-libs/ximian-connector/TRIGGERS
new file mode 100755
index 0000000..301d723
--- /dev/null
+++ b/gnome2-libs/ximian-connector/TRIGGERS
@@ -0,0 +1 @@
+on_cast ximian-connector dispel_self
- [SM-Commit] GIT changes to stable-0.24 grimoire by Jaka Kranjc (ae95361620555ab1460f0ab766b5cf6c4b31b6aa), Jaka Kranjc, 08/28/2008
Archive powered by MHonArc 2.6.24.