Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=ayatana.git;a=commitdiff;h=02027636d93fe3d7e1f2d477757ce62df884aba4
commit 02027636d93fe3d7e1f2d477757ce62df884aba4
Merge: 361441c 2b17e92
Author: Devil505 <devil505li...@gmail.com>
Date: Sat Jan 1 16:25:07 2011 +0100
Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current
Conflicts:
source/gnome-extra/empathy/FrugalBuild
source/gnome-extra/indicator-application/FrugalBuild
diff --cc source/gnome-extra/empathy/FrugalBuild
index e244541,c5c8d35..f13d540
--- a/source/gnome-extra/empathy/FrugalBuild
+++ b/source/gnome-extra/empathy/FrugalBuild
@@@ -12,7 -12,8 +12,8 @@@ depends=('gconf>=2.32.0' 'telepathy-gli
'libsm' 'gail' 'libart_lgpl' 'libffi' 'telepathy-stream-engine' \
'aspell' 'iso-codes' 'telepathy-mission-control' 'telepathy-gabble'\
'evolution-data-server>=2.30.2' 'libcanberra-gtk' 'telepathy-farsight' \
- 'webkit' 'geoclue' 'unique' 'libkrb5' 'folks>=0.2.1' 'telepathy-logger'
'libchamplain' 'libindicate' 'libindicate-gtk+2')
- 'webkit' 'geoclue' 'unique' 'libkrb5' 'folks>=0.2.1' 'telepathy-logger'
'libchamplain' \
++ 'webkit' 'geoclue' 'unique' 'libkrb5' 'folks>=0.2.1' 'telepathy-logger'
'libchamplain' 'libindicate-gtk' \
+ 'ca-certificates')
makedepends=('gnome-common' 'intltool' 'gtk-doc' 'gnome-doc-utils' 'krb5')
groups=('gnome-extra')
archs=('i686' 'x86_64' 'ppc')
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
