diff options
author | Ethan Grammatikidis | 2009-02-01 22:02:23 +0000 |
---|---|---|
committer | Ethan Grammatikidis | 2009-02-01 22:02:23 +0000 |
commit | cc9ca64c2b1e62e58d3704e8a7babb8b860ce08a (patch) | |
tree | 8bb00e1cbb94601fa69125c33327ecf72b52bd4a | |
parent | 95cb5efd513f278871e683ef309d392cd4c8adc7 (diff) | |
parent | b653cacdf2a9ad4f7ef88f87ae1f19a1a6f27f99 (diff) |
Merge branch 'master' of ssh://scm.sourcemage.org/smgl/grimoire
-rw-r--r-- | database/mysql/HISTORY | 5 | ||||
-rwxr-xr-x | database/mysql/PRE_SUB_DEPENDS | 4 | ||||
-rwxr-xr-x | database/mysql/REPAIR^9682de3a9bbe7bf0d2281d5c80939d51^PRE_SUB_DEPENDS | 5 | ||||
-rwxr-xr-x | database/mysql/SUB_DEPENDS | 18 | ||||
-rwxr-xr-x | kde4-apps/amarok2/DEPENDS | 2 | ||||
-rw-r--r-- | kde4-apps/amarok2/HISTORY | 4 | ||||
-rwxr-xr-x | kde4/akonadi/DEPENDS | 2 | ||||
-rw-r--r-- | kde4/akonadi/HISTORY | 4 | ||||
-rwxr-xr-x | utils/strigi/DETAILS | 4 | ||||
-rw-r--r-- | utils/strigi/HISTORY | 3 |
10 files changed, 36 insertions, 15 deletions
diff --git a/database/mysql/HISTORY b/database/mysql/HISTORY index dea62a19bb..bf99e838ff 100644 --- a/database/mysql/HISTORY +++ b/database/mysql/HISTORY @@ -1,3 +1,8 @@ +2009-02-01 Julien "_kaze_" ROZO <julien@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@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 d9899846bd..b79f83d974 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 0000000000..c8aeb071b9 --- /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 857f695a30..b31384a1b6 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 db2724248b..ac7c733658 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 a970a548d3..6c0445e338 100644 --- a/kde4-apps/amarok2/HISTORY +++ b/kde4-apps/amarok2/HISTORY @@ -1,3 +1,7 @@ +2009-02-01 Julien "_kaze_" ROZO <julien@rozo.org> + * DEPENDS: subdepends on embedded mysql must be uppercase + (fixed bug #15054) + 2009-01-11 Julien "_kaze_" ROZO <julien@rozo.org> * DETAILS: updated version to 2.0.1.1 diff --git a/kde4/akonadi/DEPENDS b/kde4/akonadi/DEPENDS index 728e3ec11a..570c3d3aaf 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 34f033b50e..d7c143a932 100644 --- a/kde4/akonadi/HISTORY +++ b/kde4/akonadi/HISTORY @@ -1,3 +1,7 @@ +2009-02-01 Julien "_kaze_" ROZO <julien@rozo.org> + * DEPENDS: subdepends on InnoDB in mysql must be uppercase + (fixed bug #15054) + 2009-01-30 Julien "_kaze_" ROZO <julien@rozo.org> * DEPENDS: akonadi server needs InnoDB storage engine enabled in mysql diff --git a/utils/strigi/DETAILS b/utils/strigi/DETAILS index 57f4500de5..380a9f8f45 100755 --- a/utils/strigi/DETAILS +++ b/utils/strigi/DETAILS @@ -12,8 +12,8 @@ fi SOURCE_URL[0]=svn://anonsvn.kde.org/home/kde/trunk//kdesupport/$SPELL:$SPELL SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL else - VERSION=0.6.3 - SOURCE_HASH=sha512:518e0b77d55c021abc4b26f006ebf5b547e5332976e1a069b3bd553d7f3dbe059ed86b31963a240e6be46077379a58823e6bee5ef9facbcacf583bdc0dee58af + VERSION=0.6.4 + SOURCE_HASH=sha512:809e09a216ab59f3d19589a628581fcb98820f5f5106c571ab5fdf908886dbbffba756b20675b2fcc580f6967d93d843c6e94fb30cf3504a9e99371c701ff265 SOURCE=$SPELL-$VERSION.tar.bz2 # SOURCE_URL[0]=$KDE_URL/unstable/${KDEVER//.0}/src/$SOURCE SOURCE_URL[1]=$SOURCEFORGE_URL/$SPELL/$SOURCE diff --git a/utils/strigi/HISTORY b/utils/strigi/HISTORY index 1fa61a6267..974b49c4b9 100644 --- a/utils/strigi/HISTORY +++ b/utils/strigi/HISTORY @@ -1,3 +1,6 @@ +2009-02-01 Julien "_kaze_" ROZO <julien@rozo.org> + * DETAILS: updated version to 0.6.4 + 2009-01-13 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 0.6.3 |