Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=a95afaf6dc73cfe5d6b13978b7c0bea3c6671b61

commit a95afaf6dc73cfe5d6b13978b7c0bea3c6671b61
Merge: cc7b377 dc3b9e8
Author: Baste <ba...@frugalware.org>
Date:   Thu Feb 23 22:52:04 2012 +0100

Merge ../current

Conflicts:
source/gnome-extra/libepc/FrugalBuild
source/gnome/gnome-frugalware/FrugalBuild
source/gnome/gnome-shell-frugalware-theme/FrugalBuild

diff --cc source/gnome-extra/anjuta/FrugalBuild
index 858efbb,564582d..5df457e
--- a/source/gnome-extra/anjuta/FrugalBuild
+++ b/source/gnome-extra/anjuta/FrugalBuild
@@@ -3,10 -3,10 +3,10 @@@
# Contributor: AlexExtreme <a...@alex-smith.me.uk>

pkgname=anjuta
- pkgver=3.3.4
-pkgver=3.2.2
-pkgrel=3
++pkgver=3.3.90
+pkgrel=1
pkgdesc="Anjuta is a versatile IDE for C and C++, written for GTK/GNOME."
-depends=('gdl>=3.2.0' 'guile>=1.8.2' 'autogen' 'graphviz>=2.14-2' \
+depends=('gdl>=3.3.1' 'guile' 'autogen' 'graphviz>=2.14-2' \
'vte3' 'subversion' 'gtksourceview3' 'gnome-keyring>=2.32.0' 'icu4c>=4.8' \
'popt' 'avahi-glib' 'libxdmcp' 'libxdamage' 'libxinerama' 'libxi' 'libxrandr' 
'libxcursor' 'libxslt' \
'ncurses' 'libxft' 'subversion' 'graphviz' 'binutils' 'glade-gtk3' 'nspr' \
@@@ -21,7 -20,7 +21,7 @@@ options=('scriptlet'
Finclude gnome gnome-scriptlet
groups=('gnome-extra')
archs=('i686' 'x86_64')
- sha1sums=('a57a23865e246d084de7f1a1a28fc84ce60980f0')
-sha1sums=('1d4f7a13a4a7ea63d65d03b25afcf26d10bde4cf')
++sha1sums=('c6348b32d3196faee8b3eac21ae8d2f46e16b178')
unset MAKEFLAGS
Fconfopts="${Fconfopts[@]} --enable-compile-warnings=no"

diff --cc source/gnome/gedit/FrugalBuild
index 986fedc,8bac30a..0263966
--- a/source/gnome/gedit/FrugalBuild
+++ b/source/gnome/gedit/FrugalBuild
@@@ -2,8 -2,8 +2,8 @@@
# Maintainer: bouleetbil <bouleet...@frogdev.info>

pkgname=gedit
- pkgver=3.3.3
- pkgrel=2
-pkgver=3.2.6
++pkgver=3.3.4
+ pkgrel=1
pkgdesc="A text editor for GNOME"
url="http://www.gnome.org/";
depends=('libxml2>=2.7.8' 'gtk+3>=3.0.8' 'rarian' 'desktop-file-utils' 
'gtksourceview3' 'dbus-glib>=0.74' \
@@@ -14,10 -14,9 +14,10 @@@ archs=('i686' 'x86_64'
_F_gnome_glib="y"
_F_gnome_scrollkeeper="y"
_F_gnome_desktop="y"
+_F_gnome_doc="y"
_F_gnome_ext=".tar.xz"
Finclude gnome gnome-scriptlet
- sha1sums=('9201e692905e16915986de6c8b412d499cfd0c73')
-sha1sums=('15bca4c0754be9e5c251347ce2bfb1edf2b9dd5f')
++sha1sums=('edd979a784ade763011224b7795078c3512ff17f')
replaces=("$pkgname-python")

build() {
diff --cc source/gnome/gnome-frugalware/FrugalBuild
index 4562da3,3b24d21..ad540cf
--- a/source/gnome/gnome-frugalware/FrugalBuild
+++ b/source/gnome/gnome-frugalware/FrugalBuild
@@@ -10,11 -10,11 +10,11 @@@ url="http://frugalware.org
rodepends=('gnome-themes' "gtk+3-theme-frugalware=$pkgver" \
'frugalware-cursor-theme')
depends=()
-groups=('gnome')
-archs=('i686' 'x86_64' 'ppc')
+groups=('gnome' 'gnome-minimal')
+archs=('i686' 'x86_64')
up2date="lynx -dump http://ftp.frugalware.org/pub/other/artwork/gnome-theme | 
Flasttar"
source=(http://ftp.frugalware.org/pub/other/artwork/gnome-theme/$pkgname-$pkgver.tar.bz2)
- sha1sums=('24867832b0597a2a96945d5ce9d534820978fdda')
+ sha1sums=('c75f1eccd9b91dda1da6490b31a80ed8cda28f10')

subpkgs=('gtk+2-theme-frugalware')
subdescs=('Frugalware GTK+2 theme')
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to