Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (990b589153b5ec12fc60dcddc70cfaa5f6dbd39c)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (990b589153b5ec12fc60dcddc70cfaa5f6dbd39c)
  • Date: Thu, 15 Sep 2011 22:16:49 -0500

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

archive/bacula/BUILD | 2 +-
archive/bacula/DEPENDS | 2 +-
archive/bacula/DETAILS | 4 ++--
archive/bacula/HISTORY | 3 +++
archive/bacula/PREPARE | 7 ++-----
audio-drivers/pyalsa/DETAILS | 4 ++--
audio-drivers/pyalsa/HISTORY | 3 +++
audio-drivers/pyalsa/PREPARE | 8 ++------
crypto/gpa/DETAILS | 5 ++---
crypto/gpa/HISTORY | 3 +++
crypto/gpa/PREPARE | 8 ++------
crypto/gpa/PRE_BUILD | 2 +-
12 files changed, 24 insertions(+), 27 deletions(-)

New commits:
commit 990b589153b5ec12fc60dcddc70cfaa5f6dbd39c
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

pyalsa: Use prepare_select_branch

commit 9023ab87bddca56b632ce105db17b07a518e811b
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

gpa: Use prepare_select_branch

commit ac3a6e549a2ef16c1e0d08f1a26365b13331a2ff
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

bacula: Use prepare_select_branch

diff --git a/archive/bacula/BUILD b/archive/bacula/BUILD
index ba4ab71..bbfa292 100755
--- a/archive/bacula/BUILD
+++ b/archive/bacula/BUILD
@@ -6,7 +6,7 @@ OPTS="--with-scriptdir=$INSTALL_ROOT/etc/bacula \
--with-working-dir=$INSTALL_ROOT/var/bacula \
$OPTS" &&

-if [[ $BACULA_SCM == y ]]; then
+if [[ $BACULA_BRANCH == scm ]]; then
cd bacula
fi &&

diff --git a/archive/bacula/DEPENDS b/archive/bacula/DEPENDS
index b0d2d78..1bfa85d 100755
--- a/archive/bacula/DEPENDS
+++ b/archive/bacula/DEPENDS
@@ -1,6 +1,6 @@
depends -sub CXX gcc &&

-if [[ $BACULA_SCM == y ]]; then
+if [[ $BACULA_BRANCH == scm ]]; then
depends git
fi &&

diff --git a/archive/bacula/DETAILS b/archive/bacula/DETAILS
index c33a539..edf3ab7 100755
--- a/archive/bacula/DETAILS
+++ b/archive/bacula/DETAILS
@@ -1,6 +1,6 @@
SPELL=bacula
-if [[ $BACULA_SCM == y ]]; then
- if [[ $BACULA_SCM_AUTOUPDATE == y ]]; then
+if [[ $BACULA_BRANCH == scm ]]; then
+ if [[ $BACULA_AUTOUPDATE == y ]]; then
VERSION=$(date +%Y%m%d)
else
VERSION=scm
diff --git a/archive/bacula/HISTORY b/archive/bacula/HISTORY
index 5a04b50..ecd8152 100644
--- a/archive/bacula/HISTORY
+++ b/archive/bacula/HISTORY
@@ -1,3 +1,6 @@
+2011-09-15 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD, DEPENDS, DETAILS, PREPARE: Use prepare_select_branch
+
2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: changed dependency on g++ to dependency on gcc with
sub-depends on CXX (scripted)
diff --git a/archive/bacula/PREPARE b/archive/bacula/PREPARE
index f9b16ec..98d27e4 100755
--- a/archive/bacula/PREPARE
+++ b/archive/bacula/PREPARE
@@ -1,5 +1,2 @@
-config_query BACULA_SCM 'Build scm version ?' n &&
-
-if [[ $BACULA_SCM == y ]]; then
- config_query BACULA_SCM_AUTOUPDATE 'Update on every system update?' n
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/audio-drivers/pyalsa/DETAILS b/audio-drivers/pyalsa/DETAILS
index e981906..d79506a 100755
--- a/audio-drivers/pyalsa/DETAILS
+++ b/audio-drivers/pyalsa/DETAILS
@@ -1,6 +1,6 @@
SPELL=pyalsa
-if [[ $PYALSA_GIT == y ]]; then
- if [[ $PYALSA_GIT_AUTOUPDATE == y ]]; then
+if [[ $PYALSA_BRANCH == scm ]]; then
+ if [[ $PYALSA_AUTOUPDATE == y ]]; then
VERSION=$(date +%Y%m%d)
else
VERSION=git
diff --git a/audio-drivers/pyalsa/HISTORY b/audio-drivers/pyalsa/HISTORY
index 0ef09ac..18ada58 100644
--- a/audio-drivers/pyalsa/HISTORY
+++ b/audio-drivers/pyalsa/HISTORY
@@ -1,3 +1,6 @@
+2011-09-15 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS, PREPARE: Use prepare_select_branch
+
2011-02-08 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.0.24

