sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Robin Cook (1835bcfd149738811ab0dfa49d3fe51a9c9fe68a)

From: Robin Cook <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Robin Cook (1835bcfd149738811ab0dfa49d3fe51a9c9fe68a)
Date: Sun, 31 Oct 2010 17:46:11 -0500

GIT changes to master grimoire by Robin Cook <rcook AT wyrms.net>:

gnome2-libs/devicekit-power/CONFLICTS | 1 +
gnome2-libs/devicekit-power/HISTORY | 3 +++
libs/upower/DEPENDS | 7 ++++++-
libs/upower/HISTORY | 1 +
4 files changed, 11 insertions(+), 1 deletion(-)

New commits:
commit 1835bcfd149738811ab0dfa49d3fe51a9c9fe68a
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>

devicekit-power: CONFLICTS added

commit f77de52c1137cc3999821c83e8730348d38d5122
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>

DEPENDS: added optional on gobject-introspection

diff --git a/gnome2-libs/devicekit-power/CONFLICTS
b/gnome2-libs/devicekit-power/CONFLICTS
new file mode 100755
index 0000000..2fd90dc
--- /dev/null
+++ b/gnome2-libs/devicekit-power/CONFLICTS
@@ -0,0 +1 @@
+conflicts upower
diff --git a/gnome2-libs/devicekit-power/HISTORY
b/gnome2-libs/devicekit-power/HISTORY
index 78abd71..3e3fbdc 100644
--- a/gnome2-libs/devicekit-power/HISTORY
+++ b/gnome2-libs/devicekit-power/HISTORY
@@ -1,3 +1,6 @@
+2010-10-31 Robin Cook <rcook AT wyrms.net>
+ * CONFLICTS: added
+
2010-02-10 Arwed v. Merkatz <v.merkatz AT gmx.net>
* BUILD, CONFIGURE, DEPENDS: requires docbook-xsl and libxslt for man
page building, added a query for that, bug #15571
diff --git a/libs/upower/DEPENDS b/libs/upower/DEPENDS
index 36488d1..3ad9b07 100755
--- a/libs/upower/DEPENDS
+++ b/libs/upower/DEPENDS
@@ -2,4 +2,9 @@ depends glib2 &&
depends dbus &&
depends dbus-glib &&
depends policykit &&
-depends -sub EXTRAS udev
+depends -sub EXTRAS udev &&
+
+optional_depends gobject-introspection \
+ "--enable-introspection=yes" \
+ "--enable-introspection=no"
+
diff --git a/libs/upower/HISTORY b/libs/upower/HISTORY
index eed584e..acbfcde 100644
--- a/libs/upower/HISTORY
+++ b/libs/upower/HISTORY
@@ -1,5 +1,6 @@
2010-10-31 Robin Cook <rcook AT wyrms.net>
* CONFLICTS: added
+ * DEPENDS: added optional on gobject-introspection

2010-10-07 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.9.6

[SM-Commit] GIT changes to master grimoire by Robin Cook (1835bcfd149738811ab0dfa49d3fe51a9c9fe68a), Robin Cook, 10/31/2010