Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master z-rejected grimoire by Juuso Alasuutari (729af71fe61340093a513e132ba422e8cf746948)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Juuso Alasuutari <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master z-rejected grimoire by Juuso Alasuutari (729af71fe61340093a513e132ba422e8cf746948)
  • Date: Sat, 8 Jul 2006 03:39:27 -0500

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

z-utils/skype/CONFIGURE | 3 --
z-utils/skype/DEPENDS | 11 +++-----
z-utils/skype/DETAILS | 46
++++++++++++++----------------------
z-utils/skype/HISTORY | 14 ++++++++++
z-utils/skype/INSTALL | 35 +++++++++++++++++++++++++--
z-utils/skype/PREPARE | 8 +++---
z-utils/skype/PRE_BUILD | 4 ---
z-utils/skype/desktop/skype.desktop | 8 ------
8 files changed, 74 insertions(+), 55 deletions(-)

New commits:
commit 729af71fe61340093a513e132ba422e8cf746948
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

Updated to 1.3.0.30, fixed what was there to fix.

diff --git a/z-utils/skype/CONFIGURE b/z-utils/skype/CONFIGURE
deleted file mode 100755
index 49b9e31..0000000
--- a/z-utils/skype/CONFIGURE
+++ /dev/null
@@ -1,3 +0,0 @@
-# Standard rejected warnings.
-#
-source $GRIMOIRE/REJECTED_MSG
diff --git a/z-utils/skype/DEPENDS b/z-utils/skype/DEPENDS
index 68e8f49..81b9f84 100755
--- a/z-utils/skype/DEPENDS
+++ b/z-utils/skype/DEPENDS
@@ -1,7 +1,6 @@
-depends dbus &&
-if [ "$QT" == "y" ]; then
- depends rpmunpack &&
- depends qt-x11
-else
- depends gcc33
+depends gcc33 &&
+depends dbus &&
+
+if [[ $QT == y ]]; then
+ depends qt-x11
fi
diff --git a/z-utils/skype/DETAILS b/z-utils/skype/DETAILS
index a48d021..cb106ce 100755
--- a/z-utils/skype/DETAILS
+++ b/z-utils/skype/DETAILS
@@ -1,36 +1,26 @@
SPELL=skype
- BUILD_API=2
-if [ "$QT" == "y" ]; then
-# dynamic version.
- VERSION=1.2.0.21-1
- SOURCE=${SPELL}-${VERSION}mdk.i586.rpm
- SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}-${VERSION}
-
SOURCE_HASH=sha512:7941739dcc958c90b88e553fedfea081fda3eb495b52bf6ce94011b9dbc756a04f8167857492ec7b45630549b6f0489b4a81d5ed698226d684538e6c37287bb3
-
+ VERSION=1.3.0.30
+ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+if [[ $QT == y ]]; then
+# dynamic version
+ SOURCE=$SPELL-beta-$VERSION.tar.bz2
+
SOURCE_HASH=sha512:35770344c7ba00f36bf82d8e96c0fda1c9ee1a0ebaba45b1ad91bf233b299f3d66258f8e465fbabdf13df785550f98bb84f282ca60a776a62895fd5b1d350933
else
-# static version.
- VERSION=1.2.0.18
- SOURCE=${SPELL}_staticQT-${VERSION}.tar.bz2
- SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}_staticQT-${VERSION}
-
SOURCE_HASH=sha512:a6004d29bd24b39f940f482e85da18ce2da43c15e6d177b5ff3447799350547b15356990090cf9ee41048a57d2a992e5fb43b110e1793005f0933478e37b1aa9
+# static version
+ SOURCE=$SPELL-beta_staticQT-$VERSION.tar.bz2
+
SOURCE_HASH=sha512:efc878d71aa7247aa40a266b3dab3263352bdcc31e0b7414790c534cb1c356d938b376c1fe0c6295c8bc9d27392af726c34f768198d0f13331fbbef7c4a5fc3c
fi
WEB_SITE=http://www.skype.com/
SOURCE_URL[0]=http://download.skype.com/linux/$SOURCE
- LICENSE[0]=http://www.skype.com/eula.html
+ LICENSE[0]=/usr/share/doc/skype/LICENSE
ENTERED=20040624
- UPDATED=20050204
- REJECT="has licensing issues"
- SHORT="Easy, free, working voice over IP (voip) Linux client."
+ REJECT="Non-Free license"
+ SHORT="Voice over IP (voip) client."
cat << EOF
-Skype is free and simple software that will enable you to make free calls
-anywhere in the world in minutes. Skype, created by the people who brought
you
-KaZaA, uses innovative P2P (peer-to-peer) technology to connect you with
other
-Skype users. If you are tired of paying outrageous fees for telephony, Skype
-is for you!
-
-Skype is quick and easy to install. Just download it, register, and within
-minutes you can plug in your PC headset and call your friends on Skype. Skype
-calls have excellent sound quality and are highly secure with end-to-end
-encryption. Best of all, Skype does not require you to reconfigure your
-firewall or router (it just works!)
+Skype is a little piece of software that lets you make free calls to
+anyone else on Skype, anywhere in the world. And even though the calls
+are free, they are really excellent quality. If you and your friends,
+family or business contacts are using webcams, you can also make free
+video calls. You can even call landlines and mobile phones at really
+cheap per minute rates (and there???s no setup or subscription fee).
EOF
diff --git a/z-utils/skype/HISTORY b/z-utils/skype/HISTORY
index cc76e46..3a853cd 100644
--- a/z-utils/skype/HISTORY
+++ b/z-utils/skype/HISTORY
@@ -1,3 +1,17 @@
+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,
+ removed UPDATED & BUILD_API, edited reject & long & short
+ messages.
+ * PREPARE: Moved rejected message here from CONFIGURE.
+ * CONFIGURE: Deleted.
+ * DEPENDS: Removed depends rpmunpack, made depends gcc33
+ unconditional (needed by both versions, dynamic & static).
+ * PRE_BUILD: Deleted, unnecessary without rpmunpack.
+ * INSTALL: Rewrote entire file.
+ * desktop/skype.desktop: Deleted, now installed from source
+ package during INSTALL.
+
2006-01-31 Treeve jelbert <treeve01 AT pi.be>
* DETAILS: Version 1.2.0.21-1 ( dynamic )

