Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=33c6c33ca810ce399e81dda966720fba6a6be475
commit 33c6c33ca810ce399e81dda966720fba6a6be475
Merge: 10a3989 b0943d0
Author: Baste <ba...@frugalware.org>
Date: Tue Sep 29 11:07:29 2015 +0200
Merge ../current
diff --cc source/lib-extra/libgit2/FrugalBuild
index 2cddc9e,69ee611..44b2d97
--- a/source/lib-extra/libgit2/FrugalBuild
+++ b/source/lib-extra/libgit2/FrugalBuild
@@@ -5,7 -5,7 +5,7 @@@ options+=('asneeded'
pkgname=libgit2
pkgver=0.23.2
--pkgrel=1
++pkgrel=2
pkgdesc="portable, pure C implementation of the Git core methods"
url="http://libgit2.github.com/";
archs=('i686' 'x86_64')
diff --cc source/xmultimedia/gst1-plugins-good/FrugalBuild
index 6ee5b3d,91340f8..1e08d06
--- a/source/xmultimedia/gst1-plugins-good/FrugalBuild
+++ b/source/xmultimedia/gst1-plugins-good/FrugalBuild
@@@ -7,11 -7,11 +7,16 @@@ options+=('asneeded'
pkgname=gst1-plugins-good
_F_archive_name="gst-plugins-good"
++<<<<<<< HEAD
+pkgver=1.6.0
+pkgrel=1
++=======
+ pkgver=1.4.5
+ pkgrel=5
++>>>>>>> b0943d07d87b2f03f246afc0132fc9f0589f604b
pkgdesc="Plugins for GStreamer (Good)"
url="http://gstreamer.freedesktop.org/";
-depends=('gst1-plugins-base>=1.4.3' 'gstreamer1>=1.4.3' 'zlib' 'orc')
+depends=('gst1-plugins-base>=1.6.0' 'gstreamer1>=1.6.0' 'zlib' 'orc')
makedepends=('gtk-doc' 'pyxml' 'gconf>=2.28.0' 'esd>=0.2.41' 'ladspa_sdk'
'speex>=1.2beta3.2' 'libshout' 'aalib' \
'libjpeg' 'flac>=1.1.3' 'libavc1394' 'libpng>=1.4.1' 'libdv' 'cairo' \
'liboil>=0.3.14' 'taglib>=1.5' 'libiec61883' 'libcaca' \
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
