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

2010-05-29 Thread Miklos Vajna 
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=imgrebuild.git;a=commitdiff;h=fcfb9dc6a8ad932acbf2dec9f5b123898bf1fdc5

commit fcfb9dc6a8ad932acbf2dec9f5b123898bf1fdc5
Merge: 94f5e57 3ee1b42
Author: Miklos Vajna vmik...@frugalware.org
Date:   Sat May 29 17:10:11 2010 +0200

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

* 'master' of git.frugalware.org:/pub/frugalware/frugalware-current: (54 
commits)

Conflicts:
source/xapps-extra/wireshark/FrugalBuild

diff --cc source/xapps-extra/wireshark/FrugalBuild
index 7327626,1297cd9..0cc939b
--- a/source/xapps-extra/wireshark/FrugalBuild
+++ b/source/xapps-extra/wireshark/FrugalBuild
@@@ -2,11 -2,11 +2,11 @@@
# Maintainer: CSÉCSY László boo...@frugalware.org

pkgname=wireshark
- pkgver=1.2.7
+ pkgver=1.2.8
-pkgrel=1
+pkgrel=2
pkgdesc=The world's most popular network protocol analyzer
url=http://www.wireshark.org/;
-depends=('libkrb5' 'gtk+2=2.10.2' 'pcre' 'libpcap' 'gnutls=2.8')
+depends=('libkrb5' 'gtk+2=2.20.0-2' 'pcre' 'libpcap' 'gnutls=2.8')
makedepends=('krb5')
groups=('xapps-extra')
archs=('i686' 'x86_64' 'ppc')
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

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

2010-05-23 Thread Miklos Vajna 
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=imgrebuild.git;a=commitdiff;h=f78d002e22f853062437ecabbd3d4419bc54c7be

commit f78d002e22f853062437ecabbd3d4419bc54c7be
Merge: 2325da0 868c6dd
Author: Miklos Vajna vmik...@frugalware.org
Date:   Mon May 24 01:15:16 2010 +0200

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

* 'master' of git.frugalware.org:/pub/frugalware/frugalware-current (38 commits)

Conflicts:
source/x11-extra/nvidia/FrugalBuild

diff --cc source/x11-extra/nvidia/FrugalBuild
index 4c168f0,3451653..60ce632
--- a/source/x11-extra/nvidia/FrugalBuild
+++ b/source/x11-extra/nvidia/FrugalBuild
@@@ -2,8 -2,8 +2,8 @@@
# Maintainer: Michel Hermier herm...@frugalware.org

pkgname=nvidia
-pkgver=195.36.15
-pkgrel=6
+pkgver=195.36.24
- pkgrel=2
++pkgrel=3
archs=('i686' 'x86_64' '!ppc')
Finclude nvidia
case $_F_nvidia_arch in
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

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

2010-05-15 Thread Miklos Vajna 
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=imgrebuild.git;a=commitdiff;h=1a2702b71899ff57293c344509d47d8f19d4f9a1

commit 1a2702b71899ff57293c344509d47d8f19d4f9a1
Merge: 1f40c8d a8a4606
Author: Miklos Vajna vmik...@frugalware.org
Date:   Sat May 15 19:26:20 2010 +0200

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

* 'master' of git.frugalware.org:/pub/frugalware/frugalware-current: (22 
commits)
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

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

2010-05-12 Thread Miklos Vajna 
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=imgrebuild.git;a=commitdiff;h=02c96c05e0cab01602e160142c3a73ef3902e9de

commit 02c96c05e0cab01602e160142c3a73ef3902e9de
Merge: 171e564 d4ef077
Author: Miklos Vajna vmik...@frugalware.org
Date:   Wed May 12 18:42:37 2010 +0200

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

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

diff --cc source/gnustep-extra/gnustep-base/FrugalBuild
index 995e975,172d35e..d079794
--- a/source/gnustep-extra/gnustep-base/FrugalBuild
+++ b/source/gnustep-extra/gnustep-base/FrugalBuild
@@@ -3,13 -3,15 +3,15 @@@

