Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=1c35dad410fa0cc2428d670dd85cd8cf0bae9eb3
commit 1c35dad410fa0cc2428d670dd85cd8cf0bae9eb3 Merge: 8b2d82a 9688fdc Author: bouleetbil <[email protected]> Date: Mon Nov 14 09:21:17 2011 +0100 Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current Conflicts: source/base/glib2/FrugalBuild source/gnome-extra/anjuta/FrugalBuild source/gnome/gnome-desktop/FrugalBuild source/lib/libgee/FrugalBuild source/xapps-extra/calibre/FrugalBuild source/xlib/gtk+3/FrugalBuild diff --cc source/gnome-extra/anjuta/FrugalBuild index c323710,2944ff2..1fc2454 --- a/source/gnome-extra/anjuta/FrugalBuild +++ b/source/gnome-extra/anjuta/FrugalBuild @@@ -3,13 -3,13 +3,13 @@@ # Contributor: AlexExtreme <[email protected]> pkgname=anjuta -pkgver=3.2.1 -pkgrel=3 +pkgver=3.3.1 +pkgrel=2 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>=1.8.2' 'autogen' 'graphviz>=2.14-2' \ 'vte3' 'subversion' 'gtksourceview3' 'gnome-keyring>=2.32.0' \ 'popt' 'avahi-glib' 'libxdmcp' 'libxdamage' 'libxinerama' 'libxi' 'libxrandr' 'libxcursor' 'libxslt' \ - 'ncurses' 'libxft' 'subversion' 'graphviz' 'binutils' 'glade3' 'nspr' \ + 'ncurses' 'libxft' 'subversion' 'graphviz' 'binutils' 'glade-gtk3' 'nspr' \ 'startup-notification' 'libxres' 'libgcc' 'libgda' 'devhelp>=3.2.0') makedepends=('perl-xml-parser' 'intltool' 'gnome-doc-utils' 'perl-gettext' 'krb5' 'vala' 'gobject-introspection') _F_gnome_desktop="y" diff --cc source/gnome/gnome-desktop/FrugalBuild index ed56175,3bf104f..6eb84e9 --- a/source/gnome/gnome-desktop/FrugalBuild +++ b/source/gnome/gnome-desktop/FrugalBuild @@@ -14,9 -14,14 +14,14 @@@ archs=('i686' 'x86_64' 'ppc' _F_gnome_scrollkeeper="y" Finclude gnome gnome-scriptlet Fconfopts="$Fconfopts --with-gnome-distributor=Frugalware --enable-gtk-doc" -sha1sums=('17f0d22a8781fed451619a73732c0231dcdf953f') +sha1sums=('376c2cc2811fb1813d7383ca112483f166085ff3') replaces=('desktop-data-model' 'gnome-volume-manager' 'gnome-spell' 'gnome-art' 'xournal' 'keytouch' \ - 'system-tools-backends' 'liboobs') + 'system-tools-backends' 'liboobs'\ + 'gnome-theme-airlines' 'gnome-theme-aquadreams' \ + 'gnome-theme-bamboo-zen' 'gnome-theme-exotic' \ + 'gnome-theme-orange' 'gnome-theme-split' \ + 'gnome-theme-step-into-freedom' 'gnome-theme-tropical' \ + 'gnome-theme-ubuntu-sunrise' 'gnome-theme-wild-shine') provides=('gnome-volume-manager' 'gnome-spell') # optimization OK diff --cc source/lib/libgee/FrugalBuild index 547717c,99b8dc4..892f884 --- a/source/lib/libgee/FrugalBuild +++ b/source/lib/libgee/FrugalBuild @@@ -2,16 -2,15 +2,16 @@@ # Maintainer: bouleetbil <[email protected]> pkgname=libgee - pkgver=0.6.2.1 + pkgver=0.6.3 -pkgrel=1 +pkgrel=2 pkgdesc="Library providing GObject-based interfaces and classes for commonly used data structures." depends=('glib2') makedepends=('vala' 'gobject-introspection') groups=('lib') archs=('i686' 'x86_64' 'ppc' 'arm') Finclude gnome +up2date=$pkgver url="http://live.gnome.org/Libgee"; - sha1sums=('6278dd2937555e17de8f534fe156fced0ce16643') + sha1sums=('ac60d6856fd8ed560904fe80860a90cf92296b94') # optimization OK diff --cc source/xapps-extra/calibre/FrugalBuild index 120a8c6,212e7bd..53f437d --- a/source/xapps-extra/calibre/FrugalBuild +++ b/source/xapps-extra/calibre/FrugalBuild @@@ -2,11 -2,11 +2,11 @@@ # Maintainer: Melko <[email protected]> pkgname=calibre - pkgver=0.8.25 + pkgver=0.8.26 -pkgrel=1 +pkgrel=2 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 [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
