Merge branch 'master' into gnomedevel-gnome-3.4.0

9 files changed, 46 insertions, 1 deletions

diff --git a/telephony/farstream/DEPENDS b/telephony/farstream/DEPENDS
new file mode 100755
index 0000000000..3914e0b967
--- /dev/null
+++ b/telephony/farstream/DEPENDS
@@ -0,0 +1 @@
+depends gstreamer
diff --git a/telephony/farstream/DETAILS b/telephony/farstream/DETAILS
new file mode 100755
index 0000000000..9650d177b2
--- /dev/null
+++ b/telephony/farstream/DETAILS
@@ -0,0 +1,18 @@
+           SPELL=farstream
+         VERSION=0.1.2
+          SOURCE=$SPELL-$VERSION.tar.gz
+         SOURCE2=$SOURCE.asc
+        WEB_SITE=http://www.freedesktop.org/wiki/Software/Farstream
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+   SOURCE_URL[0]=http://freedesktop.org/software/farstream/releases/farstream/$SOURCE
+  SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
+      SOURCE_GPG=telepathy.gpg:$SOURCE.asc:UPSTREAM_KEY
+  SOURCE2_IGNORE=signature
+      LICENSE[0]=LGPL
+         ENTERED=20120405
+           SHORT="collection of modules and libraries for videoconferencing"
+cat << EOF
+Farstream is a collection of GStreamer modules and libraries for
+videoconferencing. The API is described in the documentation in the
+docs/ directory.
+EOF
diff --git a/telephony/farstream/HISTORY b/telephony/farstream/HISTORY
new file mode 100644
index 0000000000..4ceeaeb9da
--- /dev/null
+++ b/telephony/farstream/HISTORY
@@ -0,0 +1,2 @@
+2012-04-05 Ladislav Hagara <hgr@vabo.cz>
+	* DETAILS, DEPENDS: spell created, version 0.1.2
diff --git a/telephony/linphone.gpg b/telephony/linphone.gpg
index 1dc492427f..c19fd2ea09 100644
--- a/telephony/linphone.gpg
+++ b/telephony/linphone.gpg
diff --git a/telephony/ortp/DETAILS b/telephony/ortp/DETAILS
index 84cab857d6..cf2185dd27 100755
--- a/telephony/ortp/DETAILS
+++ b/telephony/ortp/DETAILS
@@ -1,5 +1,5 @@
            SPELL=ortp
-         VERSION=0.16.5
+         VERSION=0.20.0
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
          SOURCE2=$SOURCE.sig
diff --git a/telephony/ortp/HISTORY b/telephony/ortp/HISTORY
index 728513aeb0..936fe0227f 100644
--- a/telephony/ortp/HISTORY
+++ b/telephony/ortp/HISTORY
@@ -1,3 +1,6 @@
+2012-03-27 Treeve Jelbert <treeve@sourcemage.org>
+	* DETAILS: version 0.20.0
+
 2011-08-18 Julien "_kaze_" ROZO <julien@rozo.org>
 	* DETAILS: updated version to 0.16.5
 	* DEPENDS: added libsrtp as an optional dependency
diff --git a/telephony/telepathy-farstream/DEPENDS b/telephony/telepathy-farstream/DEPENDS
new file mode 100755
index 0000000000..f44f854d18
--- /dev/null
+++ b/telephony/telepathy-farstream/DEPENDS
@@ -0,0 +1 @@
+depends farstream
diff --git a/telephony/telepathy-farstream/DETAILS b/telephony/telepathy-farstream/DETAILS
new file mode 100755
index 0000000000..a374733fde
--- /dev/null
+++ b/telephony/telepathy-farstream/DETAILS
@@ -0,0 +1,17 @@
+           SPELL=telepathy-farstream
+         VERSION=0.4.0
+          SOURCE=$SPELL-$VERSION.tar.gz
+         SOURCE2=$SOURCE.asc
+        WEB_SITE=http://telepathy.freedesktop.org
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+   SOURCE_URL[0]=$WEB_SITE/releases/$SPELL/$SOURCE
+  SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
+      SOURCE_GPG=telepathy.gpg:$SOURCE.asc:UPSTREAM_KEY
+  SOURCE2_IGNORE=signature
+      LICENSE[0]=GPL
+         ENTERED=20120405
+           SHORT="telepathy client library that uses farstream"
+cat << EOF
+Telepathy Farstream is a Telepathy client library that uses Farstream
+to handle Call channels.
+EOF
diff --git a/telephony/telepathy-farstream/HISTORY b/telephony/telepathy-farstream/HISTORY
new file mode 100644
index 0000000000..d4242ed76f
--- /dev/null
+++ b/telephony/telepathy-farstream/HISTORY
@@ -0,0 +1,3 @@
+2012-04-05 Ladislav Hagara <hgr@vabo.cz>
+	* DEPENDS, DEPENDS: spell created, version 0.4.0
+