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

commit 03a4f9e2725b2ae1936d9d101c92f7940783d0e6
Merge: 0bee740 5cf2f46
Author: bouleetbil <bouleet...@frogdev.info>
Date:   Sun Jan 30 10:56:39 2011 +0000

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

Conflicts:
source/xmultimedia-extra/audacious-plugins/FrugalBuild

diff --cc source/xmultimedia-extra/audacious-plugins/FrugalBuild
index 60f6284,e51fa07..3e4103a
--- a/source/xmultimedia-extra/audacious-plugins/FrugalBuild
+++ b/source/xmultimedia-extra/audacious-plugins/FrugalBuild
@@@ -19,9 -19,8 +19,9 @@@ 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)
-sha1sums=('b89f87e9abb0249cb6b8318ed8fa58bb7bb27c67')
+source=(http://distfiles.atheme.org/$pkgname-$pkgver.tgz libnotify07.diff)
- sha1sums=('07a0c0ac65bc01aa936454da9550ad982e66b8f0' \
++sha1sums=('b89f87e9abb0249cb6b8318ed8fa58bb7bb27c67' \
+          '2ebeb4373b9ef48620799e86aafb5a904b8869a3')

subpkgs=( "audacious-plugin-jack" "audacious-plugin-neon"             \
"audacious-plugin-wavpack" "audacious-plugin-sidplay"       \
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to