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

2013-02-04 Thread Alexander Rødseth 
Date: Monday, February 4, 2013 @ 11:00:06
  Author: arodseth
Revision: 83646

archrelease: copy trunk to community-x86_64, community-i686

Added:
  nicotine/repos/community-i686/PKGBUILD
(from rev 83645, nicotine/trunk/PKGBUILD)
  nicotine/repos/community-x86_64/PKGBUILD
(from rev 83645, nicotine/trunk/PKGBUILD)
Deleted:
  nicotine/repos/community-i686/PKGBUILD
  nicotine/repos/community-x86_64/PKGBUILD

---+
 community-i686/PKGBUILD   |   78 
 community-x86_64/PKGBUILD |   78 
 2 files changed, 88 insertions(+), 68 deletions(-)

Deleted: community-i686/PKGBUILD
===
--- community-i686/PKGBUILD 2013-02-04 09:59:51 UTC (rev 83645)
+++ community-i686/PKGBUILD 2013-02-04 10:00:06 UTC (rev 83646)
@@ -1,34 +0,0 @@
-# $Id$
-# Maintainer: Angel Velasquez an...@archlinux.org
-# Contributor: Hugo Doria h...@archlinux.org
-# Contributor: Andrew Wright andr...@photism.org
-
-pkgname=nicotine
-pkgver=1.2.16
-pkgrel=4
-pkgdesc=Soulseek music-sharing client, written in python
-arch=('i686' 'x86_64')
-url=http://sourceforge.net/projects/nicotine-plus/;
-license=('GPL')
-depends=('pygtk' 'mutagen')
-optdepends=('python2-geoip: to enable Geographical blocker')
-source=(http://downloads.sourceforge.net/project/nicotine-plus/nicotine-plus/${pkgver}/${pkgname}+-${pkgver}.tar.bz2)
-md5sums=('ac7433c21ef619a37e079a7ae68da94a')
-
-build() {
-  cd ${srcdir}/${pkgname}+-${pkgver}
-  sed -i -e s/Icon=nicotine-plus/Icon=nicotine-plus-32px/ 
files/nicotine.desktop # Fixing FS#22476
-  sed -i -e 's|/usr/bin/env python|/usr/bin/env python2|' \
--e 's|/usr/bin/python|/usr/bin/python2|' pynicotine/{,gtkgui/}*.py
-
-  python2 setup.py install --root=${pkgdir}
-  cd trayicon
-  python2 autogen.py
-  make 
-}
-
-package() {
-  cd ${srcdir}/${pkgname}+-${pkgver}/trayicon
-  make DESTDIR=${pkgdir} install 
-  ln -s nicotine.py ${pkgdir}/usr/bin/nicotine
-}

Copied: nicotine/repos/community-i686/PKGBUILD (from rev 83645, 
nicotine/trunk/PKGBUILD)
===
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2013-02-04 10:00:06 UTC (rev 83646)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: Alexander Rødseth rods...@gmail.com
+# Contributor: Angel Velasquez an...@archlinux.org
+# Contributor: Hugo Doria h...@archlinux.org
+# Contributor: Andrew Wright andr...@photism.org
+
+pkgname=nicotine
+pkgver=1.2.16
+pkgrel=4
+pkgdesc='Soulseek music-sharing client, written in python'
+arch=('x86_64' 'i686')
+url='http://sourceforge.net/projects/nicotine-plus/'
+license=('GPL')
+depends=('pygtk' 'mutagen')
+makedepends=('setconf')
+optdepends=('python2-geoip: to enable Geographical blocker')
+source=(http://downloads.sourceforge.net/project/nicotine-plus/nicotine-plus/${pkgver}/${pkgname}+-${pkgver}.tar.bz2;)
+sha256sums=('71e5b33e273daaf072dbf63839536c14d7ead9d149323d50eee09f7429e34c1d')
+
+build() {
+  cd $srcdir/${pkgname}+-$pkgver
+
+  # Fix for FS#22476
+  setconf files/nicotine.desktop Icon nicotine-plus-32px
+
+  # Python fix
+  sed -i -e 's|/usr/bin/env python|/usr/bin/env python2|' \
+-e 's|/usr/bin/python|/usr/bin/python2|' pynicotine/{,gtkgui/}*.py
+
+  cd trayicon
+  python2 autogen.py
+  make 
+}
+
+package() {
+  cd $srcdir/${pkgname}+-$pkgver
+
+  python2 setup.py install --root=$pkgdir
+  cd trayicon
+  make DESTDIR=$pkgdir install 
+  ln -s nicotine.py $pkgdir/usr/bin/nicotine
+}
+
+# vim:set ts=2 sw=2 et:

Deleted: community-x86_64/PKGBUILD
===
--- community-x86_64/PKGBUILD   2013-02-04 09:59:51 UTC (rev 83645)
+++ community-x86_64/PKGBUILD   2013-02-04 10:00:06 UTC (rev 83646)
@@ -1,34 +0,0 @@
-# $Id$
-# Maintainer: Angel Velasquez an...@archlinux.org
-# Contributor: Hugo Doria h...@archlinux.org
-# Contributor: Andrew Wright andr...@photism.org
-
-pkgname=nicotine
-pkgver=1.2.16
-pkgrel=4
-pkgdesc=Soulseek music-sharing client, written in python
-arch=('i686' 'x86_64')
-url=http://sourceforge.net/projects/nicotine-plus/;
-license=('GPL')
-depends=('pygtk' 'mutagen')
-optdepends=('python2-geoip: to enable Geographical blocker')
-source=(http://downloads.sourceforge.net/project/nicotine-plus/nicotine-plus/${pkgver}/${pkgname}+-${pkgver}.tar.bz2)
-md5sums=('ac7433c21ef619a37e079a7ae68da94a')
-
-build() {
-  cd ${srcdir}/${pkgname}+-${pkgver}
-  sed -i -e s/Icon=nicotine-plus/Icon=nicotine-plus-32px/ 
files/nicotine.desktop # Fixing FS#22476
-  sed -i -e 's|/usr/bin/env python|/usr/bin/env python2|' \
--e 's|/usr/bin/python|/usr/bin/python2|' pynicotine/{,gtkgui/}*.py
-
-  python2 setup.py install --root=${pkgdir}
-  cd trayicon
-  python2 autogen.py
-  make 
-}
-
-package() {
-  cd ${srcdir}/${pkgname}+-${pkgver}/trayicon
-  make DESTDIR=${pkgdir} install 
-  ln -s nicotine.py

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

2013-02-04 Thread Alexander Rødseth 
Date: Monday, February 4, 2013 @ 11:04:46
  Author: arodseth
Revision: 83656

archrelease: copy trunk to community-x86_64, community-i686

Added:
  nicotine/repos/community-i686/PKGBUILD
(from rev 83655, nicotine/trunk/PKGBUILD)
  nicotine/repos/community-x86_64/PKGBUILD
(from rev 83655, nicotine/trunk/PKGBUILD)
Deleted:
  nicotine/repos/community-i686/PKGBUILD
  nicotine/repos/community-x86_64/PKGBUILD

---+
 community-i686/PKGBUILD   |   88 ++--
 community-x86_64/PKGBUILD |   88 ++--
 2 files changed, 88 insertions(+), 88 deletions(-)

Deleted: community-i686/PKGBUILD
===
--- community-i686/PKGBUILD 2013-02-04 10:04:34 UTC (rev 83655)
+++ community-i686/PKGBUILD 2013-02-04 10:04:46 UTC (rev 83656)
@@ -1,44 +0,0 @@
-# $Id$
-# Maintainer: Alexander Rødseth rods...@gmail.com
-# Contributor: Angel Velasquez an...@archlinux.org
-# Contributor: Hugo Doria h...@archlinux.org
-# Contributor: Andrew Wright andr...@photism.org
-
-pkgname=nicotine
-pkgver=1.2.16
-pkgrel=4
-pkgdesc='Soulseek music-sharing client, written in python'
-arch=('x86_64' 'i686')
-url='http://sourceforge.net/projects/nicotine-plus/'
-license=('GPL')
-depends=('pygtk' 'mutagen')
-makedepends=('setconf')
-optdepends=('python2-geoip: to enable Geographical blocker')
-source=(http://downloads.sourceforge.net/project/nicotine-plus/nicotine-plus/${pkgver}/${pkgname}+-${pkgver}.tar.bz2;)
-sha256sums=('71e5b33e273daaf072dbf63839536c14d7ead9d149323d50eee09f7429e34c1d')
-
-build() {
-  cd $srcdir/${pkgname}+-$pkgver
-
-  # Fix for FS#22476
-  setconf files/nicotine.desktop Icon nicotine-plus-32px
-
-  # Python fix
-  sed -i -e 's|/usr/bin/env python|/usr/bin/env python2|' \
--e 's|/usr/bin/python|/usr/bin/python2|' pynicotine/{,gtkgui/}*.py
-
-  cd trayicon
-  python2 autogen.py
-  make 
-}
-
-package() {
-  cd $srcdir/${pkgname}+-$pkgver
-
-  python2 setup.py install --root=$pkgdir
-  cd trayicon
-  make DESTDIR=$pkgdir install 
-  ln -s nicotine.py $pkgdir/usr/bin/nicotine
-}
-
-# vim:set ts=2 sw=2 et:

Copied: nicotine/repos/community-i686/PKGBUILD (from rev 83655, 
nicotine/trunk/PKGBUILD)
===
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2013-02-04 10:04:46 UTC (rev 83656)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: Alexander Rødseth rods...@gmail.com
+# Contributor: Angel Velasquez an...@archlinux.org
+# Contributor: Hugo Doria h...@archlinux.org
+# Contributor: Andrew Wright andr...@photism.org
+
+pkgname=nicotine
+pkgver=1.2.16
+pkgrel=5
+pkgdesc='Soulseek music-sharing client, written in python'
+arch=('x86_64' 'i686')
+url='http://sourceforge.net/projects/nicotine-plus/'
+license=('GPL')
+depends=('pygtk' 'mutagen') #'python-sexy') TODO: Move python-sexy from AUR
+makedepends=('setconf')
+optdepends=('python2-geoip: to enable Geographical blocker')
+source=(http://downloads.sourceforge.net/project/nicotine-plus/nicotine-plus/${pkgver}/${pkgname}+-${pkgver}.tar.bz2;)
+sha256sums=('71e5b33e273daaf072dbf63839536c14d7ead9d149323d50eee09f7429e34c1d')
+
+build() {
+  cd $srcdir/${pkgname}+-$pkgver
+
+  # Fix for FS#22476
+  setconf files/nicotine.desktop Icon nicotine-plus-32px
+
+  # Python fix
+  sed -i -e 's|/usr/bin/env python|/usr/bin/env python2|' \
+-e 's|/usr/bin/python|/usr/bin/python2|' pynicotine/{,gtkgui/}*.py
+
+  cd trayicon
+  python2 autogen.py
+  make 
+}
+
+package() {
+  cd $srcdir/${pkgname}+-$pkgver
+
+  python2 setup.py install --root=$pkgdir
+  cd trayicon
+  make DESTDIR=$pkgdir install 
+  ln -s nicotine.py $pkgdir/usr/bin/nicotine
+}
+
+# vim:set ts=2 sw=2 et:

Deleted: community-x86_64/PKGBUILD
===
--- community-x86_64/PKGBUILD   2013-02-04 10:04:34 UTC (rev 83655)
+++ community-x86_64/PKGBUILD   2013-02-04 10:04:46 UTC (rev 83656)
@@ -1,44 +0,0 @@
-# $Id$
-# Maintainer: Alexander Rødseth rods...@gmail.com
-# Contributor: Angel Velasquez an...@archlinux.org
-# Contributor: Hugo Doria h...@archlinux.org
-# Contributor: Andrew Wright andr...@photism.org
-
-pkgname=nicotine
-pkgver=1.2.16
-pkgrel=4
-pkgdesc='Soulseek music-sharing client, written in python'
-arch=('x86_64' 'i686')
-url='http://sourceforge.net/projects/nicotine-plus/'
-license=('GPL')
-depends=('pygtk' 'mutagen')
-makedepends=('setconf')
-optdepends=('python2-geoip: to enable Geographical blocker')
-source=(http://downloads.sourceforge.net/project/nicotine-plus/nicotine-plus/${pkgver}/${pkgname}+-${pkgver}.tar.bz2;)
-sha256sums=('71e5b33e273daaf072dbf63839536c14d7ead9d149323d50eee09f7429e34c1d')
-
-build() {
-  cd $srcdir/${pkgname}+-$pkgver
-
-  # Fix for FS#22476
-  setconf files/nicotine.desktop Icon nicotine-plus-32px
-
-  # Python fix
-  sed -i -e 's|/usr/bin/env python|/usr/bin/env

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

2013-01-27 Thread Pierre Schmitz 
Date: Sunday, January 27, 2013 @ 17:22:44
  Author: pierre
Revision: 83168

archrelease: copy trunk to community-i686, community-x86_64

Added:
  nicotine/repos/community-i686/
  nicotine/repos/community-i686/PKGBUILD
(from rev 83167, nicotine/trunk/PKGBUILD)
  nicotine/repos/community-x86_64/
  nicotine/repos/community-x86_64/PKGBUILD
(from rev 83167, nicotine/trunk/PKGBUILD)

---+
 community-i686/PKGBUILD   |   34 ++
 community-x86_64/PKGBUILD |   34 ++
 2 files changed, 68 insertions(+)

Copied: nicotine/repos/community-i686/PKGBUILD (from rev 83167, 
nicotine/trunk/PKGBUILD)
===
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2013-01-27 16:22:44 UTC (rev 83168)
@@ -0,0 +1,34 @@
+# $Id$
+# Maintainer: Angel Velasquez an...@archlinux.org
+# Contributor: Hugo Doria h...@archlinux.org
+# Contributor: Andrew Wright andr...@photism.org
+
+pkgname=nicotine
+pkgver=1.2.16
+pkgrel=4
+pkgdesc=Soulseek music-sharing client, written in python
+arch=('i686' 'x86_64')
+url=http://sourceforge.net/projects/nicotine-plus/;
+license=('GPL')
+depends=('pygtk' 'mutagen')
+optdepends=('python2-geoip: to enable Geographical blocker')
+source=(http://downloads.sourceforge.net/project/nicotine-plus/nicotine-plus/${pkgver}/${pkgname}+-${pkgver}.tar.bz2)
+md5sums=('ac7433c21ef619a37e079a7ae68da94a')
+
+build() {
+  cd ${srcdir}/${pkgname}+-${pkgver}
+  sed -i -e s/Icon=nicotine-plus/Icon=nicotine-plus-32px/ 
files/nicotine.desktop # Fixing FS#22476
+  sed -i -e 's|/usr/bin/env python|/usr/bin/env python2|' \
+-e 's|/usr/bin/python|/usr/bin/python2|' pynicotine/{,gtkgui/}*.py
+
+  python2 setup.py install --root=${pkgdir}
+  cd trayicon
+  python2 autogen.py
+  make 
+}
+
+package() {
+  cd ${srcdir}/${pkgname}+-${pkgver}/trayicon
+  make DESTDIR=${pkgdir} install 
+  ln -s nicotine.py ${pkgdir}/usr/bin/nicotine
+}

Copied: nicotine/repos/community-x86_64/PKGBUILD (from rev 83167, 
nicotine/trunk/PKGBUILD)
===
--- community-x86_64/PKGBUILD   (rev 0)
+++ community-x86_64/PKGBUILD   2013-01-27 16:22:44 UTC (rev 83168)
@@ -0,0 +1,34 @@
+# $Id$
+# Maintainer: Angel Velasquez an...@archlinux.org
+# Contributor: Hugo Doria h...@archlinux.org
+# Contributor: Andrew Wright andr...@photism.org
+
+pkgname=nicotine
+pkgver=1.2.16
+pkgrel=4
+pkgdesc=Soulseek music-sharing client, written in python
+arch=('i686' 'x86_64')
+url=http://sourceforge.net/projects/nicotine-plus/;
+license=('GPL')
+depends=('pygtk' 'mutagen')
+optdepends=('python2-geoip: to enable Geographical blocker')
+source=(http://downloads.sourceforge.net/project/nicotine-plus/nicotine-plus/${pkgver}/${pkgname}+-${pkgver}.tar.bz2)
+md5sums=('ac7433c21ef619a37e079a7ae68da94a')
+
+build() {
+  cd ${srcdir}/${pkgname}+-${pkgver}
+  sed -i -e s/Icon=nicotine-plus/Icon=nicotine-plus-32px/ 
files/nicotine.desktop # Fixing FS#22476
+  sed -i -e 's|/usr/bin/env python|/usr/bin/env python2|' \
+-e 's|/usr/bin/python|/usr/bin/python2|' pynicotine/{,gtkgui/}*.py
+
+  python2 setup.py install --root=${pkgdir}
+  cd trayicon
+  python2 autogen.py
+  make 
+}
+
+package() {
+  cd ${srcdir}/${pkgname}+-${pkgver}/trayicon
+  make DESTDIR=${pkgdir} install 
+  ln -s nicotine.py ${pkgdir}/usr/bin/nicotine
+}

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

2012-10-08 Thread Eric Bélanger 
Date: Monday, October 8, 2012 @ 20:13:39
  Author: eric
Revision: 168342

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  nicotine/repos/extra-i686/PKGBUILD
(from rev 168341, nicotine/trunk/PKGBUILD)
  nicotine/repos/extra-x86_64/PKGBUILD
(from rev 168341, nicotine/trunk/PKGBUILD)
Deleted:
  nicotine/repos/extra-i686/PKGBUILD
  nicotine/repos/extra-x86_64/PKGBUILD

---+
 extra-i686/PKGBUILD   |   71 ++--
 extra-x86_64/PKGBUILD |   71 ++--
 2 files changed, 68 insertions(+), 74 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-10-09 00:13:22 UTC (rev 168341)
+++ extra-i686/PKGBUILD 2012-10-09 00:13:39 UTC (rev 168342)
@@ -1,37 +0,0 @@
-# $Id$
-# Maintainer: Angel Velasquez an...@archlinux.org
-# Contributor: Hugo Doria h...@archlinux.org
-# Contributor: Andrew Wright andr...@photism.org
-
-pkgname=nicotine
-pkgver=1.2.16
-pkgrel=3
-pkgdesc=Soulseek music-sharing client, written in python
-license=('GPL')
-arch=('i686' 'x86_64')
-depends=('pygtk=2.14.1' 'mutagen')
-conflicts=(nicotine-plus)
-replaces=(nicotine-plus)
-url=http://sourceforge.net/projects/nicotine-plus/;
-source=(http://downloads.sourceforge.net/project/nicotine-plus/nicotine-plus/${pkgver}/${pkgname}+-${pkgver}.tar.bz2)
-optdepends=('python-sexy: To enable spell checking'
-   'python-geoip: to enable Geographical blocker')
-md5sums=('ac7433c21ef619a37e079a7ae68da94a')
-
-
-
-
-build() {
-  cd ${srcdir}/${pkgname}+-${pkgver}
-  sed -i -e s/Icon=nicotine-plus/Icon=nicotine-plus-32px/ 
files/nicotine.desktop # Fixing FS#22476
-  python2 setup.py install --root=${pkgdir}
-  cd trayicon
-  python2 autogen.py
-  make 
-}
-
-package() {
-  cd ${srcdir}/${pkgname}+-${pkgver}/trayicon
-  make DESTDIR=${pkgdir} install 
-  ln -s nicotine.py ${pkgdir}/usr/bin/nicotine 
-}

Copied: nicotine/repos/extra-i686/PKGBUILD (from rev 168341, 
nicotine/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-10-09 00:13:39 UTC (rev 168342)
@@ -0,0 +1,34 @@
+# $Id$
+# Maintainer: Angel Velasquez an...@archlinux.org
+# Contributor: Hugo Doria h...@archlinux.org
+# Contributor: Andrew Wright andr...@photism.org
+
+pkgname=nicotine
+pkgver=1.2.16
+pkgrel=4
+pkgdesc=Soulseek music-sharing client, written in python
+arch=('i686' 'x86_64')
+url=http://sourceforge.net/projects/nicotine-plus/;
+license=('GPL')
+depends=('pygtk' 'mutagen')
+optdepends=('python2-geoip: to enable Geographical blocker')
+source=(http://downloads.sourceforge.net/project/nicotine-plus/nicotine-plus/${pkgver}/${pkgname}+-${pkgver}.tar.bz2)
+md5sums=('ac7433c21ef619a37e079a7ae68da94a')
+
+build() {
+  cd ${srcdir}/${pkgname}+-${pkgver}
+  sed -i -e s/Icon=nicotine-plus/Icon=nicotine-plus-32px/ 
files/nicotine.desktop # Fixing FS#22476
+  sed -i -e 's|/usr/bin/env python|/usr/bin/env python2|' \
+-e 's|/usr/bin/python|/usr/bin/python2|' pynicotine/{,gtkgui/}*.py
+
+  python2 setup.py install --root=${pkgdir}
+  cd trayicon
+  python2 autogen.py
+  make 
+}
+
+package() {
+  cd ${srcdir}/${pkgname}+-${pkgver}/trayicon
+  make DESTDIR=${pkgdir} install 
+  ln -s nicotine.py ${pkgdir}/usr/bin/nicotine
+}

Deleted: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2012-10-09 00:13:22 UTC (rev 168341)
+++ extra-x86_64/PKGBUILD   2012-10-09 00:13:39 UTC (rev 168342)
@@ -1,37 +0,0 @@
-# $Id$
-# Maintainer: Angel Velasquez an...@archlinux.org
-# Contributor: Hugo Doria h...@archlinux.org
-# Contributor: Andrew Wright andr...@photism.org
-
-pkgname=nicotine
-pkgver=1.2.16
-pkgrel=3
-pkgdesc=Soulseek music-sharing client, written in python
-license=('GPL')
-arch=('i686' 'x86_64')
-depends=('pygtk=2.14.1' 'mutagen')
-conflicts=(nicotine-plus)
-replaces=(nicotine-plus)
-url=http://sourceforge.net/projects/nicotine-plus/;
-source=(http://downloads.sourceforge.net/project/nicotine-plus/nicotine-plus/${pkgver}/${pkgname}+-${pkgver}.tar.bz2)
-optdepends=('python-sexy: To enable spell checking'
-   'python-geoip: to enable Geographical blocker')
-md5sums=('ac7433c21ef619a37e079a7ae68da94a')
-
-
-
-
-build() {
-  cd ${srcdir}/${pkgname}+-${pkgver}
-  sed -i -e s/Icon=nicotine-plus/Icon=nicotine-plus-32px/ 
files/nicotine.desktop # Fixing FS#22476
-  python2 setup.py install --root=${pkgdir}
-  cd trayicon
-  python2 autogen.py
-  make 
-}
-
-package() {
-  cd ${srcdir}/${pkgname}+-${pkgver}/trayicon
-  make DESTDIR=${pkgdir} install 
-  ln -s nicotine.py ${pkgdir}/usr/bin/nicotine 
-}

Copied: nicotine/repos/extra-x86_64/PKGBUILD (from rev 168341, 
nicotine/trunk/PKGBUILD)
===
--- extra-x86_64/PKGBUILD

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

2011-12-05 Thread Angel Velásquez 
Date: Tuesday, December 6, 2011 @ 01:35:08
  Author: angvp
Revision: 144457

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  nicotine/repos/extra-i686/PKGBUILD
(from rev 144456, nicotine/trunk/PKGBUILD)
  nicotine/repos/extra-x86_64/PKGBUILD
(from rev 144456, nicotine/trunk/PKGBUILD)
Deleted:
  nicotine/repos/extra-i686/PKGBUILD
  nicotine/repos/extra-x86_64/PKGBUILD

---+
 extra-i686/PKGBUILD   |   67 ++--
 extra-x86_64/PKGBUILD |   67 ++--
 2 files changed, 74 insertions(+), 60 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2011-12-06 06:34:16 UTC (rev 144456)
+++ extra-i686/PKGBUILD 2011-12-06 06:35:08 UTC (rev 144457)
@@ -1,30 +0,0 @@
-# $Id$
-# Maintainer: Angel Velasquez an...@archlinux.org
-# Contributor: Hugo Doria h...@archlinux.org
-# Contributor: Andrew Wright andr...@photism.org
-
-pkgname=nicotine
-pkgver=1.2.16
-pkgrel=2
-pkgdesc=Soulseek music-sharing client, written in python
-license=('GPL')
-arch=('i686' 'x86_64')
-depends=('pygtk=2.14.1' 'mutagen' 'python-geoip=1.2.4')
-conflicts=(nicotine-plus)
-replaces=(nicotine-plus)
-url=http://sourceforge.net/projects/nicotine-plus/;
-source=(http://downloads.sourceforge.net/project/nicotine-plus/nicotine-plus/${pkgver}/${pkgname}+-${pkgver}.tar.bz2)
-optdepends=('python-sexy: To enable spell checking'
-   'python-geoip: to enable Geographical blocker')
-md5sums=('ac7433c21ef619a37e079a7ae68da94a')
-
-build() {
-  cd ${srcdir}/${pkgname}+-${pkgver}
-  sed -i -e s/Icon=nicotine-plus/Icon=nicotine-plus-32px/ 
files/nicotine.desktop # Fixing FS#22476
-  python2 setup.py install --root=${pkgdir}
-  cd trayicon
-  python2 autogen.py
-  make 
-  make DESTDIR=${pkgdir} install 
-  ln -s nicotine.py ${pkgdir}/usr/bin/nicotine 
-}

Copied: nicotine/repos/extra-i686/PKGBUILD (from rev 144456, 
nicotine/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-12-06 06:35:08 UTC (rev 144457)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer: Angel Velasquez an...@archlinux.org
+# Contributor: Hugo Doria h...@archlinux.org
+# Contributor: Andrew Wright andr...@photism.org
+
+pkgname=nicotine
+pkgver=1.2.16
+pkgrel=3
+pkgdesc=Soulseek music-sharing client, written in python
+license=('GPL')
+arch=('i686' 'x86_64')
+depends=('pygtk=2.14.1' 'mutagen')
+conflicts=(nicotine-plus)
+replaces=(nicotine-plus)
+url=http://sourceforge.net/projects/nicotine-plus/;
+source=(http://downloads.sourceforge.net/project/nicotine-plus/nicotine-plus/${pkgver}/${pkgname}+-${pkgver}.tar.bz2)
+optdepends=('python-sexy: To enable spell checking'
+   'python-geoip: to enable Geographical blocker')
+md5sums=('ac7433c21ef619a37e079a7ae68da94a')
+
+
+
+
+build() {
+  cd ${srcdir}/${pkgname}+-${pkgver}
+  sed -i -e s/Icon=nicotine-plus/Icon=nicotine-plus-32px/ 
files/nicotine.desktop # Fixing FS#22476
+  python2 setup.py install --root=${pkgdir}
+  cd trayicon
+  python2 autogen.py
+  make 
+}
+
+package() {
+  cd ${srcdir}/${pkgname}+-${pkgver}/trayicon
+  make DESTDIR=${pkgdir} install 
+  ln -s nicotine.py ${pkgdir}/usr/bin/nicotine 
+}

Deleted: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2011-12-06 06:34:16 UTC (rev 144456)
+++ extra-x86_64/PKGBUILD   2011-12-06 06:35:08 UTC (rev 144457)
@@ -1,30 +0,0 @@
-# $Id$
-# Maintainer: Angel Velasquez an...@archlinux.org
-# Contributor: Hugo Doria h...@archlinux.org
-# Contributor: Andrew Wright andr...@photism.org
-
-pkgname=nicotine
-pkgver=1.2.16
-pkgrel=2
-pkgdesc=Soulseek music-sharing client, written in python
-license=('GPL')
-arch=('i686' 'x86_64')
-depends=('pygtk=2.14.1' 'mutagen' 'python-geoip=1.2.4')
-conflicts=(nicotine-plus)
-replaces=(nicotine-plus)
-url=http://sourceforge.net/projects/nicotine-plus/;
-source=(http://downloads.sourceforge.net/project/nicotine-plus/nicotine-plus/${pkgver}/${pkgname}+-${pkgver}.tar.bz2)
-optdepends=('python-sexy: To enable spell checking'
-   'python-geoip: to enable Geographical blocker')
-md5sums=('ac7433c21ef619a37e079a7ae68da94a')
-
-build() {
-  cd ${srcdir}/${pkgname}+-${pkgver}
-  sed -i -e s/Icon=nicotine-plus/Icon=nicotine-plus-32px/ 
files/nicotine.desktop # Fixing FS#22476
-  python2 setup.py install --root=${pkgdir}
-  cd trayicon
-  python2 autogen.py
-  make 
-  make DESTDIR=${pkgdir} install 
-  ln -s nicotine.py ${pkgdir}/usr/bin/nicotine 
-}

Copied: nicotine/repos/extra-x86_64/PKGBUILD (from rev 144456, 
nicotine/trunk/PKGBUILD)
===
--- extra-x86_64/PKGBUILD   (rev 0)
+++ extra-x86_64/PKGBUILD   2011-12-06 06:35:08 UTC (rev 144457)
@@ -0,0 +1,37 @@
+# $Id$
+#