Merge branch 'testing' of gitorious.org:chakra-packages/platform into testing

openjdk/PKGBUILD

@@ -6,7 +6,7 @@ _icedtea_release="2.2.1"
 _icedtea_jdkver="7"
 _pkgver="7u5"
 pkgver="${_pkgver}_${_icedtea_release}"
-pkgrel=1
+pkgrel=2
 pkgdesc="An open-source implementation of the seventh edition of the Java SE Platform."
 arch=('i686' 'x86_64')
 url="http://icedtea.classpath.org/"
@@ -188,9 +188,11 @@ depends=("openjdk=${pkgver}")
   install -D -m644 "openjdk.build/j2sdk-image/src.zip" \
                    "${pkgdir}/${_jvmdir#/}/src.zip"
 
-  # Install the license file
-  install -D -m644 "openjdk/LICENSE" \
-                   "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  # Not installing the license file anymore, since we depend on openjdk,
+  # which already provides it.
+  #
+  # install -D -m644 "openjdk/LICENSE" \
+  #                  "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
 
 # vim:set ts=2 sw=2 et:

phonon-backend-gstreamer/PKGBUILD

@@ -4,7 +4,7 @@
 # maintainer abveritas@chakra-project.org
 
 pkgname=('phonon-backend-gstreamer')
-pkgver=4.6.1
+pkgver=4.6.2
 pkgrel=1
 pkgdesc="Phonon GStreamer backend"
 arch=('i686' 'x86_64')
@@ -16,7 +16,7 @@ groups=("kde-complete" "kde-uninstall")
 conflicts=('phonon-gstreamer')
 replaces=('phonon-gstreamer')
 source=("http://download.kde.org/stable/phonon/phonon-backend-gstreamer/${pkgver}/src/phonon-backend-gstreamer-${pkgver}.tar.xz")
-md5sums=('c0c8a1064e32c83dd6976187dcc491a3')
+md5sums=('8c08875d10952bc5685bcec8de3acb2d')
 
 build() {
 	cd ${srcdir}
@@ -32,4 +32,3 @@ package() {
 	cd ${srcdir}/build
 	make DESTDIR=${pkgdir} install
 }
-

phonon-backend-mplayer/PKGBUILD

@@ -6,7 +6,7 @@
 pkgname=('phonon-backend-mplayer')
 _pkgname=('phonon-mplayer')
 pkgver=20120212
-pkgrel=4
+pkgrel=5
 pkgdesc='Phonon MPlayer backend'
 arch=('i686' 'x86_64')
 url='http://phonon.kde.org'

phonon-backend-vlc/PKGBUILD

@@ -5,7 +5,7 @@
 
 pkgname=('phonon-backend-vlc')
 pkgver=0.5.0
-pkgrel=4
+pkgrel=5
 pkgdesc='Phonon VLC backend'
 arch=('i686' 'x86_64')
 url='http://phonon.kde.org'