[arch-commits] Commit in gstreamer0.10-ugly/repos (extra-x86_64 extra-x86_64/PKGBUILD)

[Jan de Groot]

    Date: Sunday, June 1, 2008 @ 09:14:15
  Author: jgc
Revision: 2339

Fix conflict

Modified:
  gstreamer0.10-ugly/repos/extra-x86_64/	(properties)
  gstreamer0.10-ugly/repos/extra-x86_64/PKGBUILD

----------+
 PKGBUILD |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)


Property changes on: gstreamer0.10-ugly/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /gstreamer0.10-ugly/trunk:1
   + /gstreamer0.10-ugly/trunk:1-2338

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-06-01 13:12:40 UTC (rev 2338)
+++ extra-x86_64/PKGBUILD	2008-06-01 13:14:15 UTC (rev 2339)
@@ -2,18 +2,18 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gstreamer0.10-ugly
-pkgver=0.10.7
-pkgrel=2
+pkgver=0.10.8
+pkgrel=1
 pkgdesc="GStreamer Multimedia Framework Ugly plugin libraries"
 arch=(i686 x86_64)
 license=('LGPL')
-depends=('gstreamer0.10-base>=0.10.18-2')
+depends=('gstreamer0.10-base>=0.10.19')
 makedepends=('pkgconfig')
 url="http://gstreamer.freedesktop.org/"
 _relname=gst-plugins-ugly
 options=(!libtool)
 source=(${url}/src/${_relname}/${_relname}-${pkgver}.tar.bz2)
-md5sums=('cff4f55138d12152cf580a3ee71c2519')
+md5sums=('090d87a1716eee45a9804ca8558668da')
 
 build() {
   cd ${startdir}/src/${_relname}-${pkgver}