Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=7a00d790495863691a3c0d08901152a9a60ea500
commit 7a00d790495863691a3c0d08901152a9a60ea500
Merge: 01a0407 7581deb
Author: bouleetbil <bouleet...@frogdev.info>
Date: Sun Nov 6 11:26:20 2011 +0100
Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current
Conflicts:
source/gnome-extra/ekiga/FrugalBuild
source/gnome/vinagre/FrugalBuild
source/gnome/vino/FrugalBuild
source/xapps-extra/calibre/FrugalBuild
source/xlib/gtk+3/FrugalBuild
diff --cc source/gnome-extra/ekiga/FrugalBuild
index 0c241ac,083379c..bd558ad
--- a/source/gnome-extra/ekiga/FrugalBuild
+++ b/source/gnome-extra/ekiga/FrugalBuild
@@@ -10,8 -10,8 +10,8 @@@ groups=('gnome-extra'
archs=('i686' 'x86_64')
depends=('libxml2>=2.7.8' 'opal>=3.10.2' 'dbus-glib>=0.71-2'
'gnome-desktop>=3.0.0' \
'evolution-data-server>=3.1.0' 'avahi-glib>=0.6.19' \
- 'libxv' 'sqlite3' 'e2fsprogs' 'nspr' 'gnutls' 'libgcrypt' \
+ 'libxv' 'sqlite3' 'e2fsprogs' 'nspr' 'gnutls>=2.12.12' 'libgcrypt' \
- 'libldap' 'libsm' 'libbonoboui' 'popt' 'gnome-vfs' 'esd' \
+ 'libldap' 'libsm' 'libbonoboui' 'popt' \
'libbonobo' 'gail' 'libart_lgpl' 'sdl' 'unixodbc' \
'libsigc++2' 'libnotify' 'atk' 'pango' 'libxdmcp' \
'freetype2' 'libgcc' 'libxdamage' 'libxinerama' 'libxi' \
diff --cc source/gnome/vinagre/FrugalBuild
index 8f47be0,ba357df..ab76c27
--- a/source/gnome/vinagre/FrugalBuild
+++ b/source/gnome/vinagre/FrugalBuild
@@@ -2,10 -2,10 +2,10 @@@
# Maintainer: bouleetbil <bouleet...@frogdev.info>
pkgname=vinagre
-pkgver=3.2.1
-pkgrel=3
+pkgver=3.3.1
+pkgrel=1
pkgdesc="VNC Client for the GNOME Desktop"
- depends=('gtk3-vnc' 'gnutls' 'libgcrypt' 'libavahi-ui' 'atk' \
+ depends=('gtk3-vnc' 'gnutls>=2.12.12' 'libgcrypt' 'libavahi-ui' 'atk' \
'pango' 'libxau' 'libxdmcp' 'freetype2' 'libxdamage' \
'libxinerama' 'libxi' 'libxrandr' 'libxcursor' \
'libsm' 'popt' 'rdesktop' 'avahi-glib' \
diff --cc source/gnome/vino/FrugalBuild
index ca79026,fab4afd..9267098
--- a/source/gnome/vino/FrugalBuild
+++ b/source/gnome/vino/FrugalBuild
@@@ -2,10 -2,10 +2,10 @@@
# Maintainer: bouleetbil <bouleet...@frogdev.info>
pkgname=vino
-pkgver=3.2.1
-pkgrel=2
+pkgver=3.3.1
+pkgrel=1
pkgdesc="An integrated VNC server for GNOME"
- depends=('gnutls>=2.8' 'avahi-glib' 'libxtst' 'libxdamage' 'libnotify' \
+ depends=('gnutls>=2.12.12' 'avahi-glib' 'libxtst' 'libxdamage' 'libnotify' \
'gnome-keyring>=3.2.0'
'libsoup>=2.28.1' 'unique' 'telepathy-glib' 'networkmanager')
makedepends=('intltool' 'perl-xml-parser')
diff --cc source/xapps-extra/calibre/FrugalBuild
index d73aee0,aab75a5..5aa0370
--- a/source/xapps-extra/calibre/FrugalBuild
+++ b/source/xapps-extra/calibre/FrugalBuild
@@@ -2,11 -2,11 +2,11 @@@
# Maintainer: Melko <me...@frugalware.org>
pkgname=calibre
- pkgver=0.8.24
- pkgrel=2
+ pkgver=0.8.25
+ pkgrel=1
pkgdesc="Ebook management application"
url="http://calibre.kovidgoyal.net/";
-depends=('python>=2.7' 'imagemagick>=6.6.8_5-3' 'xz>=5.0.3' 'libtool'
'libuuid' 'libqtgui' 'poppler-glib>=0.18.0' \
+depends=('python>=2.7' 'imagemagick>=6.6.8_5-3' 'xz>=5.0.3' 'libtool'
'libuuid' 'libqtgui' 'poppler-glib>=0.18.1' \
'chmlib' 'icu4c' 'pyqt4' 'python-dateutil' 'python-mechanize' 'lxml' \
'podofo' 'imaging' 'python-sqlite3' 'beautifulsoup' 'cssutils')
makedepends=('pycountry')
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
