[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (b8cf87f69e5d425362e130ab513041cbb71adbc9)

Treeve Jelbert scm at sourcemage.org
Sat Jun 28 08:20:43 EDT 2008


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

 ChangeLog                   |    1 +
 kde4-apps/amarok2/DEPENDS   |   10 ++++++++++
 kde4-apps/amarok2/DETAILS   |   30 ++++++++++++++++++++++++++++++
 kde4-apps/amarok2/HISTORY   |   16 ++++++++++++++++
 kde4-apps/amarok2/PREPARE   |    1 +
 kde4-apps/amarok2/PRE_BUILD |    5 +++++
 kde4-apps/amarok2/TRIGGERS  |    2 ++
 kde4-apps/amarok4/DEPENDS   |   10 ----------
 kde4-apps/amarok4/DETAILS   |   30 ------------------------------
 kde4-apps/amarok4/HISTORY   |   13 -------------
 kde4-apps/amarok4/PREPARE   |    1 -
 kde4-apps/amarok4/PRE_BUILD |    5 -----
 kde4-apps/amarok4/TRIGGERS  |    2 --
 13 files changed, 65 insertions(+), 61 deletions(-)

New commits:
commit b8cf87f69e5d425362e130ab513041cbb71adbc9
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    amarok4 -> amarok2

diff --git a/ChangeLog b/ChangeLog
index ffc21cd..32b2d4a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 2008-06-28 Treeve Jelbert <treeve at sourcemage.org>
 	* kde4-apps/kdenlive4: kde4 version of kdenlive (video editor)
 	* kde4-apps/amarok4: kde4 version of amarok (music player)
+	* kde4-apps/amarok2: renamed from amarok4
 
 2008-06-26 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
 	* graphics-libs/libglpng: new spell, a png to gl texture library
diff --git a/kde4-apps/amarok2/DEPENDS b/kde4-apps/amarok2/DEPENDS
new file mode 100755
index 0000000..f18e08a
--- /dev/null
+++ b/kde4-apps/amarok2/DEPENDS
@@ -0,0 +1,10 @@
+source $SECTION_DIRECTORY/KDE_DEPENDS  &&
+if [[ $AMR_SVN == y ]];then
+  depends subversion
+fi                    &&
+optional_depends mysql      '' ''     'mysql support'            &&
+optional_depends faac       '' ''     'for M4A/AAC/MP4 tag support' &&
+optional_depends libvisual  '' ''     'to use libvisual plugins' &&
+optional_depends gstreamer  '' ''     'GStreamer support'        &&
+optional_depends kdemultimedia4 '' '' 'CDDB support'             &&
+optional_depends taglib         '' '' ''
diff --git a/kde4-apps/amarok2/DETAILS b/kde4-apps/amarok2/DETAILS
new file mode 100755
index 0000000..b1e8aa5
--- /dev/null
+++ b/kde4-apps/amarok2/DETAILS
@@ -0,0 +1,30 @@
+           SPELL=amarok2
+          SPELLX=${SPELL//2}
+if [[ $AMR_SVN == y ]];then
+         VERSION=svn
+   SOURCE_IGNORE=volatile
+          SOURCE=$SPELLX-$VERSION.tar.bz2
+   SOURCE_URL[0]=svn://anonsvn.kde.org/home/kde/trunk/extragear/multimedia/$SPELLX:$SPELLX
+else
+        VERSION=1.80
+     SOURCE_HASH=sha512:665ff652cd09e173b633a6accfce4e1dbe3eaf0a0f9af840de40346571e85cd5d9bbd58504559d8c52b74f40f3210fdb9dca8f8d5802c944110f2d68d022da0a
+          SOURCE=$SPELLX-$VERSION.tar.bz2
+#   SOURCE_URL[0]=${SOURCEFORGE_URL}/$SPELL/$SOURCE
+   SOURCE_URL[1]=$KDE_URL/unstable/$SPELLX/$VERSION/src/$SOURCE
+fi
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
+        WEB_SITE=http://amarok.kde.org/
+         ENTERED=20080122
+      LICENSE[0]=GPL
+        KEYWORDS="player kde4 audio"
+           SHORT="a new media player for KDE4"
+cat << EOF
+There are many media players around these days, true. What's missing from
+most players is a user interface, that doesn't get in the way of the user. 
+
+How many buttons do you have to press for simply adding some new tracks to
+the playlist? 
+
+amaroK tries to be a little different, providing a simple drag and drop
+interface, that really makes playlist handling easy.
+EOF
diff --git a/kde4-apps/amarok2/HISTORY b/kde4-apps/amarok2/HISTORY
new file mode 100644
index 0000000..52e1a74
--- /dev/null
+++ b/kde4-apps/amarok2/HISTORY
@@ -0,0 +1,16 @@
+2008-06-28 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: rename as amarok2
+
+2008-05-18 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS, DEPENDS: add svn support
+	* PREPARE: added
+	* DEPENDS: remove postgresql, ruby, xine-lib
+	  add kdemultimedia4
+	  taglib is optional
+	* PRE_BUILD: added, fix compile with gcc4.3
+
+2008-01-22 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 1.80
+	* BUILD: use default_kde4_build
+	* POST_REMOVE, FINAL: deleted - not needed, provided by section/FUNCTIONS
+          spell created, copied from kde3 version
diff --git a/kde4-apps/amarok2/PREPARE b/kde4-apps/amarok2/PREPARE
new file mode 100755
index 0000000..583ae10
--- /dev/null
+++ b/kde4-apps/amarok2/PREPARE
@@ -0,0 +1 @@
+config_query AMR_SVN 'build SVN version?' n
diff --git a/kde4-apps/amarok2/PRE_BUILD b/kde4-apps/amarok2/PRE_BUILD
new file mode 100755
index 0000000..fd87dd6
--- /dev/null
+++ b/kde4-apps/amarok2/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build    &&
+cd $SOURCE_DIRECTORY &&
+sed -i '/math.h/ a\
+#include <climits> \
+' src/context/CoverBling.cpp
diff --git a/kde4-apps/amarok2/TRIGGERS b/kde4-apps/amarok2/TRIGGERS
new file mode 100755
index 0000000..0481877
--- /dev/null
+++ b/kde4-apps/amarok2/TRIGGERS
@@ -0,0 +1,2 @@
+on_cast kdelibs4 check_self &&
+on_cast flac check_self
diff --git a/kde4-apps/amarok4/DEPENDS b/kde4-apps/amarok4/DEPENDS
deleted file mode 100755
index f18e08a..0000000
--- a/kde4-apps/amarok4/DEPENDS
+++ /dev/null
@@ -1,10 +0,0 @@
-source $SECTION_DIRECTORY/KDE_DEPENDS  &&
-if [[ $AMR_SVN == y ]];then
-  depends subversion
-fi                    &&
-optional_depends mysql      '' ''     'mysql support'            &&
-optional_depends faac       '' ''     'for M4A/AAC/MP4 tag support' &&
-optional_depends libvisual  '' ''     'to use libvisual plugins' &&
-optional_depends gstreamer  '' ''     'GStreamer support'        &&
-optional_depends kdemultimedia4 '' '' 'CDDB support'             &&
-optional_depends taglib         '' '' ''
diff --git a/kde4-apps/amarok4/DETAILS b/kde4-apps/amarok4/DETAILS
deleted file mode 100755
index 0492b63..0000000
--- a/kde4-apps/amarok4/DETAILS
+++ /dev/null
@@ -1,30 +0,0 @@
-           SPELL=amarok4
-          SPELLX=${SPELL//4}
-if [[ $AMR_SVN == y ]];then
-         VERSION=svn
-   SOURCE_IGNORE=volatile
-          SOURCE=$SPELLX-$VERSION.tar.bz2
-   SOURCE_URL[0]=svn://anonsvn.kde.org/home/kde/trunk/extragear/multimedia/$SPELLX:$SPELLX
-else
-        VERSION=1.80
-     SOURCE_HASH=sha512:665ff652cd09e173b633a6accfce4e1dbe3eaf0a0f9af840de40346571e85cd5d9bbd58504559d8c52b74f40f3210fdb9dca8f8d5802c944110f2d68d022da0a
-          SOURCE=$SPELLX-$VERSION.tar.bz2
-#   SOURCE_URL[0]=${SOURCEFORGE_URL}/$SPELL/$SOURCE
-   SOURCE_URL[1]=$KDE_URL/unstable/${SPELL//4}/$VERSION/src/$SOURCE
-fi
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
-        WEB_SITE=http://amarok.kde.org/
-         ENTERED=20080122
-      LICENSE[0]=GPL
-        KEYWORDS="player kde4 audio"
-           SHORT="a new media player for KDE4"
-cat << EOF
-There are many media players around these days, true. What's missing from
-most players is a user interface, that doesn't get in the way of the user. 
-
-How many buttons do you have to press for simply adding some new tracks to
-the playlist? 
-
-amaroK tries to be a little different, providing a simple drag and drop
-interface, that really makes playlist handling easy.
-EOF
diff --git a/kde4-apps/amarok4/HISTORY b/kde4-apps/amarok4/HISTORY
deleted file mode 100644
index e7bae0a..0000000
--- a/kde4-apps/amarok4/HISTORY
+++ /dev/null
@@ -1,13 +0,0 @@
-2008-05-18 Treeve Jelbert <treeve at sourcemage.org>
-	* DETAILS, DEPENDS: add svn support
-	* PREPARE: added
-	* DEPENDS: remove postgresql, ruby, xine-lib
-	  add kdemultimedia4
-	  taglib is optional
-	* PRE_BUILD: added, fix compile with gcc4.3
-
-2008-01-22 Treeve Jelbert <treeve at sourcemage.org>
-	* DETAILS: version 1.80
-	* BUILD: use default_kde4_build
-	* POST_REMOVE, FINAL: deleted - not needed, provided by section/FUNCTIONS
-          spell created, copied from kde3 version
diff --git a/kde4-apps/amarok4/PREPARE b/kde4-apps/amarok4/PREPARE
deleted file mode 100755
index 583ae10..0000000
--- a/kde4-apps/amarok4/PREPARE
+++ /dev/null
@@ -1 +0,0 @@
-config_query AMR_SVN 'build SVN version?' n
diff --git a/kde4-apps/amarok4/PRE_BUILD b/kde4-apps/amarok4/PRE_BUILD
deleted file mode 100755
index fd87dd6..0000000
--- a/kde4-apps/amarok4/PRE_BUILD
+++ /dev/null
@@ -1,5 +0,0 @@
-default_pre_build    &&
-cd $SOURCE_DIRECTORY &&
-sed -i '/math.h/ a\
-#include <climits> \
-' src/context/CoverBling.cpp
diff --git a/kde4-apps/amarok4/TRIGGERS b/kde4-apps/amarok4/TRIGGERS
deleted file mode 100755
index 0481877..0000000
--- a/kde4-apps/amarok4/TRIGGERS
+++ /dev/null
@@ -1,2 +0,0 @@
-on_cast kdelibs4 check_self &&
-on_cast flac check_self



More information about the SM-Commit mailing list