[arch-commits] Commit in deluge/trunk (3 files)
Jan Steffens
heftig at nymeria.archlinux.org
Tue Feb 11 21:12:25 UTC 2014
Date: Tuesday, February 11, 2014 @ 22:12:25
Author: heftig
Revision: 205857
Bump snapshot; fix FS#36827, FS#36925
Modified:
deluge/trunk/PKGBUILD
deluge/trunk/deluge.install
Deleted:
deluge/trunk/0001-Fix-twisted-13.1-compat.patch
------------------------------------+
0001-Fix-twisted-13.1-compat.patch | 18 ------------------
PKGBUILD | 16 ++++++----------
deluge.install | 10 +++-------
3 files changed, 9 insertions(+), 35 deletions(-)
Deleted: 0001-Fix-twisted-13.1-compat.patch
===================================================================
--- 0001-Fix-twisted-13.1-compat.patch 2014-02-11 20:00:14 UTC (rev 205856)
+++ 0001-Fix-twisted-13.1-compat.patch 2014-02-11 21:12:25 UTC (rev 205857)
@@ -1,18 +0,0 @@
-diff -u -r deluge-06ee112/deluge/httpdownloader.py deluge-06ee112.twisted/deluge/httpdownloader.py
---- deluge-06ee112/deluge/httpdownloader.py 2013-08-07 03:52:59.000000000 +0200
-+++ deluge-06ee112.twisted/deluge/httpdownloader.py 2013-08-25 09:44:55.895379041 +0200
-@@ -196,12 +196,12 @@
- if hasattr(client, '_parse'):
- scheme, host, port, path = client._parse(url)
- else:
-- from twisted.web import _URI
-+ from twisted.web.client import _URI
- uri = _URI.fromBytes(url)
- scheme = uri.scheme
- host = uri.host
- port = uri.port
-- path = uri.originFrom
-+ path = uri.path
-
- factory = HTTPDownloader(url, filename, callback, headers, force_filename, allow_compression)
- if scheme == "https":
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2014-02-11 20:00:14 UTC (rev 205856)
+++ PKGBUILD 2014-02-11 21:12:25 UTC (rev 205857)
@@ -5,15 +5,14 @@
pkgname=deluge
pkgver=1.3.6
-pkgrel=3
-_commit=06ee112
+pkgrel=4
+_commit=018330c
pkgdesc="A BitTorrent client with multiple user interfaces in a client/server model"
arch=('any')
url="http://deluge-torrent.org/"
license=('GPL3')
depends=(python2-xdg libtorrent-rasterbar twisted python2-pyopenssl
- xdg-utils python2-chardet desktop-file-utils hicolor-icon-theme
- python2-setuptools)
+ python2-chardet python2-setuptools)
makedepends=(intltool pygtk librsvg python2-mako)
optdepends=('python2-notify: libnotify notifications'
'pygtk: needed for gtk ui'
@@ -21,16 +20,13 @@
'python2-mako: needed for web ui')
install=deluge.install
source=(http://git.deluge-torrent.org/deluge/snapshot/$pkgname-$_commit.tar.bz2
- deluged.service deluge-web.service
- 0001-Fix-twisted-13.1-compat.patch)
-md5sums=('c7bd73523b1f6cb6b45d07114985f311'
+ deluged.service deluge-web.service)
+md5sums=('272853d17d9ec67769efda16bb3b14e9'
'17f51ac9a90f0dc41a20291444a7489b'
- '2a73f62c04e8b147c731fbb50666e846'
- '1caad4531b400e8a8738b93ac6bafb62')
+ '2a73f62c04e8b147c731fbb50666e846')
prepare() {
cd $pkgname-$_commit
- patch -Np1 -i ../0001-Fix-twisted-13.1-compat.patch
}
build() {
Modified: deluge.install
===================================================================
--- deluge.install 2014-02-11 20:00:14 UTC (rev 205856)
+++ deluge.install 2014-02-11 21:12:25 UTC (rev 205857)
@@ -6,16 +6,12 @@
fi
post_upgrade
-
-cat <<EOF
->>> The optional headless daemon started using deluged.service uses the "deluge" user.
- Its default download directory is /srv/deluge.
-EOF
}
post_upgrade() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-desktop-database -q
+ [[ -x /usr/bin/xdg-icon-resource ]] && xdg-icon-resource forceupdate --theme hicolor
+ [[ -x /usr/bin/update-desktop-database ]] && update-desktop-database -q
+ true
}
post_remove() {
More information about the arch-commits
mailing list