Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=ryuotesting.git;a=commitdiff;h=95c75de256431eda1539b27dc9b165f37c291b5e
commit 95c75de256431eda1539b27dc9b165f37c291b5e
Author: Baste <ba...@frugalware.org>
Date: Wed Dec 21 15:38:26 2011 +0100
* fix conflicts
diff --git a/source/gnome-extra/alleyoop/FrugalBuild
b/source/gnome-extra/alleyoop/FrugalBuild
index f6571b6..4235aed 100644
--- a/source/gnome-extra/alleyoop/FrugalBuild
+++ b/source/gnome-extra/alleyoop/FrugalBuild
@@ -3,7 +3,7 @@
pkgname=alleyoop
pkgver=0.9.8
-pkgrel=1
+pkgrel=2
pkgdesc="A Valgrind front-end for the GNOME environment"
depends=('libglade>=2.6.4-3' 'libgnomeui' 'libsm' 'popt' 'gnome-vfs' 'gail'
'libart_lgpl' 'atk' 'pango' 'libxau' 'libxdmcp' 'libxinerama' 'libxi'
'libxrandr' 'libxcursor' 'libxdamage' 'openssl>=1.0.0' 'util-linux' 'libstdc++'
'valgrind')
makedepends=('intltool')
diff --git a/source/gnome/folks/FrugalBuild b/source/gnome/folks/FrugalBuild
index e4f0757..11f2b42 100644
--- a/source/gnome/folks/FrugalBuild
+++ b/source/gnome/folks/FrugalBuild
@@ -3,7 +3,7 @@
pkgname=folks
pkgver=0.6.6
-pkgrel=1
+pkgrel=2
pkgdesc="libfolks is a library that aggregates people from multiple sources"
depends=('evolution-data-server>=3.3.2' 'libgee' 'telepathy-glib'
'libsocialweb')
makedepends=('vala' 'gobject-introspection' 'intltool' 'krb5')
diff --git a/source/gnome/nautilus/FrugalBuild
b/source/gnome/nautilus/FrugalBuild
index 88972cc..6f2ed29 100644
--- a/source/gnome/nautilus/FrugalBuild
+++ b/source/gnome/nautilus/FrugalBuild
@@ -3,7 +3,7 @@
pkgname=nautilus
pkgver=3.3.1.1
-pkgrel=3
+pkgrel=4
pkgdesc="A file manager for GNOME"
url="http://www.gnome.org/";
depends=('libxml2>=2.7.8' 'librsvg>=2.26.2-2' 'libexif' 'eject' \
diff --git a/source/gnome/tracker/FrugalBuild b/source/gnome/tracker/FrugalBuild
index 8be93d6..f3251e8 100644
--- a/source/gnome/tracker/FrugalBuild
+++ b/source/gnome/tracker/FrugalBuild
@@ -4,7 +4,7 @@
pkgname=tracker
pkgver=0.12.9
-pkgrel=1
+pkgrel=2
pkgdesc="Tracker is a first class object database, extensible tag/metadata
database, search tool and indexer."
depends=('dbus-glib>=0.76' 'sqlite3' \
'poppler-glib>=0.18.1' 'libvorbis' 'libpng' 'libexif' 'libgsf' 'gstreamer' \
diff --git a/source/lib/libgda/FrugalBuild b/source/lib/libgda/FrugalBuild
index 1766f91..00a60f4 100644
--- a/source/lib/libgda/FrugalBuild
+++ b/source/lib/libgda/FrugalBuild
@@ -4,7 +4,7 @@
pkgname=libgda
pkgver=4.2.12
-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.5.10'
'libldap' 'gamin')
diff --git a/source/xlib/gdk-pixbuf2/FrugalBuild
b/source/xlib/gdk-pixbuf2/FrugalBuild
index f86b5aa..2bd6295 100644
--- a/source/xlib/gdk-pixbuf2/FrugalBuild
+++ b/source/xlib/gdk-pixbuf2/FrugalBuild
@@ -4,7 +4,7 @@
pkgname=gdk-pixbuf2
_F_gnome_name=gdk-pixbuf
pkgver=2.25.0
-pkgrel=1
+pkgrel=2
pkgdesc="An image loading library"
depends=('jasper' 'libjpeg' 'libpng' 'libtiff' 'libxcomposite'
'glib2>=2.28.1-2')
groups=('xlib')
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
