Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (ab23662f16473a46607c9f22158c72a9784f8af8)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (ab23662f16473a46607c9f22158c72a9784f8af8)
  • Date: Sat, 18 Apr 2009 06:25:49 -0500

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

utils/hal/DEPENDS | 4 +++-
utils/hal/DETAILS | 12 ++++++++++--
utils/hal/HISTORY | 4 ++++
utils/hal/PREPARE | 1 +
utils/hal/PRE_BUILD | 4 ++++
5 files changed, 22 insertions(+), 3 deletions(-)

New commits:
commit a2774f99c62103a8a8f5f0b61951d5b953bdc4fc
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

hald - support devel(git) version

diff --git a/utils/hal/DEPENDS b/utils/hal/DEPENDS
index c71c087..1a3d822 100755
--- a/utils/hal/DEPENDS
+++ b/utils/hal/DEPENDS
@@ -7,7 +7,9 @@ depends libtool &&
depends udev &&
depends xml-parser-expat &&
depends pkgconfig &&
-
+if [[ $HAL_VER = devel ]] ;then
+ depends git
+fi &&
# needs checking, maybe optional_depends, but definately not depends
# depends dbus-python &&

diff --git a/utils/hal/DETAILS b/utils/hal/DETAILS
index e976484..f15a8af 100755
--- a/utils/hal/DETAILS
+++ b/utils/hal/DETAILS
@@ -1,12 +1,20 @@
SPELL=hal
+if [[ $HAL_VER = devel ]] ;then
+ VERSION=git
+ SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE_URL[0]=git://git.freedesktop.org/git/hal
+ SOURCE_IGNORE=volatile
+ FORCE_DOWNLOAD=on
+else
VERSION=0.5.12rc1
+ PATCHLEVEL=2

SOURCE_HASH=sha512:25eff31fdc3b2e8bce9b990a8e835278123557343ecde9269ee91cd6975b6143294256f0a7317e0ca9ba3701dab5d000ded3c3551f8251cb238bd1967af8d2db
SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://hal.freedesktop.org/releases/$SOURCE
+fi
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://freedesktop.org/Software/hal
ENTERED=20040904
- PATCHLEVEL=2
LICENSE[0]=GPL
KEYWORDS="utils"
SHORT="hardware abstraction layer library"
diff --git a/utils/hal/HISTORY b/utils/hal/HISTORY
index 32a985e..cea0831 100644
--- a/utils/hal/HISTORY
+++ b/utils/hal/HISTORY
@@ -1,3 +1,7 @@
+2009-04-18 Treeve Jelbert <treeve AT sourcemage.org>
+ * PREPARE: added, to support devel version
+ * DETAILS, PRE_BUILD, DEPENDS: adapt for devel version
+
2009-04-17 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: enable policykit support
* BUILD: remove disable policykit
diff --git a/utils/hal/PREPARE b/utils/hal/PREPARE
new file mode 100755
index 0000000..898485d
--- /dev/null
+++ b/utils/hal/PREPARE
@@ -0,0 +1 @@
+config_query_list HAL_VER 'which version to build?' stable devel
diff --git a/utils/hal/PRE_BUILD b/utils/hal/PRE_BUILD
index e23f4fb..0d1cd8a 100755
--- a/utils/hal/PRE_BUILD
+++ b/utils/hal/PRE_BUILD
@@ -1,3 +1,7 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
+if [[ $HAL_VER = devel ]] ;then
+NOCONFIGURE=1 ./autogen.sh
+else
patch -p1 < $SPELL_DIRECTORY/probe-serial.patch
+fi



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (ab23662f16473a46607c9f22158c72a9784f8af8), Treeve Jelbert, 04/18/2009

Archive powered by MHonArc 2.6.24.

Top of Page