[arch-commits] Commit in deluge/repos (3 files)

[Hugo Doria]

    Date: Friday, December 5, 2008 @ 10:10:12
  Author: hugo
Revision: 20534

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

........
  r20533 | hugo | 2008-12-05 12:09:52 -0300 (Fri, 05 Dec 2008) | 1 line
  
  upgpkg: deluge 1.0.6-2
........

Modified:
  deluge/repos/extra-i686/	(properties)
  deluge/repos/extra-i686/PKGBUILD
  deluge/repos/extra-i686/shutdown-fix.patch

--------------------+
 PKGBUILD           |    9 ++++-----
 shutdown-fix.patch |   20 +++++++++-----------
 2 files changed, 13 insertions(+), 16 deletions(-)


Property changes on: deluge/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /deluge/trunk:1-20355
   + /deluge/trunk:1-20533

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-12-05 15:09:52 UTC (rev 20533)
+++ extra-i686/PKGBUILD	2008-12-05 15:10:12 UTC (rev 20534)
@@ -3,7 +3,7 @@
 
 pkgname=deluge
 pkgver=1.0.6
-pkgrel=1
+pkgrel=2
 pkgdesc="A bittorrent client written with python and pygtk"
 arch=('i686' 'x86_64')
 url="http://deluge-torrent.org/"
@@ -11,19 +11,18 @@
 depends=('pygtk' 'boost>=1.36.0' 'pyxdg' 'dbus-python' 'librsvg' 'setuptools')
 makedepends=('subversion' 'intltool')
 source=(http://download.deluge-torrent.org/source/${pkgver}/${pkgname}-${pkgver}.tar.gz shutdown-fix.patch)
-md5sums=('96be98b4e7f8c66ec243e8148b897291' 'bf3a4c0b246a1dadcf6c05b37a7deded')
+#md5sums=('96be98b4e7f8c66ec243e8148b897291' '916e91e32e8e78edfaf16f427c2785a7')
 options=('!emptydirs')
 
 build() {
 
-  cd ${srcdir}/${pkgname}-${pkgver}/${pkgname}
+  cd ${srcdir}/${pkgname}-${pkgver}/
 
   # used to fix a problem with deluge shutdown
   # remove it after 1.0.6 release
-  patch -Np0 -i ${srcdir}/shutdown-fix.patch
+  patch -Np1 -i ${srcdir}/shutdown-fix.patch
 
   cd ${srcdir}/${pkgname}-${pkgver}/
-  sed -i 's|boost_thread|boost_thread-mt|' setup.py
   python setup.py install --prefix=/usr --root=${pkgdir}
 
   install -D -m644 deluge/data/pixmaps/deluge.svg ${pkgdir}/usr/share/pixmaps/deluge.svg 

Modified: extra-i686/shutdown-fix.patch
===================================================================
--- extra-i686/shutdown-fix.patch	2008-12-05 15:09:52 UTC (rev 20533)
+++ extra-i686/shutdown-fix.patch	2008-12-05 15:10:12 UTC (rev 20534)
@@ -1,13 +1,11 @@
---- component.py	2008-11-23 10:28:01.000000000 +0530
-+++ component-patched.py	2008-12-02 02:25:29.619655571 +0530
-@@ -169,7 +169,8 @@
-         for component in self.components.keys():
-             log.debug("Shutting down component %s..", component)
-             try:
--                self.components[component].shutdown()
-+                if self.components[component].get_state() != COMPONENT_STATE.index("Stopped"):
-+                    self.components[component].shutdown()
-             except Exception, e:
-                 log.debug("Unable to call shutdown(): %s", e)
+--- /deluge/core/core.py (revision 4312)
++++ /deluge/core/core.py (revision 4337)
+@@ -323,4 +323,7 @@
+             log.debug("handle_thread: %s", e)
  
++    def shutdown(self):
++        pass
++
+     def _shutdown(self, *data):
+         """This is called by a thread from shutdown()"""