Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (0b8d18bc0acc62d3a212c1d1ab86042a646b94c7)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jaka Kranjc <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (0b8d18bc0acc62d3a212c1d1ab86042a646b94c7)
  • Date: Sun, 15 Apr 2007 09:31:18 -0500

GIT changes to master grimoire by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:

libs/openobex/DEPENDS | 6 +++---
libs/openobex/HISTORY | 5 +++++
libs/openobex/PRE_SUB_DEPENDS | 4 ++++
libs/openobex/SUB_DEPENDS | 5 +++++
mobile/obexftp/DEPENDS | 2 +-
mobile/obexftp/HISTORY | 3 +++
6 files changed, 21 insertions(+), 4 deletions(-)

New commits:
commit 0b8d18bc0acc62d3a212c1d1ab86042a646b94c7
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

openobex: added dependency flags

commit 6d6575ca3ad895b9c291dcc9f8b90275cf766530
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

obexftp: subdepends on bluetooth support in openobex #13610

commit 05d07e3f30d0f070c0c3e8dff1d9429880cd05db
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

openobex: added subdependency support #13610

diff --git a/libs/openobex/DEPENDS b/libs/openobex/DEPENDS
index 14d8b5f..0ac232e 100755
--- a/libs/openobex/DEPENDS
+++ b/libs/openobex/DEPENDS
@@ -1,3 +1,3 @@
-optional_depends libusb "" "" "Usb-obex support" &&
-optional_depends bluez-utils "" "" "Bluetooth support" &&
-optional_depends irda-utils "" "" "Irda support"
+optional_depends libusb "" "--disable-usb" "Usb-obex support" &&
+optional_depends bluez-libs "" "--disable-bluetooth" "Bluetooth support" &&
+optional_depends irda-utils "" "--disable-irda" "Irda support"
diff --git a/libs/openobex/HISTORY b/libs/openobex/HISTORY
index bd775cc..e6ef9d6 100644
--- a/libs/openobex/HISTORY
+++ b/libs/openobex/HISTORY
@@ -1,3 +1,8 @@
+2007-04-15 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * SUB_DEPENDS, PRE_SUB_DEPENDS: added for #13610
+ * DEPENDS: changed bluez-utils to bluez-libs
+ added flags to dependencies
+
2006-06-14 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.3

diff --git a/libs/openobex/PRE_SUB_DEPENDS b/libs/openobex/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..ee37618
--- /dev/null
+++ b/libs/openobex/PRE_SUB_DEPENDS
@@ -0,0 +1,4 @@
+case $THIS_SUB_DEPENDS in
+ BLUEZ) is_depends_enabled $SPELL bluez-utils && return 0;;
+esac
+return 1
diff --git a/libs/openobex/SUB_DEPENDS b/libs/openobex/SUB_DEPENDS
new file mode 100755
index 0000000..da5e288
--- /dev/null
+++ b/libs/openobex/SUB_DEPENDS
@@ -0,0 +1,5 @@
+case "$THIS_SUB_DEPENDS" in
+ BLUEZ) echo "Bluetooth support requested, forcing bluez-libs dependency."
+ depends bluez-libs;;
+ *) echo "bogus sub_depends: $THIS_SUB_DEPENDS"; return 1;;
+esac
diff --git a/mobile/obexftp/DEPENDS b/mobile/obexftp/DEPENDS
index 79ee9da..7833117 100755
--- a/mobile/obexftp/DEPENDS
+++ b/mobile/obexftp/DEPENDS
@@ -1,3 +1,3 @@
depends libpcap &&
depends python &&
-depends openobex
+depends -sub BLUEZ openobex
diff --git a/mobile/obexftp/HISTORY b/mobile/obexftp/HISTORY
index bd9061b..d352e33 100644
--- a/mobile/obexftp/HISTORY
+++ b/mobile/obexftp/HISTORY
@@ -1,3 +1,6 @@
+2007-04-15 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * DEPENDS: added subdependecy on openobex with bluez-libs #13610
+
2007-03-24 Mark Bainter <mbainter-smgl AT lostinagoodbook.org>
* DEPENDS: Added dependency for python for bug #12331





Archive powered by MHonArc 2.6.24.

Top of Page