Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-kde44 grimoire by Treeve Jelbert (f0d8ac93ea9807120c823157afedfe7dc6c93279)

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 devel-kde44 grimoire by Treeve Jelbert (f0d8ac93ea9807120c823157afedfe7dc6c93279)
  • Date: Fri, 4 Dec 2009 08:30:14 -0600

GIT changes to devel-kde44 grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

kde4-support/akonadi/DETAILS | 4 ++--
kde4-support/akonadi/HISTORY | 3 +++
kde4-support/phonon/DETAILS | 8 +++-----
kde4-support/phonon/HISTORY | 3 +++
x11-toolkits/qt4/CONFLICTS | 5 ++---
x11-toolkits/qt4/HISTORY | 7 +++++++
6 files changed, 20 insertions(+), 10 deletions(-)

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

phonon: => 4.3.80

commit 08d721f5ae75bcd066f16ce73d7fc2462882bfda
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

akonadi => 1.2.80 (unstable)
(cherry picked from commit d3038aa5be85f0f3022cd614ea8e0af6ea1e4c4c)

commit b2f6fd4ca0f1a8be20578133bb47b4ef35ac1766
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

qt4: SELF -> SPELL, there is no SELF
Remove debug message, corrupted conflict message to:
qt4 conflicts with old=4.5,. Dispel old=4.5,? []
Instead of:
qt4 conflicts with qt4. Dispel qt4? [y]
(cherry picked from commit b2548e171c451ae88c596a882ad787256a9634c6)

diff --git a/kde4-support/akonadi/DETAILS b/kde4-support/akonadi/DETAILS
index bacef71..c95ddb9 100755
--- a/kde4-support/akonadi/DETAILS
+++ b/kde4-support/akonadi/DETAILS
@@ -12,8 +12,8 @@ if [[ $AK_VER == devel ]]; then
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-svn"
else
if [[ $AK_VER == unstable ]]; then
- VERSION=1.2.1
-
SOURCE_HASH=sha512:213aba927f690b6f812d7de4800e24fe3e8931aa5e67c632f8b6af378ce71a8b59302d06047b8297336ea07242c093337c70bda12ac3ca4ed6fa3d27b17b5a89
+ VERSION=1.2.80
+
SOURCE_HASH=sha512:96c1c2f983eaa2c649751c5630a227b70beac62b9dc4281e5610fd309236f43e7505423bb01d432eeb6a86a46ea9831e387a5894c9a18dd381118309506f0ae4
else
VERSION=1.2.1

SOURCE_HASH=sha512:213aba927f690b6f812d7de4800e24fe3e8931aa5e67c632f8b6af378ce71a8b59302d06047b8297336ea07242c093337c70bda12ac3ca4ed6fa3d27b17b5a89
diff --git a/kde4-support/akonadi/HISTORY b/kde4-support/akonadi/HISTORY
index ab470e1..118d146 100644
--- a/kde4-support/akonadi/HISTORY
+++ b/kde4-support/akonadi/HISTORY
@@ -1,3 +1,6 @@
+2009-12-03 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.2.80 (unstable)
+
2009-09-20 Treeve Jelbert <treeve AT sourcemage.org>
* FINAL, POST_REMOVE: added, for update-mime-database

diff --git a/kde4-support/phonon/DETAILS b/kde4-support/phonon/DETAILS
index 3d25f68..8035b89 100755
--- a/kde4-support/phonon/DETAILS
+++ b/kde4-support/phonon/DETAILS
@@ -11,12 +11,10 @@ fi

SOURCE_URL[0]=svn://anonsvn.kde.org/home/kde/trunk/kdesupport/$SPELL:$SPELL
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
else
- VERSION=4.3.1
- VK=4.2.1
-
SOURCE_HASH=sha512:087728ae74f221b1b476cce279f2f313423d44bc8735f620450d129b2c55d79b132950653dd957fc1e7290101ef94983e13c99bed6365c45ce8cb493692cef48
+ VERSION=4.3.80
+
SOURCE_HASH=sha512:36254e468b5edf0ef8cac2cd1a765f819a7098ad939d283fd331e238e7a917b15558a07a5587fdece7cccbe37f398a068aaa73bfa77c1f1d69327390f6f562f4
SOURCE=$SPELL-$VERSION.tar.bz2
- SOURCE_URL[0]=$KDE_URL/stable/${VK}/src/$SOURCE
- SOURCE_URL[1]=$KDE_URL/stable/phonon/${VERSION}/$SOURCE
+ SOURCE_URL[1]=$KDE_URL/unstable/phonon/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
fi

diff --git a/kde4-support/phonon/HISTORY b/kde4-support/phonon/HISTORY
index 4374958..f45319e 100644
--- a/kde4-support/phonon/HISTORY
+++ b/kde4-support/phonon/HISTORY
@@ -1,3 +1,6 @@
+2009-12-04 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 4.3.80
+
2009-08-21 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: add libxml2, glib2, OPENGL

diff --git a/x11-toolkits/qt4/CONFLICTS b/x11-toolkits/qt4/CONFLICTS
index 60697dd..6c9828d 100755
--- a/x11-toolkits/qt4/CONFLICTS
+++ b/x11-toolkits/qt4/CONFLICTS
@@ -1,7 +1,6 @@
-if spell_ok $SELF;then
- OLDQT=`installed_version $SELF| cut -c-3` &&
+if spell_ok $SPELL;then
+ OLDQT=`installed_version $SPELL| cut -c-3` &&
NEWQT=`echo $VERSION | cut -c-3`
-message "old=$OLDQT, new=$NEWQT" &&
if [[ $OLDQT != $NEWQT ]];then
conflicts qt4 y
fi
diff --git a/x11-toolkits/qt4/HISTORY b/x11-toolkits/qt4/HISTORY
index 263a4a0..65736d3 100644
--- a/x11-toolkits/qt4/HISTORY
+++ b/x11-toolkits/qt4/HISTORY
@@ -1,3 +1,10 @@
+2009-12-01 Eric Sandall <sandalle AT sourcemage.org>
+ * CONFLICTS: SELF -> SPELL, there is no SELF
+ Remove debug message, corrupted conflict message to:
+ qt4 conflicts with old=4.5,. Dispel old=4.5,? []
+ Instead of:
+ qt4 conflicts with qt4. Dispel qt4? [y]
+
2009-12-01 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.6.0
* CONFLICTS: check old version before forcing conflict



  • [SM-Commit] GIT changes to devel-kde44 grimoire by Treeve Jelbert (f0d8ac93ea9807120c823157afedfe7dc6c93279), Treeve Jelbert, 12/04/2009

Archive powered by MHonArc 2.6.24.

Top of Page