[arch-commits] Commit in quodlibet/repos (4 files)

[Eric Bélanger]

    Date: Wednesday, July 8, 2009 @ 22:04:06
  Author: eric
Revision: 45292

Merged revisions 45291 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/quodlibet/trunk

........
  r45291 | eric | 2009-07-08 22:03:51 -0400 (Wed, 08 Jul 2009) | 2 lines
  
  upgpkg: quodlibet 2.1-1
      Upstream update, Removed old patch
........

Modified:
  quodlibet/repos/extra-x86_64/	(properties)
  quodlibet/repos/extra-x86_64/ChangeLog
  quodlibet/repos/extra-x86_64/PKGBUILD
Deleted:
  quodlibet/repos/extra-x86_64/quodlibet-2.0-python26.patch

------------------------------+
 ChangeLog                    |    5 +++++
 PKGBUILD                     |   19 +++++++++----------
 quodlibet-2.0-python26.patch |   27 ---------------------------
 3 files changed, 14 insertions(+), 37 deletions(-)


Property changes on: quodlibet/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /quodlibet/trunk:1-26429
   + /quodlibet/trunk:1-45291

Modified: extra-x86_64/ChangeLog
===================================================================
--- extra-x86_64/ChangeLog	2009-07-09 02:03:51 UTC (rev 45291)
+++ extra-x86_64/ChangeLog	2009-07-09 02:04:06 UTC (rev 45292)
@@ -1,3 +1,8 @@
+2009-07-08  Eric Belanger  <eric at archlinux.org>
+
+	* quodlibet 2.1-1
+	* Upstream update
+
 2009-02-07  Eric Belanger  <eric at archlinux.org>
 
 	* quodlibet 2.0-4

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-07-09 02:03:51 UTC (rev 45291)
+++ extra-x86_64/PKGBUILD	2009-07-09 02:04:06 UTC (rev 45292)
@@ -2,8 +2,8 @@
 # Maintainer: Eric Belanger <eric at archlinux.org>
 
 pkgname=quodlibet
-pkgver=2.0
-pkgrel=4
+pkgver=2.1
+pkgrel=1
 pkgdesc="An audio player written in pygtk"
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -12,15 +12,14 @@
 makedepends=('intltool')
 optdepends=('gstreamer0.10-ffmpeg: for ffmpeg (ASF/WMA) support ' 'gstreamer0.10-bad-plugins: for MPEG-4 (AAC) and Musepack support' 'dbus-python: for dbus support' 'libgpod: for ipod support' 'python-feedparser: for audio feeds (podcast) support' 'hal: for media devices support')
 options=('!makeflags')
-source=(http://quodlibet.googlecode.com/files/${pkgname}-${pkgver}.tar.gz \
-        quodlibet-2.0-python26.patch)
-md5sums=('4ec9703b3ef7ecf5c6ecf1b8ac7773f4' 'd83e61e59216656ef5d84091dafa287f')
+source=(http://quodlibet.googlecode.com/files/${pkgname}-${pkgver}.tar.gz)
+md5sums=('abd362699a7118c7720c13fbda0c8c9e')
+sha1sums=('15a40c054955d1ad539432a265b2c96225b864c2')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np1 -i $srcdir/quodlibet-2.0-python26.patch || return 1
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./setup.py build || return 1
-  ./setup.py install --prefix=${pkgdir}/usr || return 1
-  install -D -m644 quodlibet/images/exfalso.png ${pkgdir}/usr/share/pixmaps/exfalso.png || return 1
-  install -D -m644 quodlibet/images/quodlibet.png ${pkgdir}/usr/share/pixmaps/quodlibet.png || return 1
+  ./setup.py install --prefix="${pkgdir}/usr" || return 1
+  install -D -m644 quodlibet/images/exfalso.png "${pkgdir}/usr/share/pixmaps/exfalso.png" || return 1
+  install -D -m644 quodlibet/images/quodlibet.png "${pkgdir}/usr/share/pixmaps/quodlibet.png" || return 1
 }

Deleted: extra-x86_64/quodlibet-2.0-python26.patch
===================================================================
--- extra-x86_64/quodlibet-2.0-python26.patch	2009-07-09 02:03:51 UTC (rev 45291)
+++ extra-x86_64/quodlibet-2.0-python26.patch	2009-07-09 02:04:06 UTC (rev 45292)
@@ -1,27 +0,0 @@
-Index: quodlibet/gdist/core.py
-===================================================================
---- quodlibet/gdist/core.py	(revision 4331)
-+++ quodlibet/gdist/core.py	(working copy)
-@@ -10,7 +10,7 @@
- This module exists to avoid circular imports within gdist.
- """
- 
--import os
-+import os, subprocess
- 
- from distutils.core import Command
- 
-@@ -26,8 +26,11 @@
-         self.po_directory = self.distribution.po_directory
- 
-     def capture(self, args):
--        write, read = os.popen2(args, mode="r")
--        return read.read()
-+        p = subprocess.Popen(args, stdout=subprocess.PIPE)
-+        ret = p.wait()
-+        if ret != 0:
-+            raise SystemExit("External program %s exited with error %d." % (args[0], ret))
-+        return p.stdout.read()
- 
-     def check_po(self):
-         """Exit if translation is needed and not available"""