[Frugalware-git] wipv: Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current

VÖRÖSKŐI András voroskoi at frugalware.org
Tue Jun 29 09:03:57 CEST 2010


Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=wipv.git;a=commitdiff;h=641812360d1260905b32398dd5ee0518c0e99762

commit 641812360d1260905b32398dd5ee0518c0e99762
Merge: dfa40a7 0e83b33
Author: VÖRÖSKŐI András <voroskoi at frugalware.org>
Date:   Tue Jun 29 09:02:39 2010 +0200

Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current

Conflicts:
source/base/pacman-g2/FrugalBuild
source/devel-extra/erlang/FrugalBuild
source/gnome-extra/almanah/FrugalBuild
source/gnome-extra/empathy/FrugalBuild
source/gnome-extra/me-tv/FrugalBuild
source/gnome-extra/tracker/FrugalBuild
source/gnome-extra/vinagre/FrugalBuild
source/gnome/evolution-exchange/FrugalBuild
source/gnome/gnome-panel/FrugalBuild
source/lib-extra/libssh/FrugalBuild
source/multimedia/mpd/FrugalBuild
source/network/bind/FrugalBuild
source/xapps-extra/transmission/FrugalBuild
source/xapps-extra/wireshark/FrugalBuild
source/xlib/libspectre/FrugalBuild

Pull in current with gnome changes

