Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=ryuotesting.git;a=commitdiff;h=fd7c36dbcc7a01adc5b570e2e9cd1aed68c62877
commit fd7c36dbcc7a01adc5b570e2e9cd1aed68c62877 Author: Baste <ba...@frugalware.org> Date: Tue Dec 20 12:08:51 2011 +0100 * fix conflit diff --git a/source/gnome-extra/libgtkhtml/FrugalBuild b/source/gnome-extra/libgtkhtml/FrugalBuild index 35043aa..574a42c 100644 --- a/source/gnome-extra/libgtkhtml/FrugalBuild +++ b/source/gnome-extra/libgtkhtml/FrugalBuild @@ -3,7 +3,7 @@ pkgname=libgtkhtml pkgver=2.11.1 -pkgrel=12 +pkgrel=13 pkgdesc="A GTK+2 based HTML rendering library" url="http://www.gnome.org/"; depends=('gail' 'libxml2>=2.7.8' 'gtk+2>=2.20.0-2') diff --git a/source/gnome-extra/orbit2/FrugalBuild b/source/gnome-extra/orbit2/FrugalBuild index 75341f4..2c53fbb 100644 --- a/source/gnome-extra/orbit2/FrugalBuild +++ b/source/gnome-extra/orbit2/FrugalBuild @@ -4,7 +4,7 @@ pkgname=orbit2 _F_gnome_name=ORBit2 pkgver=2.14.19 -pkgrel=7 +pkgrel=8 pkgdesc="A high-performance CORBA Object Request Broker" url="http://www.gnome.org/"; depends=('libidl>=0.8.13-1' 'glib2>=2.26.0' 'popt' 'openssl>=1.0.0') diff --git a/source/gnome-extra/rygel/FrugalBuild b/source/gnome-extra/rygel/FrugalBuild index d27fdb3..5e2991e 100644 --- a/source/gnome-extra/rygel/FrugalBuild +++ b/source/gnome-extra/rygel/FrugalBuild @@ -3,7 +3,7 @@ pkgname=rygel pkgver=0.13.0 -pkgrel=1 +pkgrel=2 pkgdesc="Implementation of the UPnP MediaServer" depends=('libgee>=0.6.0' 'gupnp-vala>=0.10.2' 'gconf>=3.2.0' 'gstreamer' 'gupnp-dlna' 'gtk+3') makedepends=('intltool') diff --git a/source/gnome/at-spi2-atk/FrugalBuild b/source/gnome/at-spi2-atk/FrugalBuild index f2ce1b8..ef8c4f6 100644 --- a/source/gnome/at-spi2-atk/FrugalBuild +++ b/source/gnome/at-spi2-atk/FrugalBuild @@ -3,7 +3,7 @@ pkgname=at-spi2-atk pkgver=2.3.2 -pkgrel=1 +pkgrel=2 pkgdesc="Gnome Accessibility Toolkit" depends=('atk' 'dbus-glib' 'at-spi2-core>=2.3.2') makedepends=('perl-xml-parser' 'intltool') diff --git a/source/gnome/at-spi2-core/FrugalBuild b/source/gnome/at-spi2-core/FrugalBuild index d9856f8..6cda3d3 100644 --- a/source/gnome/at-spi2-core/FrugalBuild +++ b/source/gnome/at-spi2-core/FrugalBuild @@ -3,7 +3,7 @@ pkgname=at-spi2-core pkgver=2.3.2 -pkgrel=1 +pkgrel=2 pkgdesc="Gnome Accessibility Toolkit" depends=('atk' 'dbus-glib' 'gtk+3') makedepends=('perl-xml-parser' 'intltool' 'libxtst' 'gobject-introspection') diff --git a/source/gnome/caribou/FrugalBuild b/source/gnome/caribou/FrugalBuild index 0aae83a..de16346 100644 --- a/source/gnome/caribou/FrugalBuild +++ b/source/gnome/caribou/FrugalBuild @@ -3,7 +3,7 @@ pkgname=caribou pkgver=0.4.1 -pkgrel=4 +pkgrel=5 pkgdesc="A simplified in-place on-screen keyboard" depends=('gtk+3' 'clutter>=1.0.2-3' 'pygobject3-cairo' \ 'libgee' 'libxklavier' 'libxtst') diff --git a/source/gnome/dconf/FrugalBuild b/source/gnome/dconf/FrugalBuild index 78417a0..77eaaf1 100644 --- a/source/gnome/dconf/FrugalBuild +++ b/source/gnome/dconf/FrugalBuild @@ -3,7 +3,7 @@ pkgname=dconf pkgver=0.11.2 -pkgrel=1 +pkgrel=2 pkgdesc="A configuration system" depends=('dbus-glib' 'libxml2>=2.7.8') makedepends=('vala' 'gobject-introspection' 'libgee') diff --git a/source/gnome/evince/FrugalBuild b/source/gnome/evince/FrugalBuild index 1be8215..c5c5393 100644 --- a/source/gnome/evince/FrugalBuild +++ b/source/gnome/evince/FrugalBuild @@ -3,7 +3,7 @@ pkgname=evince pkgver=3.3.2 -pkgrel=1 +pkgrel=2 pkgdesc="A document viewer for GNOME" depends=('gtk+3' 'poppler-glib>=0.18.1' 'rarian' 'desktop-file-utils' 'libxml2>=2.7.8' \ 't1lib' 'dbus-glib>=0.76' 'djvulibre' 'libspectre>=0.2.6-5' 'lcms' \ diff --git a/source/gnome/gconf/FrugalBuild b/source/gnome/gconf/FrugalBuild index e4568b6..ea394cb 100644 --- a/source/gnome/gconf/FrugalBuild +++ b/source/gnome/gconf/FrugalBuild @@ -5,7 +5,7 @@ pkgname=gconf _F_gnome_name=GConf pkgver=3.2.3 -pkgrel=3 +pkgrel=4 pkgdesc="A configuration database system for GNOME" url="http://www.gnome.org/"; depends=('libxml2>=2.7.8' 'dbus-glib' 'polkit>=0.101') @@ -29,13 +29,8 @@ subpkgs=("${subpkgs[@]}" 'gconf-gtk') subdescs=("${subdescs[@]}" 'graphical gconf utilities') subrodepends=("${subrodepends[@]}" "$pkgname=$pkgver") subdepends=("${subdepends[@]}" "gtk+3") -<<<<<<< HEAD subgroups=("${subgroups[@]}" 'gnome gnome-minimal') -subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') -======= -subgroups=("${subgroups[@]}" 'gnome') subarchs=("${subarchs[@]}" 'i686 x86_64') ->>>>>>> b126f09d4f1857b7822fc184c4eb1fad39fd3100 build() { Fcd GConf-$pkgver diff --git a/source/gnome/gedit/FrugalBuild b/source/gnome/gedit/FrugalBuild index e25d9cb..345c8d1 100644 --- a/source/gnome/gedit/FrugalBuild +++ b/source/gnome/gedit/FrugalBuild @@ -3,6 +3,7 @@ pkgname=gedit pkgver=3.2.5 +pkgrel=2 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' \ diff --git a/source/gnome/gjs/FrugalBuild b/source/gnome/gjs/FrugalBuild index 4648876..6cd64a4 100644 --- a/source/gnome/gjs/FrugalBuild +++ b/source/gnome/gjs/FrugalBuild @@ -3,7 +3,7 @@ pkgname=gjs pkgver=1.31.0 -pkgrel=2 +pkgrel=3 pkgdesc="Javascript Bindings for GNOME" url="http://www.gnome.org/"; depends=('libxml2>=2.7.8' 'xulrunner>=6.0.2' 'cairo') diff --git a/source/gnome/gnome-desktop/FrugalBuild b/source/gnome/gnome-desktop/FrugalBuild index 4b38493..b51eeec 100644 --- a/source/gnome/gnome-desktop/FrugalBuild +++ b/source/gnome/gnome-desktop/FrugalBuild @@ -3,7 +3,7 @@ pkgname=gnome-desktop pkgver=3.3.2 -pkgrel=1 +pkgrel=2 pkgdesc="The GNOME Desktop" url="http://www.gnome.org/"; depends=('libxml2>=2.7.8' 'gtk+3' 'startup-notification>=0.10-2' 'rarian>=0.8.0' 'libxrandr' 'gsettings-desktop-schemas' \ diff --git a/source/gnome/gnome-frugalware/FrugalBuild b/source/gnome/gnome-frugalware/FrugalBuild index aa7d28b..dfe6591 100644 --- a/source/gnome/gnome-frugalware/FrugalBuild +++ b/source/gnome/gnome-frugalware/FrugalBuild @@ -4,14 +4,14 @@ pkgname=gnome-frugalware pkgver=1.6.3.2 -pkgrel=1 +pkgrel=2 pkgdesc="Gnome default theme for Frugalware Linux." url="http://frugalware.org"; rodepends=('gnome-themes' "gtk+3-theme-frugalware=$pkgver" \ 'frugalware-cursor-theme') depends=() groups=('gnome' 'gnome-minimal') -archs=('i686' 'x86_64' 'ppc') +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=('b8236bdcce309adb002d89c7dc81676490c1bdcd') @@ -21,14 +21,14 @@ subdescs=('Frugalware GTK+2 theme') subdepends=('gtk+2-engines>=2.16.1 gtk+2-engines-murrine gtk+2-engines-equinox') subrodepends=('frugalware-gnome-icon-theme') subgroups=('xlib') -subarchs=('i686 x86_64 ppc') +subarchs=('i686 x86_64') subpkgs=("${subpkgs[@]}" 'gtk+3-theme-frugalware') subdescs=("${subdescs[@]}" 'Frugalware GTK+3 theme') subdepends=("${subdepends[@]}" "gtk+3 gtk+3-engines gtk+3-engines-unico") subrodepends=("${subrodepends[@]}" "$pkgname=$pkgver") subgroups=("${subgroups[@]}" 'gnome gnome-minimal') -subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') +subarchs=("${subarchs[@]}" 'i686 x86_64') build() { Fcd $pkgname diff --git a/source/gnome/gnome-icon-theme-symbolic/FrugalBuild b/source/gnome/gnome-icon-theme-symbolic/FrugalBuild index 3a02572..769ba39 100644 --- a/source/gnome/gnome-icon-theme-symbolic/FrugalBuild +++ b/source/gnome/gnome-icon-theme-symbolic/FrugalBuild @@ -3,7 +3,7 @@ pkgname=gnome-icon-theme-symbolic pkgver=3.2.1 -pkgrel=2 +pkgrel=3 pkgdesc="Symbolic GNOME icons" url="http://www.gnome.org/"; depends=('hicolor-icon-theme' 'gdk-pixbuf2' 'gnome-icon-theme') diff --git a/source/gnome/gnome-js-common/FrugalBuild b/source/gnome/gnome-js-common/FrugalBuild index c927309..e14edaa 100644 --- a/source/gnome/gnome-js-common/FrugalBuild +++ b/source/gnome/gnome-js-common/FrugalBuild @@ -3,7 +3,7 @@ pkgname=gnome-js-common pkgver=0.1.2 -pkgrel=5 +pkgrel=6 pkgdesc="Common JavaScript modules for GNOME." depends=('glibc') makedepends=('gtk-doc' 'intltool') diff --git a/source/gnome/gnome-keyring/FrugalBuild b/source/gnome/gnome-keyring/FrugalBuild index 314a4dd..4cb93fc 100644 --- a/source/gnome/gnome-keyring/FrugalBuild +++ b/source/gnome/gnome-keyring/FrugalBuild @@ -3,7 +3,7 @@ pkgname=gnome-keyring pkgver=3.3.2 -pkgrel=1 +pkgrel=2 pkgdesc="Password and keyring managing daemon for GNOME" url="http://www.gnome.org/"; depends=('libxml2>=2.7.8' 'gtk+3' 'dbus-glib>=0.76-1' \ diff --git a/source/gnome/gnome-screensaver/FrugalBuild b/source/gnome/gnome-screensaver/FrugalBuild index 8e42bf1..c29845d 100644 --- a/source/gnome/gnome-screensaver/FrugalBuild +++ b/source/gnome/gnome-screensaver/FrugalBuild @@ -3,7 +3,7 @@ pkgname=gnome-screensaver pkgver=3.2.0 -pkgrel=3 +pkgrel=4 pkgdesc="GNOME screen saver and locker" url="http://live.gnome.org/GnomeScreensaver"; depends=('libxml2>=2.7.8' 'dbus-glib>=0.71' 'gnome-menus>=3.0.0' 'libgnomekbd>=2.91.0' 'gtk+3' \ diff --git a/source/gnome/gnome-shell-frugalware-theme/FrugalBuild b/source/gnome/gnome-shell-frugalware-theme/FrugalBuild index ac945ef..decb188 100644 --- a/source/gnome/gnome-shell-frugalware-theme/FrugalBuild +++ b/source/gnome/gnome-shell-frugalware-theme/FrugalBuild @@ -3,7 +3,7 @@ pkgname=gnome-shell-frugalware-theme pkgver=1.6.2 -pkgrel=2 +pkgrel=3 pkgdesc="Frugalware theme for gnome-shell" url="http://frugalware.org"; depends=() diff --git a/source/gnome/gnome-terminal/FrugalBuild b/source/gnome/gnome-terminal/FrugalBuild index 7fa001e..59201a5 100644 --- a/source/gnome/gnome-terminal/FrugalBuild +++ b/source/gnome/gnome-terminal/FrugalBuild @@ -3,7 +3,7 @@ pkgname=gnome-terminal pkgver=3.2.1 -pkgrel=3 +pkgrel=4 pkgdesc="GNOME terminal emulator" url="http://www.gnome.org/"; depends=('libxml2>=2.7.8' 'startup-notification' 'vte3>=0.30.1' 'rarian' 'gconf' \ diff --git a/source/gnome/gtkhtml/FrugalBuild b/source/gnome/gtkhtml/FrugalBuild index 1c14eb6..4831cef 100644 --- a/source/gnome/gtkhtml/FrugalBuild +++ b/source/gnome/gtkhtml/FrugalBuild @@ -3,7 +3,7 @@ pkgname=gtkhtml pkgver=4.3.2 -pkgrel=1 +pkgrel=2 pkgdesc="A lightweight HTML rendering/printing/editing engine" depends=('libxml2>=2.7.8' 'gtk+3' 'gconf' \ 'libsoup>=2.37.1' 'gnome-icon-theme>=2.30.0' \ diff --git a/source/gnome/gtksourceview3/FrugalBuild b/source/gnome/gtksourceview3/FrugalBuild index 7c6a485..1b00ca7 100644 --- a/source/gnome/gtksourceview3/FrugalBuild +++ b/source/gnome/gtksourceview3/FrugalBuild @@ -4,7 +4,7 @@ pkgname=gtksourceview3 _F_gnome_name="gtksourceview" pkgver=3.2.3 -pkgrel=2 +pkgrel=3 pkgdesc="A text widget adding syntax highlighting and more to GNOME" depends=('libxml2>=2.7.8' 'gtk+3') makedepends=('intltool' 'gtk-doc' 'libglade3' 'gobject-introspection') diff --git a/source/gnome/gucharmap/FrugalBuild b/source/gnome/gucharmap/FrugalBuild index 8919482..a536882 100644 --- a/source/gnome/gucharmap/FrugalBuild +++ b/source/gnome/gucharmap/FrugalBuild @@ -3,7 +3,7 @@ pkgname=gucharmap pkgver=3.2.2 -pkgrel=2 +pkgrel=3 pkgdesc="A featureful Unicode character map for GNOME" url="http://www.gnome.org/"; depends=('libxml2>=2.7.8' 'rarian' 'gtk+3' 'gconf>=3.2.0') diff --git a/source/gnome/libgdata/FrugalBuild b/source/gnome/libgdata/FrugalBuild index 53f553c..f2f5d79 100644 --- a/source/gnome/libgdata/FrugalBuild +++ b/source/gnome/libgdata/FrugalBuild @@ -3,7 +3,7 @@ pkgname=libgdata pkgver=0.10.1 -pkgrel=4 +pkgrel=5 pkgdesc="libgdata is a GLib-based library for accessing online service APIs using the GData protocol" depends=('libxml2>=2.7.8' 'libsoup-gnome>=2.30.0' 'sqlite3' 'liboauth') makedepends=('intltool' 'gobject-introspection>=1.29.15') diff --git a/source/gnome/libgnome-keyring/FrugalBuild b/source/gnome/libgnome-keyring/FrugalBuild index afbf6fd..b6bd444 100644 --- a/source/gnome/libgnome-keyring/FrugalBuild +++ b/source/gnome/libgnome-keyring/FrugalBuild @@ -3,7 +3,7 @@ pkgname=libgnome-keyring pkgver=3.2.2 -pkgrel=2 +pkgrel=3 pkgdesc="Compatibility library for accessing secrets." url="http://www.gnome.org/"; depends=('dbus-glib' 'libgcrypt' 'eggdbus') diff --git a/source/gnome/libgnomekbd/FrugalBuild b/source/gnome/libgnomekbd/FrugalBuild index 780aac6..a5958ca 100644 --- a/source/gnome/libgnomekbd/FrugalBuild +++ b/source/gnome/libgnomekbd/FrugalBuild @@ -3,7 +3,7 @@ pkgname=libgnomekbd pkgver=3.2.0 -pkgrel=3 +pkgrel=4 pkgdesc="Keyboard library for GNOME" url="http://www.gnome.org/"; depends=('libxml2>=2.7.8' 'dbus-glib>=0.76' 'gtk+3' 'libxklavier>=5.0') diff --git a/source/gnome/libgweather/FrugalBuild b/source/gnome/libgweather/FrugalBuild index d6fb736..b2a32f6 100644 --- a/source/gnome/libgweather/FrugalBuild +++ b/source/gnome/libgweather/FrugalBuild @@ -3,7 +3,7 @@ pkgname=libgweather pkgver=3.2.1 -pkgrel=2 +pkgrel=3 pkgdesc="libgweather is a library to access weather information from online services for numerous locations." url="http://www.gnome.org/"; depends=('libxml2>=2.7.8' 'gtk+3>=3.2.0' 'gconf>=3.1.92-2' 'libsoup-gnome>=2.34.0') diff --git a/source/gnome/librest/FrugalBuild b/source/gnome/librest/FrugalBuild index 5d9d91e..a3c446c 100644 --- a/source/gnome/librest/FrugalBuild +++ b/source/gnome/librest/FrugalBuild @@ -4,7 +4,7 @@ pkgname=librest _F_gnome_name=rest pkgver=0.7.12 -pkgrel=3 +pkgrel=4 pkgdesc="This library was designed to make it easier to access web services" depends=('libsoup-gnome>=2.32.0' 'libxml2') makedepends=('gtk-doc' 'gobject-introspection') diff --git a/source/gnome/libsocialweb/FrugalBuild b/source/gnome/libsocialweb/FrugalBuild index e97d20f..6dac2f5 100644 --- a/source/gnome/libsocialweb/FrugalBuild +++ b/source/gnome/libsocialweb/FrugalBuild @@ -3,7 +3,7 @@ pkgname=libsocialweb pkgver=0.25.20 -pkgrel=3 +pkgrel=4 pkgdesc="socialweb library to fetch data from social service" depends=('libxml2>=2.7.8' 'librest' 'json-glib' 'networkmanager>=0.8.995') makedepends=('gtk-doc' 'gobject-introspection' 'intltool' 'vala') diff --git a/source/gnome/metacity/FrugalBuild b/source/gnome/metacity/FrugalBuild index 5610a86..be8a5a4 100644 --- a/source/gnome/metacity/FrugalBuild +++ b/source/gnome/metacity/FrugalBuild @@ -3,7 +3,7 @@ pkgname=metacity pkgver=2.34.1 -pkgrel=4 +pkgrel=5 pkgdesc="A window manager for GNOME" url="http://www.gnome.org/"; depends=('libxml2>=2.7.8' 'startup-notification' 'gconf>=2.32.0' 'gnome-themes>=2.30.0' 'libcm' 'gnome-frugalware>=0.7.2' \ diff --git a/source/gnome/mutter/FrugalBuild b/source/gnome/mutter/FrugalBuild index 52fcc85..0c2d6e3 100644 --- a/source/gnome/mutter/FrugalBuild +++ b/source/gnome/mutter/FrugalBuild @@ -3,7 +3,7 @@ pkgname=mutter pkgver=3.3.2 -pkgrel=2 +pkgrel=3 pkgdesc="A window manager for GNOME (new metacity for gnome3)" url="http://www.gnome.org/"; depends=('libxml2>=2.7.8' 'startup-notification' 'gconf>=3.2.0' 'gnome-themes>=3.0.0' 'libcm' 'gnome-frugalware>=0.7.2' \ diff --git a/source/gnome/seahorse-sharing/FrugalBuild b/source/gnome/seahorse-sharing/FrugalBuild index d1d9ae1..4e3476f 100644 --- a/source/gnome/seahorse-sharing/FrugalBuild +++ b/source/gnome/seahorse-sharing/FrugalBuild @@ -3,7 +3,7 @@ pkgname=seahorse-sharing pkgver=3.2.1 -pkgrel=2 +pkgrel=3 pkgdesc="Seahorse Sharing is a daemon which allows sharing of the public GnuPG keys on a computer using DNS-SD." depends=('gtk+3' 'gpgme' 'libsoup-gnome' 'avahi-glib') makedepends=('intltool' 'gobject-introspection') diff --git a/source/gnome/zenity/FrugalBuild b/source/gnome/zenity/FrugalBuild index 261a992..7a4408d 100644 --- a/source/gnome/zenity/FrugalBuild +++ b/source/gnome/zenity/FrugalBuild @@ -3,7 +3,7 @@ pkgname=zenity pkgver=3.2.0 -pkgrel=3 +pkgrel=4 pkgdesc="A rewrite of gdialog" url="http://www.gnome.org/"; rodepends=('notification-daemon') diff --git a/source/xapps-extra/gummi/FrugalBuild b/source/xapps-extra/gummi/FrugalBuild index b82d29a..89eff86 100644 --- a/source/xapps-extra/gummi/FrugalBuild +++ b/source/xapps-extra/gummi/FrugalBuild @@ -3,7 +3,7 @@ pkgname=gummi pkgver=0.6.1 -pkgrel=1 +pkgrel=2 pkgdesc="Gummi is a LaTeX editor " url="http://gummi.midnightcoding.org/"; depends=('gtkspell' 'poppler-glib>=0.18.1' 'gtksourceview' 'texlive') diff --git a/source/xlib-extra/libvirt/FrugalBuild b/source/xlib-extra/libvirt/FrugalBuild index 1418918..c5a0676 100644 --- a/source/xlib-extra/libvirt/FrugalBuild +++ b/source/xlib-extra/libvirt/FrugalBuild @@ -3,7 +3,7 @@ pkgname=libvirt pkgver=0.9.8 -pkgrel=1 +pkgrel=2 pkgdesc="libvirt is a library providing access to information from various virtualization tools" url="http://libvirt.org"; depends=('libxml2' 'gnutls>=2.12.12' 'cyrus-sasl' 'parted>=3.0' \ _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
