Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=dex77stuff.git;a=commitdiff;h=40839a15c06ef016ab045b23e95e5303d5e45e24
commit 40839a15c06ef016ab045b23e95e5303d5e45e24 Merge: 67a6be1 b80be24 Author: kikadf <[email protected]> Date: Thu Feb 26 12:50:23 2015 +0100 Merge branch 'master' of git.frugalware.org:/home/ftp/pub/frugalware/frugalware-current diff --cc source/base/glibc/FrugalBuild index 5b27215,9741366..6b9ad4e --- a/source/base/glibc/FrugalBuild +++ b/source/base/glibc/FrugalBuild @@@ -3,8 -3,8 +3,13 @@@ # Contributor: Miklos Vajna <[email protected]> pkgname=glibc ++<<<<<<< HEAD +pkgver=2.21 +pkgrel=1 ++======= + pkgver=2.19 + pkgrel=5 ++>>>>>>> b80be248fc6c1eb847888c10d04738a25f18f12b pkgdesc="GNU C Library" url="http://www.gnu.org/software/libc/libc.html" depends=() @@@ -19,16 -19,13 +24,24 @@@ _dlurl="http://ftp.gnu.org/pub/gnu/glib source=($_dlurl/glibc-$pkgver.tar.xz) signatures=($_dlurl/glibc-$pkgver.tar.xz.sig) ++<<<<<<< HEAD +# FSA and bugfix *** +source=(${source[@]} glibc-2.21-roundup.patch) +signatures=(${signatures[@]} '') ++======= + # FSA fix *** + source=(${source[@]} CVE-2014-0475.patch CVE-2014-5119.patch CVE-2014-4043.patch + CVE-2014-6040.patch CVE-2014-7817.patch CVE-2012-3406.patch + CVE-2014-9402.patch CVE-2015-1472-1473.patch) + signatures=(${signatures[@]} '' '' '' '' '' '' '' '') ++>>>>>>> b80be248fc6c1eb847888c10d04738a25f18f12b # *********** +subpkgs=("$pkgname-memusagestat") +subdescs=("glibc memusagestat utility") +subdepends=('gd') +subgroups=('docs-extra') +subarchs=('i686 x86_64 arm') build() { diff --cc source/kde-extra/kid3/FrugalBuild index 7d069e4,29ff10c..49b602e --- a/source/kde-extra/kid3/FrugalBuild +++ b/source/kde-extra/kid3/FrugalBuild @@@ -5,7 -5,7 +5,11 @@@ options+=('asneeded' pkgname=kid3 pkgver=3.1.2 ++<<<<<<< HEAD +pkgrel=3 ++======= + pkgrel=2 ++>>>>>>> b80be248fc6c1eb847888c10d04738a25f18f12b pkgdesc="An MP3, Ogg/Vorbis and FLAC tag editor for KDE." Finclude kde sourceforge depends=('phonon' 'id3lib' 'libmp4v2>=2.0.0' 'taglib' 'attica>=0.4.0' "libnepomuk>=$_F_kde_ver" 'chromaprint>=0.7-2') diff --cc source/kde/kdemultimedia/FrugalBuild index 290cefa,16d14af..fa2e8f9 --- a/source/kde/kdemultimedia/FrugalBuild +++ b/source/kde/kdemultimedia/FrugalBuild @@@ -4,7 -4,7 +4,11 @@@ options+=('asneeded') pkgname=kdemultimedia ++<<<<<<< HEAD +pkgrel=5 ++======= + pkgrel=3 ++>>>>>>> b80be248fc6c1eb847888c10d04738a25f18f12b pkgdesc="KDE Multimedia Programs" groups=('kde') subpkgs=() @@@ -42,7 -42,7 +46,11 @@@ subarchs=("${subarchs[@]}" 'i686 x86_64 subpkgs=("${subpkgs[@]}" "juk") subdescs=("${subdescs[@]}" "Jukebox and music manager for KDE") ++<<<<<<< HEAD +subdepends=("${subdepends[@]}" "libkde3support>=$_F_kde_ver phonon taglib libpulse>=6.0") ++======= + subdepends=("${subdepends[@]}" "libkde3support>=$_F_kde_ver phonon taglib libpulse>=5.0") ++>>>>>>> b80be248fc6c1eb847888c10d04738a25f18f12b subgroups=("${subgroups[@]}" 'kde') subreplaces=("${subreplaces[@]}" '') subarchs=("${subarchs[@]}" 'i686 x86_64') diff --cc source/xmultimedia-extra/clipgrab/FrugalBuild index d05c41f,9e93067..42cad75 --- a/source/xmultimedia-extra/clipgrab/FrugalBuild +++ b/source/xmultimedia-extra/clipgrab/FrugalBuild @@@ -5,7 -5,7 +5,11 @@@ options+=('asneeded' pkgname=clipgrab pkgver=3.4.9 ++<<<<<<< HEAD +pkgrel=2 ++======= + pkgrel=1 ++>>>>>>> b80be248fc6c1eb847888c10d04738a25f18f12b pkgdesc="ClipGrab is a free downloader and converter for YouTube, Vimeo, Dailymotion and many other online video sites." url="http://clipgrab.de/en" _F_desktop_name="ClipGrab" _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