diff --git a/audio-drivers/pyalsa/PREPARE b/audio-drivers/pyalsa/PREPARE
index 6ab056e..98d27e4 100755
--- a/audio-drivers/pyalsa/PREPARE
+++ b/audio-drivers/pyalsa/PREPARE
@@ -1,6 +1,2 @@
-config_query PYALSA_GIT "Build latest version from development tree?" n &&
-
-if [[ $PYALSA_GIT == y ]]; then
- config_query PYALSA_GIT_AUTOUPDATE \
- "Automatically update on every system update?" n
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/crypto/gpa/DETAILS b/crypto/gpa/DETAILS
index f71a848..ed38d61 100755
--- a/crypto/gpa/DETAILS
+++ b/crypto/gpa/DETAILS
@@ -1,7 +1,6 @@
SPELL=gpa
-
-if [ "$GPA_SVN" == "y" ]; then
- if [ "$GPA_SVN_AUTOUPDATE" == "y" ]; then
+if [ "$GPA_BRANCH" == "scm" ]; then
+ if [ "$GPA_AUTOUPDATE" == "y" ]; then
VERSION=$(date +%Y%m%d)
else
VERSION=svn
diff --git a/crypto/gpa/HISTORY b/crypto/gpa/HISTORY
index 9ea987b..d927e3d 100644
--- a/crypto/gpa/HISTORY
+++ b/crypto/gpa/HISTORY
@@ -1,3 +1,6 @@
+2011-09-15 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS, PREPARE, PRE_BUILD: Use prepare_select_branch
+
2010-06-01 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS, PREPARE, PRE_BUILD: added support for svn version #15730

diff --git a/crypto/gpa/PREPARE b/crypto/gpa/PREPARE
index 0ae4ee1..98d27e4 100755
--- a/crypto/gpa/PREPARE
+++ b/crypto/gpa/PREPARE
@@ -1,6 +1,2 @@
-config_query GPA_SVN "Build SCM (subversion) version?" n &&
-
-if [ "$GPA_SVN" == "y" ]; then
- config_query GPA_SVN_AUTOUPDATE \
- "Automatically update on every system update?" n
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/crypto/gpa/PRE_BUILD b/crypto/gpa/PRE_BUILD
index d9b31dd..ece5339 100755
--- a/crypto/gpa/PRE_BUILD
+++ b/crypto/gpa/PRE_BUILD
@@ -1,6 +1,6 @@
default_pre_build &&

-if [ "$GPA_SVN" == "y" ]; then
+if [ "$GPA_BRANCH" == "scm" ]; then
cd $SOURCE_DIRECTORY &&
autopoint &&
NOCONFIGURE=ON ./autogen.sh



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (990b589153b5ec12fc60dcddc70cfaa5f6dbd39c), Ismael Luceno, 09/15/2011

Archive powered by MHonArc 2.6.24.

Top of Page