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

Eric Bélanger eric at archlinux.org
Fri Dec 5 21:29:20 UTC 2008


    Date: Friday, December 5, 2008 @ 16:29:20
  Author: eric
Revision: 20590

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

........
  r20533 | hugo | 2008-12-05 10:09:52 -0500 (Fri, 05 Dec 2008) | 1 line
  
  upgpkg: deluge 1.0.6-2
........
  r20589 | eric | 2008-12-05 16:28:57 -0500 (Fri, 05 Dec 2008) | 2 lines
  
  upgpkg: deluge 1.0.6-2
      added md5sums
........

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

--------------------+
 PKGBUILD           |   11 +++++------
 shutdown-fix.patch |   20 +++++++++-----------
 2 files changed, 14 insertions(+), 17 deletions(-)


Property changes on: deluge/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /deluge/trunk:1-20356
   + /deluge/trunk:1-20589

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-12-05 21:28:57 UTC (rev 20589)
+++ extra-x86_64/PKGBUILD	2008-12-05 21:29:20 UTC (rev 20590)
@@ -3,27 +3,26 @@
 
 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/"
 license=('GPL2')
 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')
 options=('!emptydirs')
+source=(http://download.deluge-torrent.org/source/${pkgver}/${pkgname}-${pkgver}.tar.gz shutdown-fix.patch)
+md5sums=('96be98b4e7f8c66ec243e8148b897291' 'f4ef4cebca468e4f85f0c10d843c44a7')
 
 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-x86_64/shutdown-fix.patch
===================================================================
--- extra-x86_64/shutdown-fix.patch	2008-12-05 21:28:57 UTC (rev 20589)
+++ extra-x86_64/shutdown-fix.patch	2008-12-05 21:29:20 UTC (rev 20590)
@@ -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()"""
 




More information about the arch-commits mailing list