sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Jaka Kranjc (094ccf21be16afd5beb5cb7c08fca51d6bc7022f)
- From: Jaka Kranjc <scm AT mail.sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (094ccf21be16afd5beb5cb7c08fca51d6bc7022f)
- Date: Sat, 5 Aug 2006 13:44:32 -0500
GIT changes to master grimoire by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:
kde-core/kdebase/DEPENDS | 11 +++++++++++
kde-core/kdebase/HISTORY | 3 +++
2 files changed, 14 insertions(+)
New commits:
commit 094ccf21be16afd5beb5cb7c08fca51d6bc7022f
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
kdebase: depend on dbus-qt3-old if appropriate
diff --git a/kde-core/kdebase/DEPENDS b/kde-core/kdebase/DEPENDS
index 765262d..4c97e8c 100755
--- a/kde-core/kdebase/DEPENDS
+++ b/kde-core/kdebase/DEPENDS
@@ -107,6 +107,17 @@ optional_depends hal
'--without-hal' \
'for automatic hardware detection' &&
+# is_depends_enabled is only in devel for now #12949
+# once it is everywhere, only the second if block should remain
+if declare -f is_depends_enabled &> /dev/null; then
+ if is_depends_enabled $SPELL hal; then
+ depends dbus-qt3-old
+ fi
+else
+ message "dbus-qt3-old is needed for the hal backend, so say y here if you
said y to hal" &&
+ optional_depends dbus-qt3-old '' '' 'for automatic hardware detection'
+fi &&
+
optional_depends ntp \
'' \
'' \
diff --git a/kde-core/kdebase/HISTORY b/kde-core/kdebase/HISTORY
index d0bca1b..7c0db5b 100644
--- a/kde-core/kdebase/HISTORY
+++ b/kde-core/kdebase/HISTORY
@@ -1,3 +1,6 @@
+2006-08-05 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * DEPENDS: really add optional dbus-qt3 (for hal)
+
2006-08-01 Treeve Jelbert <treeve AT pi.be>
* DETAILS: version 3.5.4
* post-3.5.0-kdebase-kdm.diff: REMOVE
- [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (094ccf21be16afd5beb5cb7c08fca51d6bc7022f), Jaka Kranjc, 08/05/2006
Archive powered by MHonArc 2.6.24.