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

commit c132b9986e50363aad9b7f3bae9a85cc62e6401a
Merge: d4353d2 74e82d7
Author: bouleetbil <bouleet...@frogdev.info>
Date:   Fri Mar 18 09:31:43 2011 +0100

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

Conflicts:
source/base/shadow/FrugalBuild
source/xapps-extra/xcfa/FrugalBuild
source/xmultimedia-extra/audacious-plugins/FrugalBuild

diff --cc source/apps-extra/postgresql/FrugalBuild
index 4937628,7082870..b5dc9d4
--- a/source/apps-extra/postgresql/FrugalBuild
+++ b/source/apps-extra/postgresql/FrugalBuild
@@@ -8,10 -8,10 +8,10 @@@ pkgrel=
pkgdesc="An advanced Object-Relational database management system (DBMS)"
url="http://www.postgresql.org/";
makedepends=('openssl>=1.0.0')
-depends=('zlib' 'readline' 'libxml2')
+depends=('zlib' 'readline' 'libxml2>=2.7.8')
rodepends=("libpq=$pkgver")
groups=('apps-extra')
- archs=('i686' 'x86_64' 'ppc')
+ archs=('i686' 'x86_64' 'ppc' 'arm')
up2date="lynx -dump ftp://ftp.postgresql.org/pub/source/|egrep -v 
'alpha|beta|rc[0-9]' |tail -n 1 |sed 's|.*/v||'"
source=(ftp://ftp.postgresql.org/pub/source/v$pkgver/postgresql-$pkgver.tar.bz2 
rc.postgresql)

diff --cc source/base/shadow/FrugalBuild
index 9aa1596,dc005ea..d8e802d
--- a/source/base/shadow/FrugalBuild
+++ b/source/base/shadow/FrugalBuild
@@@ -3,7 -3,7 +3,7 @@@

pkgname=shadow
pkgver=4.1.4.3
--pkgrel=2
++pkgrel=3
pkgdesc="Shadow password file utilities"
url="http://pkg-shadow.alioth.debian.org/";
pkgurl="ftp://pkg-shadow.alioth.debian.org/pub/pkg-shadow";
diff --cc source/xmultimedia-extra/audacious-plugins/FrugalBuild
index 1b8d700,8bbf6be..a457f5e
--- a/source/xmultimedia-extra/audacious-plugins/FrugalBuild
+++ b/source/xmultimedia-extra/audacious-plugins/FrugalBuild
@@@ -19,10 -19,9 +19,10 @@@ groups=('xmultimedia-extra'
archs=('i686' 'x86_64')
options=('scriptlet')
up2date="lynx -dump '$url/downloads' | grep -o '$pkgname-\(.*\).tgz' | tail -n1 
| sed 's|$pkgname-\(.*\).tgz|\1|'"
- source=(http://distfiles.atheme.org/$pkgname-$pkgver.tgz libnotify07.diff)
- sha1sums=('b89f87e9abb0249cb6b8318ed8fa58bb7bb27c67' \
-           '2ebeb4373b9ef48620799e86aafb5a904b8869a3')
+ source=(http://distfiles.atheme.org/$pkgname-$pkgver.tgz)
+ sha1sums=('33a43cdcb699578accbc181918b96da6ab04cedc')
+
+
subpkgs=( "audacious-plugin-jack" "audacious-plugin-neon"             \
"audacious-plugin-wavpack" "audacious-plugin-sidplay"       \
"audacious-plugin-mtp" "audacious-plugin-mms"               \
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to