Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=b718b64cf0880af13e3800e0518d06361fed7b45
commit b718b64cf0880af13e3800e0518d06361fed7b45 Merge: 89c0cc9 188983e Author: bouleetbil <[email protected]> Date: Sun Nov 20 09:00:43 2011 +0100 Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current Conflicts: source/gnome-extra/anjuta/FrugalBuild source/gnome/gnome-icon-theme/FrugalBuild source/lib/glibmm/FrugalBuild source/xapps-extra/calibre/FrugalBuild source/xlib/gtkmm/FrugalBuild diff --cc source/gnome-extra/anjuta/FrugalBuild index 1fc2454,b5a91e8..4a5d9c9 --- a/source/gnome-extra/anjuta/FrugalBuild +++ b/source/gnome-extra/anjuta/FrugalBuild @@@ -20,7 -20,7 +20,11 @@@ options=('scriptlet' Finclude gnome gnome-scriptlet groups=('gnome-extra') archs=('i686' 'x86_64') ++<<<<<<< HEAD +sha1sums=('4ad349fa336464dd774f89204ba1d43631de78a0') ++======= + sha1sums=('1d4f7a13a4a7ea63d65d03b25afcf26d10bde4cf') ++>>>>>>> 188983ecf2397ffbb4dad5c4804574335db0b268 unset MAKEFLAGS Fconfopts="${Fconfopts[@]} --enable-compile-warnings=no" diff --cc source/gnome/gnome-icon-theme/FrugalBuild index f2fcb1d,2b7f0f8..7d0cd75 --- a/source/gnome/gnome-icon-theme/FrugalBuild +++ b/source/gnome/gnome-icon-theme/FrugalBuild @@@ -5,10 -5,10 +5,10 @@@ pkgname=gnome-icon-them pkgver=3.2.1.2 pkgrel=2 pkgdesc="Default icon theme for GNOME" --url="http://www.gnome.org/"; - depends=('hicolor-icon-theme' 'gdk-pixbuf2') - makedepends=('perl-xml-parser' 'icon-naming-utils>=0.8.2' 'intltool' 'gtk+2-tools') ++url="http://www.gnome.org"; + depends=('hicolor-icon-theme' 'gdk-pixbuf2' 'gtk+2-tools') + makedepends=('perl-xml-parser' 'icon-naming-utils>=0.8.2' 'intltool') -groups=('gnome') +groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64' 'ppc' 'arm') Finclude gnome sha1sums=('0f2c7e390f5b588ca117cab255c2e86c84513139') diff --cc source/xapps-extra/calibre/FrugalBuild index 53f437d,fd59cd9..8d0a3dc --- 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.26 - pkgrel=2 + pkgver=0.8.27 + 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 [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
