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

Julien ROZO scm at sourcemage.org
Thu Sep 4 06:20:43 EDT 2008


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

 telephony/tapioca-qt/CONFLICTS |    3 +--
 telephony/tapioca-qt/DETAILS   |    9 ++++++++-
 telephony/tapioca-qt/HISTORY   |    5 +++++
 telephony/tapioca-qt/PREPARE   |    1 +
 telephony/telepathy-qt/DETAILS |   13 ++++++++-----
 telephony/telepathy-qt/HISTORY |    4 ++++
 telephony/telepathy-qt/PREPARE |    1 +
 7 files changed, 28 insertions(+), 8 deletions(-)

New commits:
commit e483e0c3930dbb361f914f330d9c7eb12ca9641b
Author: Julien ROZO <julien at rozo.org>
Commit: Julien ROZO <julien at rozo.org>

    tapioca-qt: added the possibility to cast the svn version
    in CONFLICTS, fixed syntax error (conflicts function was not called at
    all)

commit 44c103710ebe91f2c3895a29573b2b5ed79f45da
Author: Julien ROZO <julien at rozo.org>
Commit: Julien ROZO <julien at rozo.org>

    telepathy-qt: added the possibility to cast the svn version

diff --git a/telephony/tapioca-qt/CONFLICTS b/telephony/tapioca-qt/CONFLICTS
index 7678a42..515d3f2 100755
--- a/telephony/tapioca-qt/CONFLICTS
+++ b/telephony/tapioca-qt/CONFLICTS
@@ -1,2 +1 @@
-tapioca
-
+conflicts tapioca
diff --git a/telephony/tapioca-qt/DETAILS b/telephony/tapioca-qt/DETAILS
index 4080449..702fc20 100755
--- a/telephony/tapioca-qt/DETAILS
+++ b/telephony/tapioca-qt/DETAILS
@@ -1,10 +1,17 @@
            SPELL=tapioca-qt
+if [[ $TAPQT_SVN == y ]];then
+         VERSION=svn
+   SOURCE_IGNORE=volatile
+          SOURCE=$SPELL-$VERSION.tar.bz2
+   SOURCE_URL[0]=svn_http://svn.sourceforge.net/svnroot/tapioca-voip/trunk/${SPELL}:${SPELL}
+else
          VERSION=0.14.1
      SOURCE_HASH=sha512:4fb9e0a3fa0b251cadb13ac5c85daf40b61054e72f630cc7258f543bff99f27f58186ebb6ecbf6b6c1a9ff9d98e34a1974a36fadbc4ae38cef16475c52eb6611
           SOURCE=$SPELL-$VERSION.tar.gz
+   SOURCE_URL[0]=$SOURCEFORGE_URL/tapioca-voip/$SOURCE
+fi;
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
         WEB_SITE=http://tapioca-voip.sourceforge.net
-   SOURCE_URL[0]=$SOURCEFORGE_URL/tapioca-voip/$SOURCE
       LICENSE[0]=LGPL
          ENTERED=20070307
         KEYWORDS=""
diff --git a/telephony/tapioca-qt/HISTORY b/telephony/tapioca-qt/HISTORY
index 0a338d1..023dc24 100644
--- a/telephony/tapioca-qt/HISTORY
+++ b/telephony/tapioca-qt/HISTORY
@@ -1,3 +1,8 @@
+2008-09-04 Julien "_kaze_" ROZO <julien at rozo.org>
+	* DETAILS: added the possibility to cast the svn version
+	* PREPARE: added, for svn version
+	* CONFLICTS: fixed syntax
+
 2007-06-02 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 0.14.1
 
diff --git a/telephony/tapioca-qt/PREPARE b/telephony/tapioca-qt/PREPARE
new file mode 100755
index 0000000..9b8e427
--- /dev/null
+++ b/telephony/tapioca-qt/PREPARE
@@ -0,0 +1 @@
+config_query TAPQT_SVN 'Do you want the SVN version?' n
diff --git a/telephony/telepathy-qt/DETAILS b/telephony/telepathy-qt/DETAILS
index b7d1ccd..64b5922 100755
--- a/telephony/telepathy-qt/DETAILS
+++ b/telephony/telepathy-qt/DETAILS
@@ -1,13 +1,16 @@
            SPELL=telepathy-qt
+if [[ $TELQT_SVN == y ]];then
+         VERSION=svn
+   SOURCE_IGNORE=volatile
+          SOURCE=$SPELL-$VERSION.tar.bz2
+   SOURCE_URL[0]=svn_http://svn.sourceforge.net/svnroot/tapioca-voip/trunk/${SPELL}:${SPELL}
+else
          VERSION=0.14.1
      SOURCE_HASH=sha512:d40787b369255e3d4aa9a979f754edabd9bbbf89f9ed13df7f1bd94c5765122003be228d91d953b9ff138faf361a258e7e908b693a764b2d4e30b34f909a8926
           SOURCE=$SPELL-$VERSION.tar.gz
-#SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-#   SOURCE_IGNORE=volatile   
-#   SOURCE_URL[0]=svn_ssh://svn.sourceforge.net/svnroot/tapioca-voip/trunk/$SPELL:$SPELL
    SOURCE_URL[0]=$SOURCEFORGE_URL/tapioca-voip/$SOURCE
-#  FORCE_DOWNLOAD=on
+fi;
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
         WEB_SITE=http://tapioca-voip.sourceforge.net
       LICENSE[0]=LGPL
          ENTERED=20070307
diff --git a/telephony/telepathy-qt/HISTORY b/telephony/telepathy-qt/HISTORY
index 0a338d1..6c24f0f 100644
--- a/telephony/telepathy-qt/HISTORY
+++ b/telephony/telepathy-qt/HISTORY
@@ -1,3 +1,7 @@
+2008-09-04 Julien "_kaze_" ROZO <julien at rozo.org>
+	* DETAILS: added the possibility to cast the svn version
+	* PREPARE: added, for svn version
+
 2007-06-02 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 0.14.1
 
diff --git a/telephony/telepathy-qt/PREPARE b/telephony/telepathy-qt/PREPARE
new file mode 100755
index 0000000..0d010aa
--- /dev/null
+++ b/telephony/telepathy-qt/PREPARE
@@ -0,0 +1 @@
+config_query TELQT_SVN 'Do you want the SVN version?' n



More information about the SM-Commit mailing list