Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=9b0f4155a8ada2e7a017af90ce03fa487bc4106e
commit 9b0f4155a8ada2e7a017af90ce03fa487bc4106e
Merge: c2f559b d7d0d8e
Author: bouleetbil <bouleet...@frogdev.info>
Date: Tue Aug 30 11:22:28 2011 +0200
Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current
Conflicts:
source/gnome/empathy/FrugalBuild
diff --cc source/gnome/empathy/FrugalBuild
index 5e28f21,91711f1..30ba3fd
--- a/source/gnome/empathy/FrugalBuild
+++ b/source/gnome/empathy/FrugalBuild
@@@ -14,13 -14,13 +14,13 @@@ depends=('telepathy-glib' 'libxml2' 'en
'atk' 'pango' 'freetype2' 'libxau' 'libxdmcp' 'e2fsprogs' \
'popt' 'nspr' 'openssl>=1.0.0' 'libxdamage' 'libxinerama' \
'libxi' 'libxrandr' 'libxcursor' 'libjpeg>=8a' \
- 'libsm' 'libffi' 'telepathy-stream-engine' \
+ 'libsm' 'libffi' \
'aspell' 'iso-codes' 'telepathy-mission-control' 'telepathy-gabble' \
- 'evolution-data-server>=3.0.2' 'libcanberra-gtk' 'telepathy-farsight' \
- 'webkit-gtk3' 'unique' 'libkrb5' 'folks>=0.4.3' 'telepathy-logger' \
+ 'evolution-data-server>=3.1.4' 'libcanberra-gtk' 'telepathy-farsight' \
+ 'webkit-gtk3' 'unique' 'libkrb5' 'folks>=0.6.0' 'telepathy-logger' \
'ca-certificates' 'gsettings-desktop-schemas' 'libnotify>=0.7'
'telepathy-butterfly' \
- 'telepathy-logger>=0.2.8' 'networkmanager' 'glib-networking')
-makedepends=('gnome-common' 'intltool' 'gtk-doc' 'gnome-doc-utils' 'krb5')
+ 'telepathy-logger>=0.2.8' 'networkmanager' 'glib-networking'
'pulseaudio' 'cheese')
+makedepends=('gnome-common' 'intltool' 'gtk-doc' 'gnome-doc-utils' 'krb5'
'libxtst')
groups=('gnome')
archs=('i686' 'x86_64' 'ppc')
options=('scriptlet')
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