diff --git a/z-utils/skype/INSTALL b/z-utils/skype/INSTALL
index b9f5ff8..75e1924 100755
--- a/z-utils/skype/INSTALL
+++ b/z-utils/skype/INSTALL
@@ -1,2 +1,33 @@
-cd $SOURCE_DIRECTORY &&
-cp -ruv * $INSTALL_ROOT/
+cd $SOURCE_DIRECTORY &&
+
+# executables
+cp skype $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 &&
+
+# dbus config
+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 &&
+
+# 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 &&
+
+# desktop file
+cp skype.desktop /usr/share/applications &&
+
+# import plugins dir
+mkdir -p $INSTALL_ROOT/usr/lib/skype/import_plugins
diff --git a/z-utils/skype/PREPARE b/z-utils/skype/PREPARE
index 0e54b05..d4c7d39 100755
--- a/z-utils/skype/PREPARE
+++ b/z-utils/skype/PREPARE
@@ -1,10 +1,10 @@
+. $GRIMOIRE/REJECTED_MSG &&
+
message "\n${MESSAGE_COLOR}" \
"Skype requires the QT graphics libraries and recommends installing\n" \
"the dynamically linked verison of skype which is the default\n" \
"installation option below. If you prefer the statically linked\n" \
"version of Skype, answer 'n' to the question below." \
- "${DEFAULT_COLOR}\n\n"
-
-config_query QT "Build version dynamically linked to QT?" y
+ "${DEFAULT_COLOR}\n" &&

-message "\n"
+config_query QT "Build version dynamically linked to QT?" y
diff --git a/z-utils/skype/PRE_BUILD b/z-utils/skype/PRE_BUILD
deleted file mode 100755
index b14bd34..0000000
--- a/z-utils/skype/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-#check_hash &&
-mk_source_dir $SOURCE_DIRECTORY &&
-cd $SOURCE_DIRECTORY &&
-rpmunpack < $SOURCE_CACHE/$SOURCE | gzip -cd|cpio -i --make-directories
diff --git a/z-utils/skype/desktop/skype.desktop
b/z-utils/skype/desktop/skype.desktop
deleted file mode 100644
index 06c7e96..0000000
--- a/z-utils/skype/desktop/skype.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Skype
-Exec=skype
-Icon=
-Terminal=false
-Type=Application
-Categories=Application;Network;



  • [SM-Commit] GIT changes to master z-rejected grimoire by Juuso Alasuutari (729af71fe61340093a513e132ba422e8cf746948), Juuso Alasuutari, 07/08/2006

Archive powered by MHonArc 2.6.24.

Top of Page