[SM-Commit] GIT changes to master grimoire by Florian Franzmann (e01b7ba072ea6d443680d407fdc027dfe2e84024)

Florian Franzmann scm at sourcemage.org
Thu Apr 15 05:05:08 EDT 2010


GIT changes to master grimoire by Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>:

 utils/qutescoop/BUILD           |    2 +-
 utils/qutescoop/DETAILS         |   11 ++++++-----
 utils/qutescoop/HISTORY         |    5 +++++
 utils/qutescoop/PRE_BUILD       |    6 ------
 utils/qutescoop/teamspeak.patch |   12 ------------
 5 files changed, 12 insertions(+), 24 deletions(-)

New commits:
commit a2c1413b1f1d02cbc72c7f64edfa1c4de10a1972
Author: Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>

    utils/qutescoop: version 1.0.2

diff --git a/utils/qutescoop/BUILD b/utils/qutescoop/BUILD
index 8f58e6d..eec3de4 100755
--- a/utils/qutescoop/BUILD
+++ b/utils/qutescoop/BUILD
@@ -1 +1 @@
-make
+qt4_build
diff --git a/utils/qutescoop/DETAILS b/utils/qutescoop/DETAILS
index e44a7c2..1e5631a 100755
--- a/utils/qutescoop/DETAILS
+++ b/utils/qutescoop/DETAILS
@@ -1,9 +1,10 @@
            SPELL=qutescoop
-         VERSION=1.0.0
-          SOURCE="QuteScoop.tgz"
-   SOURCE_URL[0]=http://www.${SPELL}.org/${SOURCE}
-     SOURCE_HASH=sha512:1efe80ce24665ffa5b913149c613cafebf3232e81d02d1e79470584ca4858cd8ca114240548e39c6079d070643244b876e8628e8e3a5eea294aefa57f53ec632
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/QuteScoop"
+         VERSION=1.0.2
+          SOURCE=${SPELL}-${VERSION}.tar.bz2
+   SOURCE_URL[0]=svn_https://${SPELL}.svn.sourceforge.net/svnroot/${SPELL}/tags/${VERSION}/QuteScoop:${SPELL}
+ SOURCE_HINTS[0]=no-check-certificate
+   SOURCE_IGNORE=volatile
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
         WEB_SITE="http://xivap.linuxpunk.org/index.php/QuteScoop"
       LICENSE[0]=GPL
          ENTERED=20080102
diff --git a/utils/qutescoop/HISTORY b/utils/qutescoop/HISTORY
index 1b20761..5563ff3 100644
--- a/utils/qutescoop/HISTORY
+++ b/utils/qutescoop/HISTORY
@@ -1,3 +1,8 @@
+2010-04-15 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* DETAILS: version 1.0.2
+	* BUILD: use qt4_build
+	* PRE_BUILD, teamspeak.patch: removed
+
 2008-01-16 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
 	* PRE_BUILD: don't pull in is_depends_enabled.function, is not
 	  necessary anymore.
diff --git a/utils/qutescoop/PRE_BUILD b/utils/qutescoop/PRE_BUILD
deleted file mode 100755
index 57c6039..0000000
--- a/utils/qutescoop/PRE_BUILD
+++ /dev/null
@@ -1,6 +0,0 @@
-default_pre_build    &&
-cd $SOURCE_DIRECTORY &&
-if  is_depends_enabled  $SPELL ts2_client;  then
-    patch -p1 < $SCRIPT_DIRECTORY/teamspeak.patch
-fi                   &&
-${INSTALL_ROOT}/usr/bin/qt4/qmake
diff --git a/utils/qutescoop/teamspeak.patch b/utils/qutescoop/teamspeak.patch
deleted file mode 100644
index 4ba3baf..0000000
--- a/utils/qutescoop/teamspeak.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naupr QuteScoop.orig/ControllerDetails.cpp QuteScoop.linux/ControllerDetails.cpp
---- QuteScoop.orig/ControllerDetails.cpp	2007-12-30 21:43:01.000000000 +0100
-+++ QuteScoop.linux/ControllerDetails.cpp	2008-01-12 23:48:39.740908442 +0100
-@@ -99,6 +99,8 @@ void ControllerDetails::on_btnJoinChanne
- 	
- #ifdef Q_WS_WIN
- 	QString program = "start";
-+#elif defined Q_WS_X11
-+	QString program = "teamspeak";
- #else
- 	QString program = "open";
- #endif



More information about the SM-Commit mailing list