Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Jeremy Blosser (5c50c75a6670d87db0083b9affa5ee32b2937d0a)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jeremy Blosser <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Jeremy Blosser (5c50c75a6670d87db0083b9affa5ee32b2937d0a)
  • Date: Sun, 13 Oct 2013 17:15:44 -0500

GIT changes to master grimoire by Jeremy Blosser <jblosser AT sourcemage.org>:

libs/sword/DETAILS | 4 ++--
libs/sword/HISTORY | 3 +++
utils/bibletime4/DETAILS | 20 ++++++++++++++++----
utils/bibletime4/HISTORY | 3 +++
utils/bibletime4/PREPARE | 4 ++++
5 files changed, 28 insertions(+), 6 deletions(-)

New commits:
commit 5c50c75a6670d87db0083b9affa5ee32b2937d0a
Author: Jeremy Blosser <jblosser AT sourcemage.org>
Commit: Jeremy Blosser <jblosser AT sourcemage.org>

bibletime4: version 1.7.0, add scm branch (needed to build against
current sword release)

commit 966f77266fd453a50a83a8773408ba2f47766b01
Author: Jeremy Blosser <jblosser AT sourcemage.org>
Commit: Jeremy Blosser <jblosser AT sourcemage.org>

sword: 1.7.0

diff --git a/libs/sword/DETAILS b/libs/sword/DETAILS
index d6a0373..f2fb464 100755
--- a/libs/sword/DETAILS
+++ b/libs/sword/DETAILS
@@ -1,6 +1,6 @@
SPELL=sword
- VERSION=1.6.0
-
SOURCE_HASH=sha512:d548060d520fcfa733ede292bafb3a28c297a98d44f577ca8c6146fcb783c2cd1d4c9fbc6fbe21a87d494fe6aa3d0fe058173457b26d7152eaaf6c605ebfdcd0
+ VERSION=1.7.0
+
SOURCE_HASH=sha512:550ce7260ab331e5d5e4dd3c0f031ed227a8afcaaf15f4284b1e7e664d57cac7932861c8bbe3ed7a4a0aacfdc41603eb5b18aaf7713760604bcc1a785fd59460
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

SOURCE_URL[0]=http://www.crosswire.org/ftpmirror/pub/sword/source/v${VERSION%.*}/$SOURCE
diff --git a/libs/sword/HISTORY b/libs/sword/HISTORY
index c1e3dcd..c3bdc71 100644
--- a/libs/sword/HISTORY
+++ b/libs/sword/HISTORY
@@ -1,3 +1,6 @@
+2013-10-13 Jeremy Blosser <jblosser AT sourcemage.org>
+ * DETAILS: 1.7.0
+
2011-10-14 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: fixed long description wrap (scripted)

diff --git a/utils/bibletime4/DETAILS b/utils/bibletime4/DETAILS
index f17ad06..568028d 100755
--- a/utils/bibletime4/DETAILS
+++ b/utils/bibletime4/DETAILS
@@ -1,11 +1,23 @@
SPELL=bibletime4
SPELLX=bibletime
- VERSION=2.5
- SOURCE=$SPELLX-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
+if [[ $BIBLETIME4_BRANCH == scm ]]; then
+ if [[ $BIBLETIME4_AUTOUPDATE == y ]]; then
+ VERSION=$(date +%Y%m%d)
+ else
+ VERSION=git
+ fi
+ SOURCE=$SPELLX-$VERSION.tar.bz2
+ SOURCE_URL[0]=git://gitorious.org/$SPELLX/$SPELLX.git
+ SOURCE_IGNORE=volatile
+ FORCE_DOWNLOAD=on
+else
+ VERSION=2.9.2
+ SOURCE=$SPELLX-$VERSION.tar.bz2
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELLX/$SOURCE
+
SOURCE_HASH=sha512:5124f4beed75d880b6e2cae3ce0bfa37546271e683f90d6ff4ef60bd6aa17a3fa6f2fbf2b1940176f686a6f03b54986ed86411e15b8bc8aa886eda46b43d7ddf
+fi
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
WEB_SITE=http://www.$SPELLX.info
-
SOURCE_HASH=sha512:3e98d06e24ca48264ce5766ae96c76171d16ec2493bfe93aab1ea5ec5a830a49d2a215616356ad0c580d2a9bed0f76497c12974e7ebf4b7c2dea83938c7dee70
ENTERED=20090305
LICENSE=GPL
SHORT="Bible study program for KDE 4 based on the SWORD project"
diff --git a/utils/bibletime4/HISTORY b/utils/bibletime4/HISTORY
index aba75c3..05ecbeb 100644
--- a/utils/bibletime4/HISTORY
+++ b/utils/bibletime4/HISTORY
@@ -1,3 +1,6 @@
+2013-10-13 Jeremy Blosser <jblosser AT sourcemage.org>
+ * DETAILS, PREPARE: release version to 2.9.2, add git version
+
2010-01-20 Julien "_kaze_" ROZO <julien AT rozo.org>
* DETAILS: updated version to 2.5

diff --git a/utils/bibletime4/PREPARE b/utils/bibletime4/PREPARE
new file mode 100755
index 0000000..92b464a
--- /dev/null
+++ b/utils/bibletime4/PREPARE
@@ -0,0 +1,4 @@
+message "${PROBLEM_COLOR}Use the scm branch to build against sword 1.7." \
+ "${DEFAULT_COLOR}"
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm



  • [SM-Commit] GIT changes to master grimoire by Jeremy Blosser (5c50c75a6670d87db0083b9affa5ee32b2937d0a), Jeremy Blosser, 10/13/2013

Archive powered by MHonArc 2.6.24.

Top of Page