Skip to Content.
Sympa Menu

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

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 (b30fad922f5ba45b21eeaacb064053647df513ba)
  • Date: Wed, 20 Jan 2010 07:38:02 -0600

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

kde4-support/akonadi/DEPENDS | 14 +++++++-------
kde4-support/akonadi/DETAILS | 22 ++--------------------
kde4-support/akonadi/FINAL | 2 --
kde4-support/akonadi/HISTORY | 10 ++++++++++
kde4-support/akonadi/POST_REMOVE | 2 --
kde4-support/akonadi/PREPARE | 6 ------
6 files changed, 19 insertions(+), 37 deletions(-)

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

akonadi: => 1.3.0
(cherry picked from commit a8199c55b39a656b237dcb208ab1153018c34905)

commit 3b89c9a78cdbba9750f247bec4363850edf43dd0
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

akonadi: => 1.2.90
(cherry picked from commit be6b5e9da0dbcd14abe9430d06a8f9855515c3e0)

diff --git a/kde4-support/akonadi/DEPENDS b/kde4-support/akonadi/DEPENDS
index 643b709..b48d217 100755
--- a/kde4-support/akonadi/DEPENDS
+++ b/kde4-support/akonadi/DEPENDS
@@ -1,4 +1,4 @@
-depends -sub "DBUS MYSQL" qt4 &&
+depends -sub DBUS qt4 &&
depends -sub PROGRAM_OPTIONS boost &&
depends g++ &&
depends cmake &&
@@ -6,10 +6,10 @@ depends libxslt &&
depends automoc &&
depends shared-mime-info &&
depends soprano &&
-if [[ "${AK_VER}" == "devel" ]];then
- depends subversion
-fi &&
-optional_depends mysql '' '' 'for akonadi server' &&
-if is_depends_enabled $SPELL mysql; then
- depends -sub INNODB mysql
+optional_depends postgresql '' '' 'akonadi database' &&
+if is_depends_enabled $SPELL postgresql;then
+ sub_depends qt4 POSTGRESQL
+else
+ depends -sub INNODB mysql &&
+ sub_depends qt4 MYSQL
fi
diff --git a/kde4-support/akonadi/DETAILS b/kde4-support/akonadi/DETAILS
index c95ddb9..dd37fb3 100755
--- a/kde4-support/akonadi/DETAILS
+++ b/kde4-support/akonadi/DETAILS
@@ -1,27 +1,9 @@
SPELL=akonadi
-if [[ $AK_VER == devel ]]; then
- if [[ $AK_VCS_AUTOUPDATE == y ]]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=svn
- fi
- SOURCE_IGNORE=volatile
- FORCE_DOWNLOAD=on
- SOURCE=$SPELL-svn.tar.bz2
-
SOURCE_URL[0]=svn://anonsvn.kde.org/home/kde/trunk/kdesupport/$SPELL:$SPELL
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-svn"
-else
- if [[ $AK_VER == unstable ]]; then
- VERSION=1.2.80
-
SOURCE_HASH=sha512:96c1c2f983eaa2c649751c5630a227b70beac62b9dc4281e5610fd309236f43e7505423bb01d432eeb6a86a46ea9831e387a5894c9a18dd381118309506f0ae4
- else
- VERSION=1.2.1
-
SOURCE_HASH=sha512:213aba927f690b6f812d7de4800e24fe3e8931aa5e67c632f8b6af378ce71a8b59302d06047b8297336ea07242c093337c70bda12ac3ca4ed6fa3d27b17b5a89
- fi
+ VERSION=1.3.0
+
SOURCE_HASH=sha512:1b2a7edb11734a4a7a6cd3820ab4d3935b6f9193c999155bca64f9279a6609e55ec87d33d8f6219a00b23077c01fa3bc031d33d5174d9f3d008defac1ae782f4
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://download.akonadi-project.org/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
-fi
WEB_SITE=http://pim.kde.org/akonadi
LICENSE[0]=LGPL
ENTERED=20080430
diff --git a/kde4-support/akonadi/FINAL b/kde4-support/akonadi/FINAL
deleted file mode 100755
index 93cc412..0000000
--- a/kde4-support/akonadi/FINAL
+++ /dev/null
@@ -1,2 +0,0 @@
-update-mime-database ${TRACK_ROOT}/usr/share/mime
-
diff --git a/kde4-support/akonadi/HISTORY b/kde4-support/akonadi/HISTORY
index 118d146..01d4e82 100644
--- a/kde4-support/akonadi/HISTORY
+++ b/kde4-support/akonadi/HISTORY
@@ -1,3 +1,13 @@
+2010-01-20 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.3.0
+
+2010-01-07 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.2.90
+ remove multiversion support
+ * FINAL, POST_REMOVE, PRE_BUILD, PREPARE: remove
+ * DEPENDS: add postgresql as an alternative to mysql
+ remove subversion
+
2009-12-03 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.2.80 (unstable)

diff --git a/kde4-support/akonadi/POST_REMOVE
b/kde4-support/akonadi/POST_REMOVE
deleted file mode 100755
index 93cc412..0000000
--- a/kde4-support/akonadi/POST_REMOVE
+++ /dev/null
@@ -1,2 +0,0 @@
-update-mime-database ${TRACK_ROOT}/usr/share/mime
-
diff --git a/kde4-support/akonadi/PREPARE b/kde4-support/akonadi/PREPARE
deleted file mode 100755
index 6611beb..0000000
--- a/kde4-support/akonadi/PREPARE
+++ /dev/null
@@ -1,6 +0,0 @@
-config_query_list AK_VER "which version to build?" stable unstable devel &&
-
-if [[ $AK_VER == devel ]]; then
- config_query AK_VCS_AUTOUPDATE \
- "Update automatically on every system update?" n
-fi



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (b30fad922f5ba45b21eeaacb064053647df513ba), Treeve Jelbert, 01/20/2010

Archive powered by MHonArc 2.6.24.

Top of Page