Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=9614e30d98db9bc2fd6d8a947595bfed23876f6e

commit 9614e30d98db9bc2fd6d8a947595bfed23876f6e
Merge: f8aaab7 db07b12
Author: bouleetbil <bouleet...@frogdev.info>
Date:   Fri Mar 25 19:10:24 2011 +0100

Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current

Conflicts:
source/apps/ebook-tools/FrugalBuild
source/devel/intltool/FrugalBuild
source/gnome/evolution-data-server/FrugalBuild
source/gnome/evolution/FrugalBuild
source/gnome/totem/FrugalBuild
source/lib-extra/openbabel/FrugalBuild
source/lib/libgda/FrugalBuild
source/xapps-extra/seamonkey/FrugalBuild
source/xapps/firefox/FrugalBuild
source/xapps/pidgin/FrugalBuild
source/xlib/cairo/FrugalBuild

diff --cc source/apps/ebook-tools/FrugalBuild
index c544742,05b16a0..3d3c03d
--- a/source/apps/ebook-tools/FrugalBuild
+++ b/source/apps/ebook-tools/FrugalBuild
@@@ -1,15 -1,15 +1,15 @@@
- # Maintainer: DeX77 <d...@dragonslave.de>
- # Compiling Time: 0.03 SBU
+ # Compiling Time: 0.02 SBU
+ # Maintainer: centuri0 <achevaux at gmail dot com>

pkgname=ebook-tools
- pkgver=0.1.1
+ pkgver=0.2.1
-pkgrel=2
+pkgrel=3
pkgdesc="Tools for accessing and converting various ebook file formats"
groups=('apps')
archs=('i686' 'x86_64' 'ppc')
-depends=('libzip' 'libxml2')
+depends=('libzip' 'libxml2>=2.7.8')
makedepends=('pkgconfig')
Finclude sourceforge cmake
- sha1sums=('5c7c177914767412f3c8b145319fa4683755ac90')
+ sha1sums=('1340eb7141b453088d39e62bba771413053a6d18')

# optimization OK
diff --cc source/gnome-extra/contacts-eds/FrugalBuild
index 7195a00,ef00c1d..ab208bb
--- a/source/gnome-extra/contacts-eds/FrugalBuild
+++ b/source/gnome-extra/contacts-eds/FrugalBuild
@@@ -7,9 -7,9 +7,9 @@@ pkgrel=
pkgdesc="Contacts is a small, lightweight addressbook that uses libebook, part 
of EDS"
url="http://pimlico-project.org";
_F_archive_name=contacts
-depends=('atk' 'pango>=1.24.2-2' 'freetype2' 'libxau>=1.0.4' 'libxdmcp' 
'evolution-data-server>=2.32.0' \
+depends=('atk' 'pango>=1.24.2-2' 'freetype2' 'libxau>=1.0.4' 'libxdmcp' 
'evolution-data-server>=2.91.0' \
'libgnome' 'popt' 'libxdamage' 'libxinerama' 'libxi' 'libxrandr' \
-       'libxcursor' 'nspr>=4.7.1' 'openssl>=1.0.0' 'e2fsprogs')
+       'libxcursor' 'nspr>=4.8.7-1' 'openssl>=1.0.0' 'e2fsprogs')
makedepends=('perl-xml-parser' 'intltool')
groups=('gnome-extra')
up2date="lynx -dump $url/sources/$_F_archive_name/  | Flasttar "
diff --cc source/gnome/evolution-data-server/FrugalBuild
index 51bfeac,51e5a1b..fb7b72d
--- a/source/gnome/evolution-data-server/FrugalBuild
+++ b/source/gnome/evolution-data-server/FrugalBuild
@@@ -2,21 -2,18 +2,21 @@@
# Maintainer: bouleetbil <bouleet...@frogdev.info>

