sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Julien ROZO (3192ad9ef62f7790d1fc5ba00cf6c5c2c81adfb7)

From: Julien ROZO <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Julien ROZO (3192ad9ef62f7790d1fc5ba00cf6c5c2c81adfb7)
Date: Sun, 1 Feb 2009 15:49:12 -0600

GIT changes to master grimoire by Julien ROZO <julien AT rozo.org>:

database/mysql/HISTORY |
5 ++
database/mysql/PRE_SUB_DEPENDS |
4 +-
database/mysql/REPAIR^9682de3a9bbe7bf0d2281d5c80939d51^PRE_SUB_DEPENDS |
5 ++
database/mysql/SUB_DEPENDS |
18 +++++-----
kde4-apps/amarok2/DEPENDS |
2 -
kde4-apps/amarok2/HISTORY |
4 ++
kde4/akonadi/DEPENDS |
2 -
kde4/akonadi/HISTORY |
4 ++
8 files changed, 31 insertions(+), 13 deletions(-)

New commits:
commit 3192ad9ef62f7790d1fc5ba00cf6c5c2c81adfb7
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>

akonadi: switched subdepends on InnoDB aware mysql to uppercase
(fixed bug #15054)

commit 24ac9d6dfb4c761a75c80b81a652097541308f95
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>

amarok2: switched subdepends on embedded mysql to uppercase
(fixed bug #15054)

commit 0f374a1bbb68431af80860eee62bd8f9286b32ec
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>

mysql: switched subdepends to uppercase in PRE_SUB_DEPENDS and SUB_DEPENDS
(fixed bug #15054)
added REPAIR^9682de3a9bbe7bf0d2281d5c80939d51^PRE_SUB_DEPENDS

diff --git a/database/mysql/HISTORY b/database/mysql/HISTORY
index dea62a1..bf99e83 100644
--- a/database/mysql/HISTORY
+++ b/database/mysql/HISTORY
@@ -1,3 +1,8 @@
+2009-02-01 Julien "_kaze_" ROZO <julien AT rozo.org
+ * PRE_SUB_DEPENDS, SUB_DEPENDS: switched subdepends to uppercase
+ (fixed bug #15054)
+ * REPAIR^9682de3a9bbe7bf0d2281d5c80939d51^PRE_SUB_DEPENDS: added
+
2009-01-30 Julien "_kaze_" ROZO <julien AT rozo.org
* PRE_SUB_DEPENDS, SUB_DEPENDS: added forced InnoDB storage engine
support

diff --git a/database/mysql/PRE_SUB_DEPENDS b/database/mysql/PRE_SUB_DEPENDS
index d989984..b79f83d 100755
--- a/database/mysql/PRE_SUB_DEPENDS
+++ b/database/mysql/PRE_SUB_DEPENDS
@@ -1,5 +1,5 @@
case $THIS_SUB_DEPENDS in
- embedded) if [ $MSQL_EMBED == "--with-embedded-server" ]; then return 0;
fi;;
- innodb) if [[ $MSQL_ENGINES == *InnoDB* || "$MSQL_ENGINES" == "all" ]];
then return 0; fi;;
+ embedded|EMBEDDED) if [ $MSQL_EMBED == "--with-embedded-server" ]; then
return 0; fi;;
+ innodb|INNODB) if [[ $MSQL_ENGINES == *InnoDB* || "$MSQL_ENGINES" ==
"all" ]]; then return 0; fi;;
esac
return 1
diff --git
a/database/mysql/REPAIR^9682de3a9bbe7bf0d2281d5c80939d51^PRE_SUB_DEPENDS
b/database/mysql/REPAIR^9682de3a9bbe7bf0d2281d5c80939d51^PRE_SUB_DEPENDS
new file mode 100755
index 0000000..c8aeb07
--- /dev/null
+++ b/database/mysql/REPAIR^9682de3a9bbe7bf0d2281d5c80939d51^PRE_SUB_DEPENDS
@@ -0,0 +1,5 @@
+case $THIS_SUB_DEPENDS in
+ EMBEDDED) if [ $MSQL_EMBED == "--with-embedded-server" ]; then return 0;
fi;;
+ INNODB) if [[ $MSQL_ENGINES == *InnoDB* || "$MSQL_ENGINES" == "all" ]];
then return 0; fi;;
+esac
+return 1
diff --git a/database/mysql/SUB_DEPENDS b/database/mysql/SUB_DEPENDS
index 857f695..b31384a 100755
--- a/database/mysql/SUB_DEPENDS
+++ b/database/mysql/SUB_DEPENDS
@@ -1,11 +1,11 @@
case $THIS_SUB_DEPENDS in
- embedded) echo "Embbeded mysql requested, forcing it." &&
- MSQL_EMBED="--with-embedded-server" ;;
- innodb) echo "InnoDB storage engine support requested, forcing it." &&
- if [ "$MSQL_ENGINES" == "none" ]; then
- MSQL_ENGINES="InnoDB"
- else
- MSQL_ENGINES="$MSQL_ENGINES InnoDB"
- fi ;;
- *) echo "unknown sub-depends!"; return 1 ;;
+ embedded|EMBEDDED) echo "Embbeded mysql requested, forcing it." &&
+ MSQL_EMBED="--with-embedded-server" ;;
+ innodb|INNODB) echo "InnoDB storage engine support requested, forcing
it." &&
+ if [ "$MSQL_ENGINES" == "none" ]; then
+ MSQL_ENGINES="InnoDB"
+ else
+ MSQL_ENGINES="$MSQL_ENGINES InnoDB"
+ fi ;;
+ *) echo "unknown sub-depends!"; return 1 ;;
esac
diff --git a/kde4-apps/amarok2/DEPENDS b/kde4-apps/amarok2/DEPENDS
index db27242..ac7c733 100755
--- a/kde4-apps/amarok2/DEPENDS
+++ b/kde4-apps/amarok2/DEPENDS
@@ -2,7 +2,7 @@ source $SECTION_DIRECTORY/KDE_DEPENDS &&
if [[ $AMR_SVN == y ]];then
depends subversion
fi &&
-depends -sub embedded mysql &&
+depends -sub EMBEDDED mysql &&
optional_depends faac '' '' 'for M4A/AAC/MP4 tag support' &&
optional_depends libvisual '' '' 'to use libvisual plugins' &&
optional_depends gstreamer '' '' 'GStreamer support' &&
diff --git a/kde4-apps/amarok2/HISTORY b/kde4-apps/amarok2/HISTORY
index a970a54..6c0445e 100644
--- a/kde4-apps/amarok2/HISTORY
+++ b/kde4-apps/amarok2/HISTORY
@@ -1,3 +1,7 @@
+2009-02-01 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DEPENDS: subdepends on embedded mysql must be uppercase
+ (fixed bug #15054)
+
2009-01-11 Julien "_kaze_" ROZO <julien AT rozo.org>
* DETAILS: updated version to 2.0.1.1

diff --git a/kde4/akonadi/DEPENDS b/kde4/akonadi/DEPENDS
index 728e3ec..570c3d3 100755
--- a/kde4/akonadi/DEPENDS
+++ b/kde4/akonadi/DEPENDS
@@ -9,5 +9,5 @@ depends subversion
fi &&
optional_depends mysql '' '' 'for akonadi server' &&
if is_depends_enabled $SPELL mysql; then
- depends -sub innodb mysql
+ depends -sub INNODB mysql
fi
diff --git a/kde4/akonadi/HISTORY b/kde4/akonadi/HISTORY
index 34f033b..d7c143a 100644
--- a/kde4/akonadi/HISTORY
+++ b/kde4/akonadi/HISTORY
@@ -1,3 +1,7 @@
+2009-02-01 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DEPENDS: subdepends on InnoDB in mysql must be uppercase
+ (fixed bug #15054)
+
2009-01-30 Julien "_kaze_" ROZO <julien AT rozo.org>
* DEPENDS: akonadi server needs InnoDB storage engine enabled in mysql

[SM-Commit] GIT changes to master grimoire by Julien ROZO (3192ad9ef62f7790d1fc5ba00cf6c5c2c81adfb7), Julien ROZO, 02/01/2009