sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master z-rejected grimoire by Arjan Bouter (87852d15a10ec830118f312e1b6f2f91afff718c)

From: Arjan Bouter <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master z-rejected grimoire by Arjan Bouter (87852d15a10ec830118f312e1b6f2f91afff718c)
Date: Thu, 3 Jan 2008 07:12:58 -0600

GIT changes to master z-rejected grimoire by Arjan Bouter
<abouter AT sourcemage.org>:

dev/null |binary
z-chat-im/mercury/DETAILS | 11 +++----
z-chat-im/mercury/HISTORY | 8 +++++
z-chat-im/mercury/INSTALL | 47
+++++++++++++++++++++---------
z-chat-im/mercury/bin/Mercury_Messenger | 12 ++++---
z-chat-im/mercury/desktop/Mercury.desktop | 9 -----
z-chat-im/mercury/mercury.png | 0
z-windowmanagers/ion3/DETAILS | 2 -
z-windowmanagers/ion3/HISTORY | 3 +
9 files changed, 58 insertions(+), 34 deletions(-)

New commits:
commit 87852d15a10ec830118f312e1b6f2f91afff718c
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

ion3: version 20071220

commit b4c815ddd2b2345387a000512fe24f6b599b4fa9
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

mercury: updated and fixed install

diff --git a/z-chat-im/mercury/DETAILS b/z-chat-im/mercury/DETAILS
index a221171..4b64de7 100755
--- a/z-chat-im/mercury/DETAILS
+++ b/z-chat-im/mercury/DETAILS
@@ -1,11 +1,10 @@
SPELL=mercury
- VERSION=1.8
- SOURCE=${VERSION}.zip
+ VERSION=1.9
+ SOURCE=mercury-messenger-${VERSION}.tgz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.beernabeer.com/$SOURCE
-# SOURCE_URL[0]=http://download.sourcemage.org/mirror/$SOURCE
-
SOURCE_HASH=sha512:97649b8a1e6a750e47e56a7a97b6e7d595fa1bf80a2805e200bc8604bac444d028f72e0f9be7a1a9a0325b3f50fa089bf98afb8742a41a910a27c7488967bb8c
- WEB_SITE=http://www.mercury.to
+
SOURCE_HASH=sha512:c886c3db2030591024bc10693ecc46117f9264f84845033ea1036e9dc14cdc8cdc464bc1747f3280591e853b491eb14a347d84d344a2da389bd5b2212d95933b
+ WEB_SITE=http://www.mercury.im
ENTERED=20050531
REJECT="is non-source and license"
SHORT="Mercury is a Java Based MSN client"
@@ -17,7 +16,7 @@ With Mercury you can do the same things as with your normal
messenger:
* Add a display picture (also know as avatar)
* Send files through the msn server (for people with a firewall etc..)
or direct
* Play games (Tic Tac Toe and Connect4 only at the moment)
- * Watch the webcam of your friends (Mercury auto-saves these sessions on
the disk and can convert them to Quicktime movies, click here for more info)
+ * Watch the webcam of your friends (Mercury auto-saves these sessions on
the disk and can convert them to Quicktime movies.
* Allow other people to watch your webcam
* Video conference is implemented (both sending and receiving) but still
a beta feature.
EOF
diff --git a/z-chat-im/mercury/HISTORY b/z-chat-im/mercury/HISTORY
index 8c5d4d5..d0adff5 100755
--- a/z-chat-im/mercury/HISTORY
+++ b/z-chat-im/mercury/HISTORY
@@ -1,3 +1,11 @@
+2008-01-02 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: version 1.9, removed commented mirror,
+ cleaned up long description, fixed website URL
+ * mercury.png: removed, use upstream version instead
+ * bin/Mercury_Messenger: fixed, added check for jmf
+ * desktop: removed, use upstream desktop file instead
+ * INSTALL: added INSTALL_ROOT and fixed file locations
+
2007-04-29 George Sherwood <george AT beernabeer.com>
* DETAILS: Updated to version 1.8. Removed UPDATED.

diff --git a/z-chat-im/mercury/INSTALL b/z-chat-im/mercury/INSTALL
index 32090ed..0e7d92b 100755
--- a/z-chat-im/mercury/INSTALL
+++ b/z-chat-im/mercury/INSTALL
@@ -1,22 +1,43 @@
-INSTALLDIR=/usr/share/Mercury
+INSTALLDIR=${INSTALL_ROOT}/usr/share/mercury

-mkdir -p $INSTALLDIR &&
+mkdir -p $INSTALLDIR &&

-cp -rv ./* $INSTALLDIR &&
+cd ${SOURCE_DIRECTORY} &&

-cp -rv $SPELL_DIRECTORY/bin/Mercury_Messenger $INSTALLDIR &&
-cp -rv $SPELL_DIRECTORY/mercury.png /usr/share/pixmaps &&
+if spell_installed kdebase ; then
+ cp ./usr/share/applnk/Internet/Mercury.desktop \
+ $INSTALL_ROOT/usr/share/applnk/Internet/
+fi &&

-if [ -d $JAVA_HOME/jre/lib/i386 ]; then
- i386=i386
-fi
+if [ -e ${INSTALL_ROOT}/usr/share/gnome/apps/Internet ] ; then
+ cp ./usr/share/gnome/apps/Internet/Mercury.desktop \
+ $INSTALL_ROOT/usr/share/gnome/apps/Internet/
+fi &&

-if [ ! -f $JAVA_HOME/jre/lib/$i386/libtray.so ]; then
- cp -rv $INSTALLDIR/libtray.so $JAVA_HOME/jre/lib/$i386/
-fi
+if [ -e ${INSTALL_ROOT}/usr/share/applications ] ; then
+ cp ./usr/share/gnome/apps/Internet/Mercury.desktop \
+ $INSTALL_ROOT/usr/share/applications/
+fi &&

-chmod -R 755 $INSTALLDIR &&
+cp ./usr/share/icons/crystalsvg/48x48/apps/mercurylogo.png \
+ ${INSTALL_ROOT}/usr/share/icons/

-ln -s $INSTALLDIR/Mercury_Messenger /usr/bin/Mercury_Messenger &&
+cp -r ./usr/share/mercury/* ${INSTALLDIR}/
+
+cp -r ./usr/share/pixmaps/mercurylogo.png \
+ ${INSTALL_ROOT}/usr/share/pixmaps
+
+install -m 0755 $SPELL_DIRECTORY/bin/Mercury_Messenger \
+ $INSTALL_ROOT/usr/bin/ &&
+
+#if [ -d $JAVA_HOME/jre/lib/i386 ]; then
+# i386=i386
+#fi
+
+#if [ ! -f $JAVA_HOME/jre/lib/$i386/libtray.so ]; then
+# cp -rv $INSTALLDIR/libtray.so $JAVA_HOME/jre/lib/$i386/
+#fi
+
+chmod -R 755 $INSTALLDIR &&

JAVA_HOME=$(cat /etc/profile.d/java.sh | grep -i JAVA_HOME= | cut -c11-0)
diff --git a/z-chat-im/mercury/bin/Mercury_Messenger
b/z-chat-im/mercury/bin/Mercury_Messenger
old mode 100644
new mode 100755
index 5b37c7f..29f1dd5
--- a/z-chat-im/mercury/bin/Mercury_Messenger
+++ b/z-chat-im/mercury/bin/Mercury_Messenger
@@ -1,5 +1,5 @@
#!/bin/bash
-MERCURY_INSTALL_PATH="/usr/share/Mercury"
+MERCURY_INSTALL_PATH="/usr/share/mercury"
JMF_INSTALL_PATH="/usr/share/JMF-2.1.1e"
cd $MERCURY_INSTALL_PATH
classpath=""
@@ -7,10 +7,12 @@ for file in `ls $MERCURY_INSTALL_PATH/lib`
do
classpath="$MERCURY_INSTALL_PATH/lib/$file:$classpath"
done
-for file in `ls $JMF_INSTALL_PATH/lib`
-do
-classpath="$JMF_INSTALL_PATH/lib/$file:$classpath"
-done
+if [ -e $JMF_INSTALL_PATH ] ; then
+ for file in `ls $JMF_INSTALL_PATH/lib`
+ do
+ classpath="$JMF_INSTALL_PATH/lib/$file:$classpath"
+ done
+fi
if [ ! -d $HOME/Mercury ]; then
mkdir $HOME/Mercury
fi
diff --git a/z-chat-im/mercury/desktop/Mercury.desktop
b/z-chat-im/mercury/desktop/Mercury.desktop
deleted file mode 100644
index c02f3d2..0000000
--- a/z-chat-im/mercury/desktop/Mercury.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Mercury
-GenericName=MSN Messenger
-Comment=MSN Messenger
-Exec=Mercury_Messenger
-Icon=mercury.png
-Terminal=false
-Type=Application
-Categories=Application;Network;Java
diff --git a/z-chat-im/mercury/mercury.png b/z-chat-im/mercury/mercury.png
deleted file mode 100644
index 54bcdde..0000000
Binary files a/z-chat-im/mercury/mercury.png and /dev/null differ
diff --git a/z-windowmanagers/ion3/DETAILS b/z-windowmanagers/ion3/DETAILS
index 4b6a733..b929313 100755
--- a/z-windowmanagers/ion3/DETAILS
+++ b/z-windowmanagers/ion3/DETAILS
@@ -1,5 +1,5 @@
SPELL=ion3
- VERSION=3rc-20071130
+ VERSION=3rc-20071220
SOURCE=ion-$VERSION.tar.gz
SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY="$BUILD_DIRECTORY/ion-$VERSION"
diff --git a/z-windowmanagers/ion3/HISTORY b/z-windowmanagers/ion3/HISTORY
index 7294387..8ccc629 100644
--- a/z-windowmanagers/ion3/HISTORY
+++ b/z-windowmanagers/ion3/HISTORY
@@ -1,3 +1,6 @@
+2008-01-03 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: version 20071220
+
2007-12-16 Arjan Bouter <abouter AT sourcemage.org>
* DETAILS: version bump to rc-20071130
added REJECT reason

[SM-Commit] GIT changes to master z-rejected grimoire by Arjan Bouter (87852d15a10ec830118f312e1b6f2f91afff718c), Arjan Bouter, 01/03/2008