Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=dex77stuff.git;a=commitdiff;h=e292b4ec8766c6f9b5f361b0fa7a02b4824a2f6f
commit e292b4ec8766c6f9b5f361b0fa7a02b4824a2f6f Author: kikadf <[email protected]> Date: Sat Feb 21 19:19:16 2015 +0100 kid3-3.1.2-2-x86_64 * Version bump diff --git a/source/apps-extra/avidemux-cli/FrugalBuild b/source/apps-extra/avidemux-cli/FrugalBuild index d3029ec..1206a7e 100644 --- a/source/apps-extra/avidemux-cli/FrugalBuild +++ b/source/apps-extra/avidemux-cli/FrugalBuild @@ -5,11 +5,7 @@ options+=('asneeded') pkgname=avidemux-cli pkgver=2.6.8 -<<<<<<< HEAD pkgrel=5 -======= -pkgrel=3 ->>>>>>> 341de97fb84524accfccd92fe4920d9c75511903 pkgdesc="A tool to edit video (filter/re-encode/split)" depends=('glibc') rodepends=("avidemux-core=$pkgver") diff --git a/source/apps-extra/mplayer2/FrugalBuild b/source/apps-extra/mplayer2/FrugalBuild index 4cac6c6..5e95bff 100644 --- a/source/apps-extra/mplayer2/FrugalBuild +++ b/source/apps-extra/mplayer2/FrugalBuild @@ -5,11 +5,7 @@ options+=('asneeded') pkgname=mplayer2 pkgver=20130428.g6c87a98 -<<<<<<< HEAD pkgrel=12 -======= -pkgrel=10 ->>>>>>> 341de97fb84524accfccd92fe4920d9c75511903 pkgdesc="Mplayer2 is an advanced general-purpose video player. A fork of the original MPlayer project." url="http://www.mplayer2.org/"; depends=('aalib' 'cdparanoia' 'dejavu-ttf' 'faad2' 'ffmpeg>=2.5.1' 'jack' \ diff --git a/source/devel-extra/boost/FrugalBuild b/source/devel-extra/boost/FrugalBuild index bc654b4..253829a 100644 --- a/source/devel-extra/boost/FrugalBuild +++ b/source/devel-extra/boost/FrugalBuild @@ -6,11 +6,7 @@ pkgname=boost pkgver=1.50.0 -<<<<<<< HEAD pkgrel=5 -======= -pkgrel=4 ->>>>>>> 341de97fb84524accfccd92fe4920d9c75511903 pkgdesc="Boost header files , examples and tools" _F_sourceforge_ext=".tar.bz2" Finclude sourceforge python @@ -26,10 +22,6 @@ source=(${source/-$pkgver/_${pkgver//./_}} _F_cd_path="${pkgname}_`echo $pkgver|tr . _`" sha1sums=('ee06f89ed472cf369573f8acf9819fbc7173344e' \ '9cb9625c5c1c87505d5a75d16aaf2cc188e9a40c') -<<<<<<< HEAD - -======= ->>>>>>> 341de97fb84524accfccd92fe4920d9c75511903 subpkgs=("libboost" "libboost-static") subdescs=('Boost libraries.' 'Boost libraries statically linked.') diff --git a/source/kde-extra/kid3/FrugalBuild b/source/kde-extra/kid3/FrugalBuild index fe39d14..0635e59 100644 --- a/source/kde-extra/kid3/FrugalBuild +++ b/source/kde-extra/kid3/FrugalBuild @@ -4,13 +4,8 @@ options+=('asneeded') pkgname=kid3 -<<<<<<< HEAD -pkgver=3.1.1 -pkgrel=3 -======= pkgver=3.1.2 -pkgrel=1 ->>>>>>> 341de97fb84524accfccd92fe4920d9c75511903 +pkgrel=2 pkgdesc="An MP3, Ogg/Vorbis and FLAC tag editor for KDE." Finclude kde sourceforge depends=('phonon' 'id3lib' 'libtunepimp' 'attica>=0.4.0' "libnepomuk>=$_F_kde_ver" 'chromaprint>=0.7-2') _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
