[arch-commits] Commit in mkvtoolnix/repos (extra-x86_64 extra-x86_64/PKGBUILD)

[Eric Belanger]

    Date: Tuesday, September 30, 2008 @ 22:56:09
  Author: eric
Revision: 14008

fixing svn conflict

Modified:
  mkvtoolnix/repos/extra-x86_64/	(properties)
  mkvtoolnix/repos/extra-x86_64/PKGBUILD

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


Property changes on: mkvtoolnix/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /mkvtoolnix/trunk:1
   + /mkvtoolnix/trunk:1-14006

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-10-01 02:53:05 UTC (rev 14007)
+++ extra-x86_64/PKGBUILD	2008-10-01 02:56:09 UTC (rev 14008)
@@ -1,16 +1,17 @@
 # $Id$
-# Maintainer: damir <damir at archlinux.org>
-# Contributor 03/08/04 <lefungus at altern.org>
+# Maintainer: Giovanni Scafora <giovanni at archlinux.org>
+# Contributor: 03/08/04 <lefungus at altern.org>
 
 pkgname=mkvtoolnix
-pkgver=2.2.0
+pkgver=2.3.0
 pkgrel=1
 pkgdesc="Set of tools to create, edit and inspect Matroska files"
-arch=("i686" "x86_64")
-license=('GPL')
+arch=('i686' 'x86_64')
+license=('GPL2')
 url="http://www.bunkus.org/videotools/mkvtoolnix/index.html"
-depends=('libmatroska>=0.8.1' 'flac>=1.1.4' 'libvorbis' 'bzip2' 'wxgtk>=2.8.0.1' 'file' 'pcre')
+depends=('libmatroska>=0.8.1' 'flac>=1.1.4' 'libvorbis' 'wxgtk>=2.8.0.1' 'file' 'boost' 'lzo2')
 source=("http://www.bunkus.org/videotools/${pkgname}/sources/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('c50060111ee8e41d73a3cc8b264eec15')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}/
@@ -18,5 +19,3 @@
   make  || return 1
   make DESTDIR=${startdir}/pkg install
 }
-
-md5sums=('57397800c6be11db0b62e7285c8dab82')