pkgname=gnustep-base
pkgver=1.18.0
--pkgrel=2
++pkgrel=3
pkgdesc=The GNUstep Base
Finclude gnustep
-depends=(${depen...@]} 'ffcall' 'gmp' 'libxslt' 'openssl=0.9.8' 
'avahi=0.6.24')
+depends=(${depen...@]} 'ffcall' 'gmp' 'libxslt' 'openssl=0.9.8' 
'avahi=0.6.25-2')
groups=(${grou...@]} 'gnustep-core')
archs=('i686' 'x86_64')
- sha1sums=('30c13e673ad550c988f03adb9c545a8de1a17d19')
+ source=($source http://launchpadlibrarian.net/47892990/gdomap.patch)
+ sha1sums=('30c13e673ad550c988f03adb9c545a8de1a17d19' \
+   '1fd51830b113d87912c7e4b012bf0dd8cb909a0b')

build()
{
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

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

2010-05-09 Thread Miklos Vajna 
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=imgrebuild.git;a=commitdiff;h=539ca72defed6f2f02664070486f9dc5a92702b3

commit 539ca72defed6f2f02664070486f9dc5a92702b3
Merge: 0d10abd a3b00e6
Author: Miklos Vajna vmik...@frugalware.org
Date:   Sun May 9 13:53:42 2010 +0200

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

* 'master' of git.frugalware.org:/pub/frugalware/frugalware-current: (204 
commits)

Conflicts:
source/gnome-extra/denemo/FrugalBuild
source/gnome-extra/specimen/FrugalBuild
source/x11-extra/nvidia/FrugalBuild
source/xapps-extra/frama-c/FrugalBuild
source/xapps/mplayer/FrugalBuild
source/xlib/libquicktime/FrugalBuild
source/xmultimedia-extra/hydrogen/FrugalBuild

diff --cc source/gnome-extra/denemo/FrugalBuild
index 2068b16,bb981c6..ab9a4a0
--- a/source/gnome-extra/denemo/FrugalBuild
+++ b/source/gnome-extra/denemo/FrugalBuild
@@@ -3,10 -3,10 +3,10 @@@

pkgname=denemo
pkgver=0.8.14
- pkgrel=2
-pkgrel=3
++pkgrel=4
pkgdesc=GTK+ graphical music notation editor.
url=http://savannah.gnu.org/projects/$pkgname;
- depends=('gtk+2=2.20.0-2' 'libxau=1.0.4' 'libxdmcp' 'freetype2' 'guile' 
'aubio' 'portaudio' 'libxml2' 'libxdamage' 'libxext' 'gtksourceview' 
'fluidsynth')
-depends=('gtk+2=2.16.2-2' 'libxau=1.0.4' 'libxdmcp' 'freetype2' 'guile' 
'aubio' 'portaudio' 'libxml2' 'libxdamage' 'libxext' 'gtksourceview' 
'fluidsynth' 'jack=0.118.0')
++depends=('gtk+2=2.20.0-2' 'libxau=1.0.4' 'libxdmcp' 'freetype2' 'guile' 
'aubio' 'portaudio' 'libxml2' 'libxdamage' 'libxext' 'gtksourceview' 
'fluidsynth' 'jack=0.118.0')
options=('scriptlet')
groups=('gnome-extra')
archs=('i686' 'x86_64')
diff --cc source/gnome-extra/specimen/FrugalBuild
index 5c52e42,1c24cfa..d1c15fd
--- a/source/gnome-extra/specimen/FrugalBuild
+++ b/source/gnome-extra/specimen/FrugalBuild
@@@ -4,10 -4,10 +4,10 @@@
pkgname=specimen
pkgver=0.5.2_rc3
realpkgver=0.5.2-rc3
- pkgrel=2
-pkgrel=3
++pkgrel=4
pkgdesc=An open source, MIDI controllable audio sampler
url=http://zhevny.com/specimen/;
- depends=('gtk+2=2.20.0-2' 'libxml2' 'libgnomecanvas' 'libsndfile' 
'libsamplerate' 'jack' 'phat')
-depends=('gtk+2' 'libxml2' 'libgnomecanvas' 'libsndfile' 'libsamplerate' 
'jack=0.118.0' 'phat')
++depends=('gtk+2=2.20.0-2' 'libxml2' 'libgnomecanvas' 'libsndfile' 
'libsamplerate' 'jack=0.118.0' 'phat')
options=('scriptlet')
groups=('gnome-extra')
archs=('i686' 'x86_64')
diff --cc source/x11-extra/nvidia/FrugalBuild
index a330cfe,8aad07c..4c168f0
--- a/source/x11-extra/nvidia/FrugalBuild
+++ b/source/x11-extra/nvidia/FrugalBuild
@@@ -2,8 -2,8 +2,8 @@@
# Maintainer: Michel Hermier herm...@frugalware.org

pkgname=nvidia
-pkgver=195.36.15
-pkgrel=5
+pkgver=195.36.24
- pkgrel=1
++pkgrel=2
archs=('i686' 'x86_64' '!ppc')
Finclude nvidia
case $_F_nvidia_arch in
diff --cc source/xapps-extra/frama-c/FrugalBuild
index 9a2ae0c,cb8b7ca..25e6806
--- a/source/xapps-extra/frama-c/FrugalBuild
+++ b/source/xapps-extra/frama-c/FrugalBuild
@@@ -4,11 -4,12 +4,12 @@@
pkgname=frama-c
pkgver=20100401
rel_id=Boron
--pkgrel=2
++pkgrel=3
pkgdesc=Static analyser for C code
url=http://frama-c.com;
source=($url/download/$pkgname-$rel_id-$pkgver.tar.gz)
- depends=('gtk+2' 'ocaml=3.11.1' 'lablgtk2=2.12.0' 'gtksourceview=2.10.1' 
'lablgtk2-gtksourceview1=2.12.0' 'lablgtk2-gnomecanvas=2.12.0' 
'apron=0.9.10')
-depends=('gtksourceview' 'libgnomecanvas')
++depends=('gtksourceview=2.10.1' 'libgnomecanvas')
+ makedepends=('lablgtk2-gtksourceview2' 'lablgtk2-gnomecanvas' 'apron=0.9.10' 
'ocamlgraph' 'ocamlgraph-viewer')
options=('scriptlet')
groups=('xapps-extra')
archs=('i686' 'x86_64')
diff --cc source/xapps/mplayer/FrugalBuild
index c6eb8ee,eea37a0..d0232e1
--- a/source/xapps/mplayer/FrugalBuild
+++ b/source/xapps/mplayer/FrugalBuild
@@@ -9,16 -9,14 +9,14 @@@ _F_archive_name=MPlaye
pkgver=1.0rc2
Fuse $USE_DEVEL  pkgver=1.0rc2.29962
pkgextraver=.29962
- pkgrel=18
-pkgrel=17
++pkgrel=19
Fuse $USE_DEVEL  pkgrel=1
pkgdesc=The Movie Player
url=http://www.mplayerhq.hu/;
- depends=('libstdc++' 'live' 'lzo' \
-'gtk+2=2.20.0-2' 'libgl' 'libsm' 'libxinerama' 'libxv' 'libxxf86dga' 
'ncurses' 'sdl' \
-'libdv' 'libtheora' 'vidix' 'x264=20090416' 'xvidcore' \
-'libgif' 'libjpeg=8a' 'libpng=1.4.1' \
-'aalib' 'cdparanoia' 'lame' 'libmad' 'openal=1.12.854' 'opencore-amr' 
\
-'fontconfig' 'dejavu-ttf' )
+ depends=('mesa' 'fontconfig' 'libstdc++' 'libdv' 'termcap' 'libjpeg' 'libmad' 
\
+'libungif' 'xvidcore' 'libpng' 'sdl' 'lame' 'libxv' 'lzo' 'libsm' \
-'libxinerama' 'libtheora' 'cdparanoia' 'libxxf86dga' 'live' 
'gtk+2=2.20.0' \
++   'libxinerama' 'libtheora' 'cdparanoia' 'libxxf86dga' 'live' 
'gtk+2=2.20.0-2' \
+'x264=20100414' 'dejavu-ttf' 'openal=1.12.854' 'vidix' 
'opencore-amr' 'aalib')
[ $CARCH == i686 ]  depends=(${depen...@]} 'codecs')
[ $CARCH != ppc ]  depends=(${depen...@]} 'liblirc')
groups=('xapps')
diff --cc source/xlib-extra/lablgtk2/FrugalBuild
index 4e5568b,21c7e28..a08cfe2
---

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

2010-04-23 Thread Miklos Vajna 
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=imgrebuild.git;a=commitdiff;h=271269021abb698f211517a8316bbf812c2ade8f

commit 271269021abb698f211517a8316bbf812c2ade8f
Merge: 14d7266 946106e
Author: Miklos Vajna vmik...@frugalware.org
Date:   Fri Apr 23 12:41:30 2010 +0200

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

* 'master' of git.frugalware.org:/pub/frugalware/frugalware-current (56 commits)
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git