pkgname=evolution-data-server
-pkgver=2.32.1
+pkgver=2.91.92
- pkgrel=1
+ pkgrel=2
pkgdesc="Evolution Data Server provides a central location for addressbook and 
calendar in the GNOME Desktop"
- depends=('nss>=3.12' 'libsoup-gnome>=2.32.0' 'libgweather>=2.91.0' \
-depends=('nss>=3.12.9' 'libsoup-gnome>=2.32.0' 'libgweather>=2.30.3' \
-       'libkrb5' 'db>=4.7.25' 'gnutls>=2.8' 'libical' 'gnome-keyring>=2.32.0' \
-       'libgdata')
-makedepends=('intltool' 'krb5' 'gperf')
-groups=('gnome' 'gnome-minimal')
++depends=('nss>=3.12.9' 'libsoup-gnome>=2.32.0' 'libgweather>=2.91.0' \
+       'libkrb5' 'db>=4.7.25' 'gnutls>=2.8' 'libical' 'gnome-keyring>=2.91.0' \
+       'libgdata' 'gtk+3' 'libxml2>=2.7.8')
+makedepends=('intltool' 'krb5' 'gperf' 'gobject-introspection' 'openldap')
+groups=('gnome')
archs=('i686' 'x86_64' 'ppc')
+_F_gnome_git="n"
Finclude gnome
-sha1sums=('aaf96d976dd0c5d8615adf6c7300c5098eb14046')
-
+sha1sums=('126670f0040f596aca069d743926e1440d92c788')
+if [ "$_F_gnome_git" != "n" ]; then
+       unset sha1sums
+fi
subpkgs=('evolution-data-server-ldap')
subdescs=('Evolution Data Server LDAP extensions.')
subdepends=("libldap>=2.3.24 openssl>=1.0.0-2")
diff --cc source/gnome/evolution/FrugalBuild
index 5c95fda,4c495c3..deedd5d
--- a/source/gnome/evolution/FrugalBuild
+++ b/source/gnome/evolution/FrugalBuild
@@@ -2,11 -2,12 +2,11 @@@
# Maintainer: bouleetbil <bouleet...@frogdev.info>

pkgname=evolution
-pkgver=2.32.1
-evo_major=2.32
+pkgver=2.91.92
+evo_major=3.0
- pkgrel=1
+ pkgrel=2
pkgdesc="Integrated mail, calendar and address book suite for GNOME"
-depends=('unique' \
-       'gst-plugins-base' 'gtkimageview>=1.6.4-4')
+depends=('unique' 'gst-plugins-base')
rodepends=("$pkgname-base" "$pkgname-audio")
makedepends=('intltool' 'gnome-doc-utils>=0.14.0' 'openldap' \
'psmisc' 'gnome-common' 'krb5' 'gtk-doc' 'openssl>=1.0.0')
@@@ -55,10 -55,10 +55,10 @@@ subarchs=("${subarchs[@]}" 'i686 x86_6

subpkgs=("${subpkgs[@]}" "$pkgname-base")
subdescs=("${subdescs[@]}" "base library for Evolution")
- subdepends=("${subdepends[@]}" "clutter-gtk evolution-data-server>=2.32.0 \
-subdepends=("${subdepends[@]}" "gail>=2.20.0-2 evolution-data-server>=2.32.0 \
-       gtkhtml>=3.30.3 gnome-spell>=1.0.8-2 rarian libkrb5 \
-       evolution-data-server-ldap>=2.32.0 libbonobo>=2.24.3 nss>=3.12.9 
nspr>=4.7.1 \
-       libnotify db>=4.7.25 gnome-pilot")
++subdepends=("${subdepends[@]}" "clutter-gtk evolution-data-server>=2.91.0 \
+       gtkhtml>=3.30.3 rarian libkrb5 \
+       evolution-data-server-ldap>=2.32.0 nss>=3.12 nspr>=4.7.1 \
+       libnotify db>=4.7.25 gnome-pilot networkmanager")
subrodepends=("${subrodepends[@]}" "")
subgroups=("${subgroups[@]}" 'gnome')
subarchs=("${subarchs[@]}" 'i686 x86_64 ppc')
diff --cc source/gnome/totem/FrugalBuild
index 9948c31,62f6330..768282c
--- a/source/gnome/totem/FrugalBuild
+++ b/source/gnome/totem/FrugalBuild
@@@ -3,21 -3,22 +3,21 @@@
# Contributor: AlexExtreme <a...@alex-smith.me.uk>

pkgname=totem
-pkgver=2.32.0
+pkgver=2.91.92
- pkgrel=1
+ pkgrel=2
pkgdesc="Movie player for GNOME based on Xine"
depends=('libxi' 'libxtst' 'fontconfig' 'libstdc++' 'libxxf86vm' 
'dbus-glib>=0.71' \
-         'libxrandr' 'atk>=1.20.0' 'libsm' 'libxinerama' 'libmusicbrainz' 
'nss>=3.12.9' 'avahi-glib>=0.6.19' \
-         'cairo>=1.8.6' 'libxcursor' 'gnome-desktop>=2.32.0' 'iso-codes' 
'gnome-vfs>=2.24.0' \
-         'shared-mime-info>=0.22' 'totem-pl-parser>=2.32.' 'libkrb5' 
'db>=4.7.25' \
-       'evolution-data-server>=2.32.0' 'python>=2.7' \
-       'gst-plugins-base-oil' 'gst-plugins-good-gconf' 'pygtk' \
-       'libgdata>=0.6.4' 'gst-plugins-good-libsoup' 'unique' 'gst-ffmpeg')
-makedepends=('intltool'        'gnome-doc-utils' 'vala' 'krb5' 'gnome-common')
+         'libxrandr' 'atk>=1.20.0' 'libsm' 'libxinerama' 'libmusicbrainz' 
'nss>=3.12' 'avahi-glib>=0.6.19' \
+         'cairo>=1.8.6' 'libxcursor' 'gnome-desktop>=2.90.0' 'iso-codes' \
+         'shared-mime-info>=0.22' 'totem-pl-parser>=2.32.4' 'libkrb5' 
'db>=4.7.25' \
+       'evolution-data-server>=2.90.0' 'python>=2.7' \
+       'gst-plugins-base-oil' 'gst-plugins-good-gconf' 'pygtk' 
'libpeas-gtk>=0.7.2' \
+       'libgdata>=0.6.4' 'gst-plugins-good-libsoup' 'unique' 'gst-ffmpeg' \
+       'libxml2>=2.7.8')
- makedepends=('intltool'       'gnome-doc-utils' 'vala' 'krb5' 'gnome-common')
++makedepends=('intltool' 'gnome-doc-utils' 'vala' 'krb5' 'gnome-common')
groups=('gnome')
archs=('i686' 'x86_64' 'ppc')
-_F_gnome_schemas=('/etc/gconf/schemas/totem.schemas' \
-               '/etc/gconf/schemas/totem-handlers.schemas' \
-               '/etc/gconf/schemas/totem-video-thumbnail.schemas')
+_F_gnome_glib="y"
_F_gnome_desktop="y"
_F_gnome_scrollkeeper="y"
_F_gnome_iconcache="y"
diff --cc source/lib/libgda/FrugalBuild
index 02dbc75,d4a7edf..5427443
--- a/source/lib/libgda/FrugalBuild
+++ b/source/lib/libgda/FrugalBuild
@@@ -4,11 -4,11 +4,11 @@@

pkgname=libgda
pkgver=4.2.5
--pkgrel=1
++pkgrel=2
pkgdesc="An interface to the GDA architecture"
url="http://www.gnome-db.org/";
-depends=('glib2' 'libxslt' 'readline' 'popt' 'libpq' 'libmysqlclient>=5.1.34' 
'libldap' 'gamin')
+depends=('glib2' 'libxslt' 'readline' 'popt' 'libpq' 'libmysqlclient>=5.1.34' 
'libldap' 'gamin' 'libxml2>=2.7.8')
- makedepends=('intltool' 'perl-xml-parser' 'db>=4.7.25' 'unixodbc' 'gtk-doc' 
'openldap' 'mysql>=5.1.34' 'postgresql' 'gnome-common')
+ makedepends=('intltool' 'perl-xml-parser' 'db>=4.7.25' 'unixodbc' 'gtk-doc' 
'openldap' 'mysql>=5.5.10' 'postgresql' 'gnome-common')
groups=('lib')
archs=('i686' 'x86_64' 'ppc')
_F_gnome_scrollkeeper="y"
diff --cc source/xapps-extra/seamonkey/FrugalBuild
index 89729af,a70a1cb..f3c6669
--- a/source/xapps-extra/seamonkey/FrugalBuild
+++ b/source/xapps-extra/seamonkey/FrugalBuild
@@@ -3,10 -3,10 +3,10 @@@

pkgname=seamonkey
pkgver=2.0.12
--pkgrel=2
++pkgrel=3
pkgdesc="Seamonkey all-in-one internet application suite"
url="http://www.mozilla.org/projects/seamonkey/";
- depends=('libstdc++' 'gtk+2>=2.20.0-2' 'libxau>=1.0.4' 'libxdmcp' 
'libxdamage' 'libxml2>=2.7.8' 'libidl' 'libxt' 'libice' 'nss>=3.12.3' 'libxft' 
'dbus-glib' 'alsa-lib')
+ depends=('libstdc++' 'gtk+2>=2.20.0-2' 'libxau>=1.0.4' 'libxdmcp' 
'libxdamage' 'libxml2' 'libidl' 'libxt' 'libice' 'nss>=3.12.9' 'libxft' 
'dbus-glib' 'alsa-lib')
makedepends=('zip')
options=('scriptlet')
groups=('xapps-extra')
diff --cc source/xapps/firefox/FrugalBuild
index 123160a,bf6a075..0e3b642
--- a/source/xapps/firefox/FrugalBuild
+++ b/source/xapps/firefox/FrugalBuild
@@@ -3,14 -3,14 +3,14 @@@
# Contributor: VMiklos <vmik...@frugalware.org>

pkgname=firefox
- pkgver=3.6.15
+ pkgver=4.0
pathver=${pkgver} # version used in path names
- pkgrel=2
-pkgrel=1
++pkgrel=3
pkgdesc="Mozilla Firefox web browser"
url="http://www.mozilla.org/products/firefox/";
- depends=('libxml2>=2.7.8' 'gtk+2>=2.20.0-2' 'libidl' 'desktop-file-utils' 
'nss>=3.12' 'glibc>=2.6' 'dbus-glib' 'curl>=7.19.0' 'nspr>=4.8.6' \
+ depends=('gtk+2>=2.20.0-2' 'libidl' 'desktop-file-utils' 'nss>=3.12.9' 
'glibc>=2.6' 'dbus-glib' 'curl>=7.19.0' 'nspr>=4.8.7' \
'lcms' 'libxau>=1.0.4' 'libxdmcp' 'libxft>=2.1.13-2' 'libxt' 'libstdc++' 
'libxdamage' 'libice' 'bzip2' 'alsa-lib' \
-       'libnotify' 'wireless_tools')
+       'libnotify' 'wireless_tools' 'yasm' 'cairo')
makedepends=('zip')
groups=('xapps')
archs=('i686' 'x86_64' 'ppc')
diff --cc source/xapps/pidgin/FrugalBuild
index 672a983,0d23842..e538091
--- a/source/xapps/pidgin/FrugalBuild
+++ b/source/xapps/pidgin/FrugalBuild
@@@ -4,7 -4,7 +4,7 @@@

pkgname=pidgin
pkgver=2.7.11
- pkgrel=1
-pkgrel=2
++pkgrel=3
pkgdesc="A multi-protocol instant messaging (IM) client"
depends=('gtk+2>=2.20.0-2' 'libao' 'audiofile' 'gtkspell>=2.0.11-3' 
'startup-notification>=0.9-3' \
'libxscrnsaver>=1.1.3' 'dbus-x11>=1.2.14' 'gstreamer')
diff --cc source/xlib/cairo/FrugalBuild
index 31e0b7d,02f2885..25a458c
--- a/source/xlib/cairo/FrugalBuild
+++ b/source/xlib/cairo/FrugalBuild
@@@ -3,7 -3,7 +3,7 @@@

pkgname=cairo
pkgver=1.10.2
- pkgrel=5
-pkgrel=4
++pkgrel=6
pkgdesc="A vector graphics library with cross-device output support"
url="http://cairographics.org";
depends=('libgl' 'libxrender>=0.9.4-3' 'fontconfig' 'libpng>=1.4.1' 
'libxcb>=1.3' 'libx11>=1.2.1' \
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to