[arch-commits] Commit in sonata/repos (12 files)
Allan McRae
allan at archlinux.org
Wed Oct 17 10:21:28 UTC 2012
Date: Wednesday, October 17, 2012 @ 06:21:28
Author: allan
Revision: 169044
db-move: moved sonata from [testing] to [extra] (i686, x86_64)
Added:
sonata/repos/extra-i686/PKGBUILD
(from rev 168989, sonata/repos/testing-i686/PKGBUILD)
sonata/repos/extra-i686/info.py.patch
(from rev 168989, sonata/repos/testing-i686/info.py.patch)
sonata/repos/extra-x86_64/PKGBUILD
(from rev 168989, sonata/repos/testing-x86_64/PKGBUILD)
sonata/repos/extra-x86_64/info.py.patch
(from rev 168989, sonata/repos/testing-x86_64/info.py.patch)
Deleted:
sonata/repos/extra-i686/ChangeLog
sonata/repos/extra-i686/PKGBUILD
sonata/repos/extra-i686/info.py.patch
sonata/repos/extra-x86_64/ChangeLog
sonata/repos/extra-x86_64/PKGBUILD
sonata/repos/extra-x86_64/info.py.patch
sonata/repos/testing-i686/
sonata/repos/testing-x86_64/
----------------------------+
extra-i686/ChangeLog | 16 -----------
extra-i686/PKGBUILD | 60 +++++++++++++++++++++----------------------
extra-i686/info.py.patch | 30 ++++++++++-----------
extra-x86_64/ChangeLog | 16 -----------
extra-x86_64/PKGBUILD | 60 +++++++++++++++++++++----------------------
extra-x86_64/info.py.patch | 30 ++++++++++-----------
6 files changed, 90 insertions(+), 122 deletions(-)
Deleted: extra-i686/ChangeLog
===================================================================
--- extra-i686/ChangeLog 2012-10-17 10:21:26 UTC (rev 169043)
+++ extra-i686/ChangeLog 2012-10-17 10:21:28 UTC (rev 169044)
@@ -1,16 +0,0 @@
-2011-07-26 Angel Velasquez <angvp at archlinux.org>
- * sonata 1.6.2.1-7:
- Applied patch to pull lyrics FS#25036
-
-2009-03-30 Alexander Fehr <pizzapunk gmail com>
-
- * sonata-1.6-1:
- New upstream release.
-
-2008-09-15 Alexander Fehr <pizzapunk gmail com>
-
- * sonata-1.5.3-1:
- New upstream release.
- New maintainer.
- Replaced install file with optdepends.
- Added ChangeLog.
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2012-10-17 10:21:26 UTC (rev 169043)
+++ extra-i686/PKGBUILD 2012-10-17 10:21:28 UTC (rev 169044)
@@ -1,30 +0,0 @@
-# $Id$
-# Maintainer: Angel Velasquez <angvp at archlinux.org>
-# Contributor: William Rea <sillywilly at gmail.com>
-
-pkgname=sonata
-pkgver=1.6.2.1
-pkgrel=7
-pkgdesc="Elegant GTK+ music client for MPD"
-arch=('i686' 'x86_64')
-url="http://sonata.berlios.de/"
-license=('GPL3')
-depends=('pygtk' 'python-mpd')
-optdepends=('gnome-python-extras: Enhanced system tray support'
- 'tagpy: Metadata editing support'
- 'dbus-python: Various extra functionality (e.g. multimedia keys support)')
-source=(http://download.berlios.de/${pkgname}/${pkgname}-$pkgver.tar.gz
- info.py.patch)
-changelog=ChangeLog
-md5sums=('0b912325e7175abad3bf6c0edc071e05'
- '595fcf7615035829b264afecb5a1beeb')
-
-build() {
- cd "$srcdir/${pkgname}-$pkgver"
- patch -Np0 -i $srcdir/info.py.patch
-}
-
-package() {
- cd "$srcdir/${pkgname}-$pkgver"
- python2 setup.py install --prefix=/usr --optimize 1 --root="$pkgdir"
-}
Copied: sonata/repos/extra-i686/PKGBUILD (from rev 168989, sonata/repos/testing-i686/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-10-17 10:21:28 UTC (rev 169044)
@@ -0,0 +1,30 @@
+# $Id$
+# Maintainer: Angel Velasquez <angvp at archlinux.org>
+# Contributor: William Rea <sillywilly at gmail.com>
+
+pkgname=sonata
+pkgver=1.6.2.1
+pkgrel=8
+pkgdesc="Elegant GTK+ music client for MPD"
+arch=('i686' 'x86_64')
+url="http://sonata.berlios.de/"
+license=('GPL3')
+depends=('pygtk' 'python2-mpd')
+optdepends=('gnome-python-extras: Enhanced system tray support'
+ 'tagpy: Metadata editing support'
+ 'python2-dbus: Various extra functionality (e.g. multimedia keys support)')
+source=(http://download.berlios.de/${pkgname}/${pkgname}-$pkgver.tar.gz
+ info.py.patch)
+md5sums=('0b912325e7175abad3bf6c0edc071e05'
+ '595fcf7615035829b264afecb5a1beeb')
+
+build() {
+ cd "$srcdir/${pkgname}-$pkgver"
+ patch -Np0 -i "$srcdir/info.py.patch"
+ sed -i 's|/usr/bin/env python|/usr/bin/env python2|' sonata/breadcrumbs.py
+}
+
+package() {
+ cd "$srcdir/${pkgname}-$pkgver"
+ python2 setup.py install --prefix=/usr --optimize 1 --root="$pkgdir"
+}
Deleted: extra-i686/info.py.patch
===================================================================
--- extra-i686/info.py.patch 2012-10-17 10:21:26 UTC (rev 169043)
+++ extra-i686/info.py.patch 2012-10-17 10:21:28 UTC (rev 169044)
@@ -1,15 +0,0 @@
---- sonata/info.py 2011-07-05 22:32:08.452556016 -0500
-+++ sonata/info.py 2011-07-05 22:45:50.849311466 -0500
-@@ -393,9 +393,9 @@
- if content.startswith("#REDIRECT [["):
- addr = "http://lyricwiki.org/index.php?title=%s&action=edit" % urllib.quote(content.split("[[")[1].split("]]")[0])
- content = urllib.urlopen(addr).read()
-- lyrics = content.split("<lyrics>")[1].split("</lyrics>")[0]
-- if lyrics.strip() != "<!-- PUT LYRICS HERE (and delete this entire line) -->":
-- lyrics = misc.unescape_html(lyrics)
-+ content = misc.unescape_html(content)
-+ lyrics = content.split("<lyrics>")[1].split("</lyrics>")[0].strip()
-+ if lyrics.strip() != "<!-- PUT LYRICS HERE (and delete this entire line) -->":
- lyrics = misc.wiki_to_html(lyrics)
- lyrics = lyrics.decode("utf-8")
- # Save lyrics to file:
Copied: sonata/repos/extra-i686/info.py.patch (from rev 168989, sonata/repos/testing-i686/info.py.patch)
===================================================================
--- extra-i686/info.py.patch (rev 0)
+++ extra-i686/info.py.patch 2012-10-17 10:21:28 UTC (rev 169044)
@@ -0,0 +1,15 @@
+--- sonata/info.py 2011-07-05 22:32:08.452556016 -0500
++++ sonata/info.py 2011-07-05 22:45:50.849311466 -0500
+@@ -393,9 +393,9 @@
+ if content.startswith("#REDIRECT [["):
+ addr = "http://lyricwiki.org/index.php?title=%s&action=edit" % urllib.quote(content.split("[[")[1].split("]]")[0])
+ content = urllib.urlopen(addr).read()
+- lyrics = content.split("<lyrics>")[1].split("</lyrics>")[0]
+- if lyrics.strip() != "<!-- PUT LYRICS HERE (and delete this entire line) -->":
+- lyrics = misc.unescape_html(lyrics)
++ content = misc.unescape_html(content)
++ lyrics = content.split("<lyrics>")[1].split("</lyrics>")[0].strip()
++ if lyrics.strip() != "<!-- PUT LYRICS HERE (and delete this entire line) -->":
+ lyrics = misc.wiki_to_html(lyrics)
+ lyrics = lyrics.decode("utf-8")
+ # Save lyrics to file:
Deleted: extra-x86_64/ChangeLog
===================================================================
--- extra-x86_64/ChangeLog 2012-10-17 10:21:26 UTC (rev 169043)
+++ extra-x86_64/ChangeLog 2012-10-17 10:21:28 UTC (rev 169044)
@@ -1,16 +0,0 @@
-2011-07-26 Angel Velasquez <angvp at archlinux.org>
- * sonata 1.6.2.1-7:
- Applied patch to pull lyrics FS#25036
-
-2009-03-30 Alexander Fehr <pizzapunk gmail com>
-
- * sonata-1.6-1:
- New upstream release.
-
-2008-09-15 Alexander Fehr <pizzapunk gmail com>
-
- * sonata-1.5.3-1:
- New upstream release.
- New maintainer.
- Replaced install file with optdepends.
- Added ChangeLog.
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2012-10-17 10:21:26 UTC (rev 169043)
+++ extra-x86_64/PKGBUILD 2012-10-17 10:21:28 UTC (rev 169044)
@@ -1,30 +0,0 @@
-# $Id$
-# Maintainer: Angel Velasquez <angvp at archlinux.org>
-# Contributor: William Rea <sillywilly at gmail.com>
-
-pkgname=sonata
-pkgver=1.6.2.1
-pkgrel=7
-pkgdesc="Elegant GTK+ music client for MPD"
-arch=('i686' 'x86_64')
-url="http://sonata.berlios.de/"
-license=('GPL3')
-depends=('pygtk' 'python-mpd')
-optdepends=('gnome-python-extras: Enhanced system tray support'
- 'tagpy: Metadata editing support'
- 'dbus-python: Various extra functionality (e.g. multimedia keys support)')
-source=(http://download.berlios.de/${pkgname}/${pkgname}-$pkgver.tar.gz
- info.py.patch)
-changelog=ChangeLog
-md5sums=('0b912325e7175abad3bf6c0edc071e05'
- '595fcf7615035829b264afecb5a1beeb')
-
-build() {
- cd "$srcdir/${pkgname}-$pkgver"
- patch -Np0 -i $srcdir/info.py.patch
-}
-
-package() {
- cd "$srcdir/${pkgname}-$pkgver"
- python2 setup.py install --prefix=/usr --optimize 1 --root="$pkgdir"
-}
Copied: sonata/repos/extra-x86_64/PKGBUILD (from rev 168989, sonata/repos/testing-x86_64/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2012-10-17 10:21:28 UTC (rev 169044)
@@ -0,0 +1,30 @@
+# $Id$
+# Maintainer: Angel Velasquez <angvp at archlinux.org>
+# Contributor: William Rea <sillywilly at gmail.com>
+
+pkgname=sonata
+pkgver=1.6.2.1
+pkgrel=8
+pkgdesc="Elegant GTK+ music client for MPD"
+arch=('i686' 'x86_64')
+url="http://sonata.berlios.de/"
+license=('GPL3')
+depends=('pygtk' 'python2-mpd')
+optdepends=('gnome-python-extras: Enhanced system tray support'
+ 'tagpy: Metadata editing support'
+ 'python2-dbus: Various extra functionality (e.g. multimedia keys support)')
+source=(http://download.berlios.de/${pkgname}/${pkgname}-$pkgver.tar.gz
+ info.py.patch)
+md5sums=('0b912325e7175abad3bf6c0edc071e05'
+ '595fcf7615035829b264afecb5a1beeb')
+
+build() {
+ cd "$srcdir/${pkgname}-$pkgver"
+ patch -Np0 -i "$srcdir/info.py.patch"
+ sed -i 's|/usr/bin/env python|/usr/bin/env python2|' sonata/breadcrumbs.py
+}
+
+package() {
+ cd "$srcdir/${pkgname}-$pkgver"
+ python2 setup.py install --prefix=/usr --optimize 1 --root="$pkgdir"
+}
Deleted: extra-x86_64/info.py.patch
===================================================================
--- extra-x86_64/info.py.patch 2012-10-17 10:21:26 UTC (rev 169043)
+++ extra-x86_64/info.py.patch 2012-10-17 10:21:28 UTC (rev 169044)
@@ -1,15 +0,0 @@
---- sonata/info.py 2011-07-05 22:32:08.452556016 -0500
-+++ sonata/info.py 2011-07-05 22:45:50.849311466 -0500
-@@ -393,9 +393,9 @@
- if content.startswith("#REDIRECT [["):
- addr = "http://lyricwiki.org/index.php?title=%s&action=edit" % urllib.quote(content.split("[[")[1].split("]]")[0])
- content = urllib.urlopen(addr).read()
-- lyrics = content.split("<lyrics>")[1].split("</lyrics>")[0]
-- if lyrics.strip() != "<!-- PUT LYRICS HERE (and delete this entire line) -->":
-- lyrics = misc.unescape_html(lyrics)
-+ content = misc.unescape_html(content)
-+ lyrics = content.split("<lyrics>")[1].split("</lyrics>")[0].strip()
-+ if lyrics.strip() != "<!-- PUT LYRICS HERE (and delete this entire line) -->":
- lyrics = misc.wiki_to_html(lyrics)
- lyrics = lyrics.decode("utf-8")
- # Save lyrics to file:
Copied: sonata/repos/extra-x86_64/info.py.patch (from rev 168989, sonata/repos/testing-x86_64/info.py.patch)
===================================================================
--- extra-x86_64/info.py.patch (rev 0)
+++ extra-x86_64/info.py.patch 2012-10-17 10:21:28 UTC (rev 169044)
@@ -0,0 +1,15 @@
+--- sonata/info.py 2011-07-05 22:32:08.452556016 -0500
++++ sonata/info.py 2011-07-05 22:45:50.849311466 -0500
+@@ -393,9 +393,9 @@
+ if content.startswith("#REDIRECT [["):
+ addr = "http://lyricwiki.org/index.php?title=%s&action=edit" % urllib.quote(content.split("[[")[1].split("]]")[0])
+ content = urllib.urlopen(addr).read()
+- lyrics = content.split("<lyrics>")[1].split("</lyrics>")[0]
+- if lyrics.strip() != "<!-- PUT LYRICS HERE (and delete this entire line) -->":
+- lyrics = misc.unescape_html(lyrics)
++ content = misc.unescape_html(content)
++ lyrics = content.split("<lyrics>")[1].split("</lyrics>")[0].strip()
++ if lyrics.strip() != "<!-- PUT LYRICS HERE (and delete this entire line) -->":
+ lyrics = misc.wiki_to_html(lyrics)
+ lyrics = lyrics.decode("utf-8")
+ # Save lyrics to file:
More information about the arch-commits
mailing list