diff --cc source/base/pacman-g2/FrugalBuild
index ab4a1e6,bf20f7e..25a7a7a
--- a/source/base/pacman-g2/FrugalBuild
+++ b/source/base/pacman-g2/FrugalBuild
@@@ -7,7 -7,7 +7,7 @@@ USE_MINIMAL=${USE_MINIMAL:-"n"
pkgname=pacman-g2
pkgver=3.7.7
Fuse $USE_DEVEL && pkgver=3.7.3.32.gedb838c
- pkgrel=4
-pkgrel=3
++pkgrel=5
pkgdesc="A .tar.bz2 based package manager library (libpacman) and client (pacman-g2) with dependency support."
url="http://ftp.frugalware.org/pub/other/pacman-g2/"
backup=(etc/{makepkg,pacman-g2}.conf etc/pacman-g2/repos/{frugalware,frugalware-current})
@@@ -26,9 -26,8 +26,10 @@@ _F_archive_nosort=
up2date="Flasttar $url/releases/"
if ! Fuse $USE_DEVEL; then
source=($url/releases/$pkgname-$pkgver.tar.gz \
-		http://git.frugalware.org/patches/pacman-g2/ab6bee9.patch 0001-fix-percent-calculation.patch)
-	signatures=("$source.asc" '' '')
+		http://git.frugalware.org/patches/pacman-g2/ab6bee9.patch \
- 		http://git.frugalware.org/patches/pacman-g2/3c97a0c.patch)
- 	signatures=("$source.asc" '' '')
++		http://git.frugalware.org/patches/pacman-g2/3c97a0c.patch \
++		0001-fix-percent-calculation.patch)
++	signatures=("$source.asc" '' '' '')
else
_F_scm_type="git"
_F_scm_url="git://git.frugalware.org/pub/other/pacman-g2/pacman-g2"
diff --cc source/devel-extra/erlang/FrugalBuild
index 7a62760,f15ce17..93f196e
--- a/source/devel-extra/erlang/FrugalBuild
+++ b/source/devel-extra/erlang/FrugalBuild
@@@ -10,13 -10,13 +10,13 @@@ els
fi

pkgname=erlang
- pkgver=13B04
- ertsver=5.7.2
- interfacever=3.6.2
+ pkgver=14A
+ ertsver=5.8
+ interfacever=3.7
-pkgrel=1
+pkgrel=2
pkgdesc="A programming language designed at the Ericsson Computer Science Laboratory."
url="http://www.erlang.org/"
-depends=('openssl' 'ncurses')
+depends=('openssl>=1.0.0' 'ncurses')
Fuse $USE_JAVA && makedepends=('j2sdk')
groups=('devel-extra')
archs=('i686' 'x86_64' 'ppc')
diff --cc source/gnome-extra/almanah/FrugalBuild
index 20046ee,c290865..449166b
--- a/source/gnome-extra/almanah/FrugalBuild
+++ b/source/gnome-extra/almanah/FrugalBuild
@@@ -3,10 -3,10 +3,10 @@@

pkgname=almanah
pkgver=0.6.1
--pkgrel=4
++pkgrel=5
pkgdesc="Diary is a small GTK+ application to allow you to keep a diary of your life."
url="http://tecnocode.co.uk/projects/almanah/"
- depends=('evolution-data-server>=2.30.0-2' 'libglade' 'sqlite3' 'e2fsprogs' 'libgnome' 'popt' 'nspr' 'openssl>=1.0.0' 'libtasn1' 'libgcrypt' 'seahorse' 'gtkspell' 'atk' 'pango>=1.24.2-2' 'libxau>=1.0.4' 'libxdmcp' 'freetype2' 'libgcc' 'libxdamage' 'libxinerama' 'libxi' 'libxrandr' 'libxcursor')
-depends=('evolution-data-server>=2.30.2' 'libglade' 'sqlite3' 'e2fsprogs' 'libgnome' 'popt' 'nspr' 'openssl' 'libtasn1' 'libgcrypt' 'seahorse' 'gtkspell' 'atk' 'pango>=1.24.2-2' 'libxau>=1.0.4' 'libxdmcp' 'freetype2' 'libgcc' 'libxdamage' 'libxinerama' 'libxi' 'libxrandr' 'libxcursor')
++depends=('evolution-data-server>=2.30.2' 'libglade' 'sqlite3' 'e2fsprogs' 'libgnome' 'popt' 'nspr' 'openssl>=1.0.0' 'libtasn1' 'libgcrypt' 'seahorse' 'gtkspell' 'atk' 'pango>=1.24.2-2' 'libxau>=1.0.4' 'libxdmcp' 'freetype2' 'libgcc' 'libxdamage' 'libxinerama' 'libxi' 'libxrandr' 'libxcursor')
makedepends=('intltool' 'krb5')
options=('scriptlet')
_F_gnome_schemas=('/etc/gconf/schemas/almanah.schemas')
diff --cc source/gnome-extra/contacts-eds/FrugalBuild
index ad10764,20aca62..f18a903
--- a/source/gnome-extra/contacts-eds/FrugalBuild
+++ b/source/gnome-extra/contacts-eds/FrugalBuild
@@@ -7,9 -7,9 +7,9 @@@ pkgrel=
pkgdesc="Contacts is a small, lightweight addressbook that uses libebook, part of EDS"
url="http://pimlico-project.org"
_F_archive_name=contacts
- depends=('atk' 'pango>=1.24.2-2' 'freetype2' 'libxau>=1.0.4' 'libxdmcp' 'evolution-data-server>=2.30.0-2' \
+ depends=('atk' 'pango>=1.24.2-2' 'freetype2' 'libxau>=1.0.4' 'libxdmcp' 'evolution-data-server>=2.30.2' \
'libgnome' 'popt' 'libxdamage' 'libxinerama' 'libxi' 'libxrandr' \
-	'libxcursor' 'nspr>=4.7.1' 'openssl' 'e2fsprogs')
+	'libxcursor' 'nspr>=4.7.1' 'openssl>=1.0.0' 'e2fsprogs')
makedepends=('perl-xml-parser' 'intltool')
groups=('gnome-extra')
up2date="lynx -dump $url/sources/$_F_archive_name/  | Flasttar "
diff --cc source/gnome-extra/empathy/FrugalBuild
index 3ab131b,078bb52..5e0e1ac
--- a/source/gnome-extra/empathy/FrugalBuild
+++ b/source/gnome-extra/empathy/FrugalBuild
@@@ -2,8 -2,8 +2,8 @@@
# Maintainer: bouleetbil <bouleetbil at frogdev.info>

pkgname=empathy
- pkgver=2.30.1
+ pkgver=2.30.2
-pkgrel=2
+pkgrel=3
pkgdesc="Empathy consists of a rich set of reusable instant messaging widgets"
depends=('gconf>=2.28.1' 'telepathy-glib' 'libxml2' 'enchant' \
'libglade' 'atk' 'pango' 'freetype2' 'libxau' 'libxdmcp' 'e2fsprogs' \
diff --cc source/gnome-extra/me-tv/FrugalBuild
index 04b83c7,f953e5e..5e3dbd4
--- a/source/gnome-extra/me-tv/FrugalBuild
+++ b/source/gnome-extra/me-tv/FrugalBuild
@@@ -2,8 -2,8 +2,8 @@@
# Maintainer: bouleetbil <bouleetbil at frogdev.info>

pkgname=me-tv
- pkgver=1.2.0
+ pkgver=1.2.6
-pkgrel=1
+pkgrel=2
pkgdesc="Me TV is a digital television (DVB) viewer for GNOME."
url="https://launchpad.net/me-tv"
up2date="elinks --dump https://launchpad.net/me-tv/+download| Flasttar"
diff --cc source/gnome-extra/tracker/FrugalBuild
index 18ee6ff,9ea117d..3dcf9a2
--- a/source/gnome-extra/tracker/FrugalBuild
+++ b/source/gnome-extra/tracker/FrugalBuild
@@@ -3,8 -3,8 +3,8 @@@
# Contributor: AlexExtreme <alex at alex-smith.me.uk>

pkgname=tracker
- pkgver=0.8.10
+ pkgver=0.8.13
-pkgrel=1
+pkgrel=2
pkgdesc="Tracker is a first class object database, extensible tag/metadata database, search tool and indexer."
depends=('gtk+2>=2.20.0-2' 'dbus-glib>=0.76' 'sqlite3' 'gamin' \
'poppler-glib>=0.8.0' 'libvorbis' 'libpng' 'libexif' 'libgsf' 'gstreamer' \
diff --cc source/gnome-extra/vinagre/FrugalBuild
index 9cf0ccf,6bde970..4e749c9
--- a/source/gnome-extra/vinagre/FrugalBuild
+++ b/source/gnome-extra/vinagre/FrugalBuild
@@@ -2,8 -2,8 +2,8 @@@
# Maintainer: bouleetbil <bouleetbil at frogdev.info>

pkgname=vinagre
- pkgver=2.30.1
+ pkgver=2.30.2
-pkgrel=1
+pkgrel=2
pkgdesc="VNC Client for the GNOME Desktop"
depends=('libglade' 'gtk-vnc' 'gnutls' 'libgcrypt' 'libavahi-ui' 'atk' \
'pango' 'libxau' 'libxdmcp' 'freetype2' 'libxdamage' \
diff --cc source/gnome/evolution-exchange/FrugalBuild
index 849e3dd,f1cfad3..a0f4693
--- a/source/gnome/evolution-exchange/FrugalBuild
+++ b/source/gnome/evolution-exchange/FrugalBuild
@@@ -2,11 -2,11 +2,11 @@@
# Maintainer: Christian Hamar alias krix <krics at linuxforum.hu>

pkgname=evolution-exchange
- pkgver=2.30.1
+ pkgver=2.30.2
-pkgrel=1
+pkgrel=2
pkgdesc="Ximian Connector for Microsoft Exchange, which adds support for Microsoft Exchange 2000 and 2003 to Evolution."
- depends=('gtkhtml>=2.30.0' 'evolution-data-server>=2.30.0' 'evolution>=2.30.0.1-2' 'libsoup>=2.30.0' \
- 		'evolution-data-server-ldap>=2.30.0-2' 'libkrb5' 'openssl>=1.0.0')
+ depends=('gtkhtml>=2.30.2' 'evolution-data-server>=2.30.2' 'evolution>=2.30.2' 'libsoup>=2.30.0' \
-		'evolution-data-server-ldap>=2.30.2' 'libkrb5')
++		'evolution-data-server-ldap>=2.30.2' 'libkrb5' 'openssl>=1.0.0')
makedepends=('gtk-doc>=1.11' 'perl-xml-parser' 'openldap' 'intltool' 'krb5')
groups=('gnome')
archs=('i686' 'x86_64' 'ppc')
diff --cc source/gnome/evolution/FrugalBuild
index 665a60e,68f4005..bf0817c
--- a/source/gnome/evolution/FrugalBuild
+++ b/source/gnome/evolution/FrugalBuild
@@@ -2,9 -2,9 +2,9 @@@
# Maintainer: bouleetbil <bouleetbil at frogdev.info>

pkgname=evolution
- pkgver=2.30.1.2
+ pkgver=2.30.2
evo_major=2.30
-pkgrel=1
+pkgrel=2
pkgdesc="Integrated mail, calendar and address book suite for GNOME"
depends=('unique' \
'gst-plugins-base' 'gtkimageview>=1.6.4-4')
diff --cc source/gnome/gnome-panel/FrugalBuild
index 1087403,50ebda8..2a5afa9
--- a/source/gnome/gnome-panel/FrugalBuild
+++ b/source/gnome/gnome-panel/FrugalBuild
@@@ -2,14 -2,14 +2,14 @@@
# Maintainer: bouleetbil <bouleetbil at frogdev.info>

pkgname=gnome-panel
- pkgver=2.30.0
- pkgrel=3
+ pkgver=2.30.2
-pkgrel=1
++pkgrel=2
pkgdesc="GNOME panel and core applets"
rodepends=('alacarte>=0.11.1.1')
- depends=('gnome-desktop>=2.30.0-2' 'gnome-menus>=2.30.0' \
- 	 'evolution-data-server>=2.30.0-2' 'libwnck>=2.28.0-2' \
+ depends=('gnome-desktop>=2.30.2' 'gnome-menus>=2.30.2' \
+ 	 'evolution-data-server>=2.30.2' 'libwnck>=2.28.0-2' \
'rarian>=0.8.0' 'dbus-glib>=0.71' 'avahi-glib>=0.6.17' 'librsvg>=2.6.0-2' \
-	 'libgweather>=2.30.0' 'libcanberra-gtk' 'libbonoboui' 'libkrb5')
+	 'libgweather>=2.30.0' 'libcanberra-gtk' 'libbonoboui' 'libkrb5' 'openssl>=1.0.0')
makedepends=('intltool' 'gtk-doc>=1.9' 'gnome-doc-utils>=0.14.0' 'krb5')
groups=('gnome' 'gnome-minimal')
archs=('i686' 'x86_64' 'ppc')
diff --cc source/lib-extra/libssh/FrugalBuild
index 549d52c,f6255d2..79ba16c
--- a/source/lib-extra/libssh/FrugalBuild
+++ b/source/lib-extra/libssh/FrugalBuild
@@@ -2,11 -2,11 +2,11 @@@
# Maintainer: Miklos Vajna <vmiklos at frugalware.org>

pkgname=libssh
- pkgver=0.4.3
+ pkgver=0.4.4
-pkgrel=1
+pkgrel=2
pkgdesc="The SSH library"
url="http://www.libssh.org/"
-depends=('openssl' 'zlib')
+depends=('openssl>=1.0.0' 'zlib')
groups=('lib-extra')
archs=('i686' 'x86_64' 'ppc')
_F_archive_grepv="\.9[0-9]"
diff --cc source/multimedia/mpd/FrugalBuild
index 44cf464,1d5b137..811b7f6
--- a/source/multimedia/mpd/FrugalBuild
+++ b/source/multimedia/mpd/FrugalBuild
@@@ -2,8 -2,8 +2,8 @@@
# Maintainer: Miklos Vajna <vmiklos at frugalware.org>

pkgname=mpd
- pkgver=0.15.9
+ pkgver=0.15.10
-pkgrel=1
+pkgrel=2
pkgdesc="the Music Player Daemon"
_F_sourceforge_dirname="musicpd"
_F_sourceforge_ext=".tar.bz2"
diff --cc source/network-extra/cgit/FrugalBuild
index e273c61,1e03d13..07aba58
--- a/source/network-extra/cgit/FrugalBuild
+++ b/source/network-extra/cgit/FrugalBuild
@@@ -2,12 -2,12 +2,12 @@@
# Maintainer: Miklos Vajna <vmiklos at frugalware.org>

pkgname=cgit
- pkgver=0.8.3.1
+ pkgver=0.8.3.2
gitver=1.6.4.3
-pkgrel=1
+pkgrel=2
pkgdesc="A fast webinterface for git."
url="http://hjemli.net/git/cgit/"
-depends=('curl>=7.19.0' 'openssl')
+depends=('curl>=7.20.0' 'openssl>=1.0.0')
backup=(etc/{cgitrc,httpd/conf/modules.d/cgit.conf})
groups=('network-extra')
archs=('i686' 'x86_64')
diff --cc source/network/bind/FrugalBuild
index e4f1911,64d3756..2cc85fd
--- a/source/network/bind/FrugalBuild
+++ b/source/network/bind/FrugalBuild
@@@ -2,9 -2,9 +2,9 @@@
# Maintainer: Miklos Vajna <vmiklos at frugalware.org>

pkgname=bind
- pkgver=9.7.0
- pkgextraver=-P2
- pkgrel=3
+ pkgver=9.7.1
+ pkgextraver=
-pkgrel=1
++pkgrel=2
pkgdesc="DNS server and utilities"
url="http://www.isc.org/index.pl?/sw/bind/"
backup=(etc/named.conf etc/logrotate.d/named)
diff --cc source/xapps-extra/abiword/FrugalBuild
index 304ab86,9f7a7a0..9ddda8b
--- a/source/xapps-extra/abiword/FrugalBuild
+++ b/source/xapps-extra/abiword/FrugalBuild
@@@ -2,9 -2,9 +2,9 @@@
# Maintainer: bouleetbil <bouleetbil at frogdev.info>

pkgname=abiword
- pkgver=2.8.5
+ pkgver=2.8.6
abivers=2.8
-pkgrel=1
+pkgrel=2
pkgdesc="AbiWord is a free word processing program similar to Microsoft(R) Word."
url="http://www.abisource.com"
groups=('xapps-extra')
diff --cc source/xapps-extra/transmission/FrugalBuild
index 22e6d11,ce3fc68..53fa7b1
--- a/source/xapps-extra/transmission/FrugalBuild
+++ b/source/xapps-extra/transmission/FrugalBuild
@@@ -2,13 -2,13 +2,13 @@@
# Maintainer: Priyank Gosalia <priyankmg at gmail.com>

pkgname=transmission
- pkgver=1.93
+ pkgver=2.00
-pkgrel=1
+pkgrel=2
pkgdesc="A free, lightweight BitTorrent Client."
url="http://transmission.m0k.org/"
makedepends=('intltool')
depends=('glibc' 'gtk+2>=2.20.0-2' 'libxml2' 'freetype2' 'libxau>=1.0.4' 'libxdmcp>=1.0.2-2' \
- 	'curl>=7.19.0' 'libxdamage>=1.1.1-3' 'libxext>=1.0.5-3' 'gettext' 'openssl>=1.0.0')
-	'curl>=7.19.0' 'libxdamage>=1.1.1-3' 'libxext>=1.0.5-3' 'gettext' 'libevent')
++	'curl>=7.19.0' 'libxdamage>=1.1.1-3' 'libxext>=1.0.5-3' 'gettext' 'libevent' 'openssl>=1.0.0')
options=('scriptlet')
groups=('xapps-extra')
archs=('i686' 'x86_64')
diff --cc source/xapps-extra/wireshark/FrugalBuild
index 70b9c50,acd57b0..81686fe
--- a/source/xapps-extra/wireshark/FrugalBuild
+++ b/source/xapps-extra/wireshark/FrugalBuild
@@@ -2,11 -2,11 +2,11 @@@
# Maintainer: CSÉCSY László <boobaa at frugalware.org>

pkgname=wireshark
- pkgver=1.2.8
- pkgrel=3
+ pkgver=1.2.9
-pkgrel=1
++pkgrel=2
pkgdesc="The world's most popular network protocol analyzer"
url="http://www.wireshark.org/"
-depends=('libkrb5' 'gtk+2>=2.20.0-2' 'pcre' 'libpcap' 'gnutls>=2.8')
+depends=('libkrb5' 'gtk+2>=2.20.0-2' 'pcre' 'libpcap' 'gnutls>=2.8' 'openssl>=1.0.0')
makedepends=('krb5')
groups=('xapps-extra')
archs=('i686' 'x86_64' 'ppc')
diff --cc source/xlib/libspectre/FrugalBuild
index 4efba94,e9a6669..b160103
--- a/source/xlib/libspectre/FrugalBuild
+++ b/source/xlib/libspectre/FrugalBuild
@@@ -2,11 -2,11 +2,11 @@@
# Maintainer: crazy <crazy at frugalware.org>

pkgname=libspectre
- pkgver=0.2.5
+ pkgver=0.2.6
-pkgrel=1
+pkgrel=2
pkgdesc="libspectre is a small library for rendering Postscript documents"
url="http://libspectre.freedesktop.org/wiki/"
-depends=('xghostscript>=8.64-2' 'openssl' 'zlib' 'libstdc++')
+depends=('xghostscript>=8.64-3' 'openssl>=1.0.0' 'zlib' 'libstdc++')
options=('scriptlet')
groups=('xlib')
archs=('i686' 'x86_64' 'ppc')


More information about the Frugalware-git mailing list