[SM-Commit] GIT changes to master z-rejected grimoire by Juuso Alasuutari (9c232b21d9d1e3752c4d5498072b58821d48345c)

Juuso Alasuutari scm at mail.sourcemage.org
Fri Oct 13 16:04:03 EDT 2006


GIT changes to master z-rejected grimoire by Juuso Alasuutari <iuso at sourcemage.org>:

 z-utils/skype/DETAILS |   12 ++++++------
 z-utils/skype/HISTORY |    7 +++++++
 z-utils/skype/INSTALL |   37 +++++++++++++++++--------------------
 3 files changed, 30 insertions(+), 26 deletions(-)

New commits:
commit 9c232b21d9d1e3752c4d5498072b58821d48345c
Author: Juuso Alasuutari <iuso at sourcemage.org>
Commit: Juuso Alasuutari <iuso at sourcemage.org>

    skype: Version 1.3.0.53.

diff --git a/z-utils/skype/DETAILS b/z-utils/skype/DETAILS
index cb106ce..96edd10 100755
--- a/z-utils/skype/DETAILS
+++ b/z-utils/skype/DETAILS
@@ -1,14 +1,14 @@
              SPELL=skype
-           VERSION=1.3.0.30
-  SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+           VERSION=1.3.0.53
+  SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
 if [[ $QT == y ]]; then
 # dynamic version
-            SOURCE=$SPELL-beta-$VERSION.tar.bz2
-       SOURCE_HASH=sha512:35770344c7ba00f36bf82d8e96c0fda1c9ee1a0ebaba45b1ad91bf233b299f3d66258f8e465fbabdf13df785550f98bb84f282ca60a776a62895fd5b1d350933
+            SOURCE=$SPELL-$VERSION-generic.tar.bz2
+       SOURCE_HASH=sha512:f085d79fe06e1a5667cc9fb48d830585ce77ba229236378162705487de0eb6082974e7a55d629d5ca225cbb30dffe57924a8e6cc81a76e53e4e4aa32082ccb44
 else
 # static version
-            SOURCE=$SPELL-beta_staticQT-$VERSION.tar.bz2
-       SOURCE_HASH=sha512:efc878d71aa7247aa40a266b3dab3263352bdcc31e0b7414790c534cb1c356d938b376c1fe0c6295c8bc9d27392af726c34f768198d0f13331fbbef7c4a5fc3c
+            SOURCE=${SPELL}_staticQT-$VERSION-generic.tar.bz2
+       SOURCE_HASH=sha512:3a1168e006a588e206fe142ef4cdd153922b40848699be0c607a7bdbebf8510c428ce54b8acb7b6457fe5449437a693e5d0f3638c376ddfc46aae4ea796be913
 fi
           WEB_SITE=http://www.skype.com/
      SOURCE_URL[0]=http://download.skype.com/linux/$SOURCE
diff --git a/z-utils/skype/HISTORY b/z-utils/skype/HISTORY
index 3a853cd..d5302b5 100644
--- a/z-utils/skype/HISTORY
+++ b/z-utils/skype/HISTORY
@@ -1,3 +1,10 @@
+2006-10-13 Juuso Alasuutari <iuso at sourcemage.org>
+	* DETAILS: Updated to 1.3.0.53.
+	* INSTALL: Added install of skype-action-handler, removed 
+	  install of extra icons, added slashes to dir names and quoted 
+	  them for robustness, added missing $INSTALL_ROOT to desktop 
+	  file target.
+
 2006-07-08 Juuso Alasuutari <iuso at sourcemage.org>
 	* DETAILS: Updated to 1.3.0.30, switched from .rpm to .tar.bz2 
 	  sources, changed LICENSE to point to installed license doc, 
diff --git a/z-utils/skype/INSTALL b/z-utils/skype/INSTALL
index 75e1924..dd86ac5 100755
--- a/z-utils/skype/INSTALL
+++ b/z-utils/skype/INSTALL
@@ -1,33 +1,30 @@
-cd $SOURCE_DIRECTORY  &&
+cd  "$SOURCE_DIRECTORY"  &&
 
 # executables
-cp  skype                 $INSTALL_ROOT/usr/bin  &&
-cp  skype-callto-handler  $INSTALL_ROOT/usr/bin  &&
+cp  skype                 "$INSTALL_ROOT/usr/bin/"  &&
+cp  skype-action-handler  "$INSTALL_ROOT/usr/bin/"  &&
+cp  skype-callto-handler  "$INSTALL_ROOT/usr/bin/"  &&
 
 # resources
-mkdir -p      $INSTALL_ROOT/usr/share/skype  &&
-cp -r  lang   $INSTALL_ROOT/usr/share/skype  &&
-cp -r  sound  $INSTALL_ROOT/usr/share/skype  &&
+mkdir -p      "$INSTALL_ROOT/usr/share/skype/"  &&
+cp -r  lang   "$INSTALL_ROOT/usr/share/skype/"  &&
+cp -r  sound  "$INSTALL_ROOT/usr/share/skype/"  &&
 
 # dbus config
-mkdir -p        $INSTALL_ROOT/etc/dbus-1/system.d  &&
-cp  skype.conf  $INSTALL_ROOT/etc/dbus-1/system.d  &&
+mkdir -p        "$INSTALL_ROOT/etc/dbus-1/system.d/"  &&
+cp  skype.conf  "$INSTALL_ROOT/etc/dbus-1/system.d/"  &&
 
 # docs
-mkdir -p     $INSTALL_ROOT/usr/share/doc/skype  &&
-cp  README   $INSTALL_ROOT/usr/share/doc/skype  &&
-cp  LICENSE  $INSTALL_ROOT/usr/share/doc/skype  &&
+mkdir -p     "$INSTALL_ROOT/usr/share/doc/skype/"  &&
+cp  README   "$INSTALL_ROOT/usr/share/doc/skype/"  &&
+cp  LICENSE  "$INSTALL_ROOT/usr/share/doc/skype/"  &&
 
-# icons (create symlinks for backwards compatibility)
-cp  icons/*  $INSTALL_ROOT/usr/share/icons              &&
-cp  icons/*  $INSTALL_ROOT/usr/share/pixmaps            &&
-ln -s  $INSTALL_ROOT/usr/share/icons/skype_48_32.png    \
-       $INSTALL_ROOT/usr/share/icons/skype.png          &&
-ln -s  $INSTALL_ROOT/usr/share/pixmaps/skype_48_32.png  \
-       $INSTALL_ROOT/usr/share/pixmaps/skype.png        &&
+# icons
+cp  icons/skype_48_32.png  "$INSTALL_ROOT/usr/share/icons/skype.png"    &&
+cp  icons/skype_48_32.png  "$INSTALL_ROOT/usr/share/pixmaps/skype.png"  &&
 
 # desktop file
-cp  skype.desktop  /usr/share/applications  &&
+cp  skype.desktop  "$INSTALL_ROOT/usr/share/applications/"  &&
 
 # import plugins dir
-mkdir -p  $INSTALL_ROOT/usr/lib/skype/import_plugins
+mkdir -p  "$INSTALL_ROOT/usr/lib/skype/import_plugins/"



More information about the SM-Commit mailing list