[arch-commits] Commit in deluge/repos/extra-any (9 files)
Jan Steffens
heftig at archlinux.org
Sun Sep 13 23:28:26 UTC 2015
Date: Monday, September 14, 2015 @ 01:28:26
Author: heftig
Revision: 246027
archrelease: copy trunk to extra-any
Added:
deluge/repos/extra-any/PKGBUILD
(from rev 246026, deluge/trunk/PKGBUILD)
deluge/repos/extra-any/deluge-web.service
(from rev 246026, deluge/trunk/deluge-web.service)
deluge/repos/extra-any/deluge.install
(from rev 246026, deluge/trunk/deluge.install)
deluge/repos/extra-any/deluged.service
(from rev 246026, deluge/trunk/deluged.service)
Deleted:
deluge/repos/extra-any/PKGBUILD
deluge/repos/extra-any/deluge-web.service
deluge/repos/extra-any/deluge.install
deluge/repos/extra-any/deluged.service
deluge/repos/extra-any/twisted15.patch
--------------------+
PKGBUILD | 94 ++++++++++++++++++++++++---------------------------
deluge-web.service | 20 +++++-----
deluge.install | 38 ++++++++++----------
deluged.service | 22 +++++------
twisted15.patch | 49 --------------------------
5 files changed, 86 insertions(+), 137 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2015-09-13 23:27:44 UTC (rev 246026)
+++ PKGBUILD 2015-09-13 23:28:26 UTC (rev 246027)
@@ -1,48 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Contributor: Ionut Biru <ibiru at archlinux.org>
-# Contributor: Hugo Doria <hugo at archlinux.org>
-
-pkgname=deluge
-pkgver=1.3.11
-pkgrel=3
-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 python2-twisted python2-pyopenssl
- python2-chardet python2-setuptools)
-makedepends=(intltool pygtk librsvg python2-mako)
-optdepends=('python2-notify: libnotify notifications'
- 'pygtk: needed for gtk ui'
- 'librsvg: needed for gtk ui'
- 'python2-mako: needed for web ui')
-install=deluge.install
-source=(http://download.deluge-torrent.org/source/$pkgname-$pkgver.tar.lzma
- deluged.service deluge-web.service twisted15.patch)
-md5sums=('49f9f5fc751d49ddd415f02123de77a8'
- '17f51ac9a90f0dc41a20291444a7489b'
- '2a73f62c04e8b147c731fbb50666e846'
- '6ff539de47871258bb484fc5b0590fe2')
-
-prepare() {
- cd $pkgname-$pkgver
- patch -Np1 -i ../twisted15.patch
- sed -i '1s/python$/&2/' deluge/ui/Win32IconImagePlugin.py
-}
-
-build() {
- cd $pkgname-$pkgver
- python2 setup.py build
-}
-
-package() {
- cd $pkgname-$pkgver
- python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
-
- install -Dm644 ../deluged.service "$pkgdir/usr/lib/systemd/system/deluged.service"
- install -Dm644 ../deluge-web.service "$pkgdir/usr/lib/systemd/system/deluge-web.service"
-
- install -d "$pkgdir/srv"
- install -d -m 775 -o 125 -g 125 "$pkgdir/srv/deluge"
-}
Copied: deluge/repos/extra-any/PKGBUILD (from rev 246026, deluge/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2015-09-13 23:28:26 UTC (rev 246027)
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Ionut Biru <ibiru at archlinux.org>
+# Contributor: Hugo Doria <hugo at archlinux.org>
+
+pkgname=deluge
+pkgver=1.3.12
+pkgrel=1
+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 python2-twisted python2-pyopenssl
+ python2-chardet python2-setuptools)
+makedepends=(intltool pygtk librsvg python2-mako)
+optdepends=('python2-notify: libnotify notifications'
+ 'pygtk: needed for gtk ui'
+ 'librsvg: needed for gtk ui'
+ 'python2-mako: needed for web ui')
+install=deluge.install
+source=(http://download.deluge-torrent.org/source/$pkgname-$pkgver.tar.lzma
+ deluged.service deluge-web.service)
+md5sums=('56f5c1cd3f671fecc58a9168f5bd6d48'
+ '17f51ac9a90f0dc41a20291444a7489b'
+ '2a73f62c04e8b147c731fbb50666e846')
+
+prepare() {
+ cd $pkgname-$pkgver
+ sed -i '1s/python$/&2/' deluge/ui/Win32IconImagePlugin.py
+}
+
+build() {
+ cd $pkgname-$pkgver
+ python2 setup.py build
+}
+
+package() {
+ cd $pkgname-$pkgver
+ python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
+
+ install -Dm644 ../deluged.service "$pkgdir/usr/lib/systemd/system/deluged.service"
+ install -Dm644 ../deluge-web.service "$pkgdir/usr/lib/systemd/system/deluge-web.service"
+
+ install -d "$pkgdir/srv"
+ install -d -m 775 -o 125 -g 125 "$pkgdir/srv/deluge"
+}
Deleted: deluge-web.service
===================================================================
--- deluge-web.service 2015-09-13 23:27:44 UTC (rev 246026)
+++ deluge-web.service 2015-09-13 23:28:26 UTC (rev 246027)
@@ -1,10 +0,0 @@
-[Unit]
-Description=Deluge WebUI
-After=deluged.service
-
-[Service]
-User=deluge
-ExecStart=/usr/bin/deluge-web
-
-[Install]
-WantedBy=multi-user.target
Copied: deluge/repos/extra-any/deluge-web.service (from rev 246026, deluge/trunk/deluge-web.service)
===================================================================
--- deluge-web.service (rev 0)
+++ deluge-web.service 2015-09-13 23:28:26 UTC (rev 246027)
@@ -0,0 +1,10 @@
+[Unit]
+Description=Deluge WebUI
+After=deluged.service
+
+[Service]
+User=deluge
+ExecStart=/usr/bin/deluge-web
+
+[Install]
+WantedBy=multi-user.target
Deleted: deluge.install
===================================================================
--- deluge.install 2015-09-13 23:27:44 UTC (rev 246026)
+++ deluge.install 2015-09-13 23:28:26 UTC (rev 246027)
@@ -1,19 +0,0 @@
-post_install() {
- if ! getent passwd deluge &>/dev/null; then
- groupadd -g 125 deluge
- useradd -c 'Deluge user' -u 125 -g deluge -d /srv/deluge -s /bin/false deluge
- passwd -l deluge &>/dev/null
- fi
-
- post_upgrade
-}
-
-post_upgrade() {
- [[ -x /usr/bin/xdg-icon-resource ]] && xdg-icon-resource forceupdate --theme hicolor
- [[ -x /usr/bin/update-desktop-database ]] && update-desktop-database -q
- return 0
-}
-
-post_remove() {
- post_upgrade
-}
Copied: deluge/repos/extra-any/deluge.install (from rev 246026, deluge/trunk/deluge.install)
===================================================================
--- deluge.install (rev 0)
+++ deluge.install 2015-09-13 23:28:26 UTC (rev 246027)
@@ -0,0 +1,19 @@
+post_install() {
+ if ! getent passwd deluge &>/dev/null; then
+ groupadd -g 125 deluge
+ useradd -c 'Deluge user' -u 125 -g deluge -d /srv/deluge -s /bin/false deluge
+ passwd -l deluge &>/dev/null
+ fi
+
+ post_upgrade
+}
+
+post_upgrade() {
+ [[ -x /usr/bin/xdg-icon-resource ]] && xdg-icon-resource forceupdate --theme hicolor
+ [[ -x /usr/bin/update-desktop-database ]] && update-desktop-database -q
+ return 0
+}
+
+post_remove() {
+ post_upgrade
+}
Deleted: deluged.service
===================================================================
--- deluged.service 2015-09-13 23:27:44 UTC (rev 246026)
+++ deluged.service 2015-09-13 23:28:26 UTC (rev 246027)
@@ -1,11 +0,0 @@
-[Unit]
-Description=Deluge Daemon
-After=network.target
-
-[Service]
-User=deluge
-ExecStart=/usr/bin/deluged -d
-UMask=0002
-
-[Install]
-WantedBy=multi-user.target
Copied: deluge/repos/extra-any/deluged.service (from rev 246026, deluge/trunk/deluged.service)
===================================================================
--- deluged.service (rev 0)
+++ deluged.service 2015-09-13 23:28:26 UTC (rev 246027)
@@ -0,0 +1,11 @@
+[Unit]
+Description=Deluge Daemon
+After=network.target
+
+[Service]
+User=deluge
+ExecStart=/usr/bin/deluged -d
+UMask=0002
+
+[Install]
+WantedBy=multi-user.target
Deleted: twisted15.patch
===================================================================
--- twisted15.patch 2015-09-13 23:27:44 UTC (rev 246026)
+++ twisted15.patch 2015-09-13 23:28:26 UTC (rev 246027)
@@ -1,49 +0,0 @@
-From d40dfcd53c2439de121ddaff476e66194dc2c738 Mon Sep 17 00:00:00 2001
-From: Andrew Resch <andrewresch at gmail.com>
-Date: Mon, 23 Feb 2015 08:31:00 +0000
-Subject: Fix for Twisted 15.0 URI class rename
-
----
-diff --git a/deluge/httpdownloader.py b/deluge/httpdownloader.py
-index b146477..14dcdc3 100644
---- a/deluge/httpdownloader.py
-+++ b/deluge/httpdownloader.py
-@@ -146,7 +146,7 @@ def sanitise_filename(filename):
- log.warning("Potentially malicious server: trying to write to file '%s'" % filename)
- # Only use the basename
- filename = os.path.basename(filename)
--
-+
- filename = filename.strip()
- if filename.startswith(".") or ";" in filename or "|" in filename:
- # Dodgy server, log it
-@@ -192,17 +192,22 @@ def download_file(url, filename, callback=None, headers=None, force_filename=Fal
- headers = {}
- headers["accept-encoding"] = "deflate, gzip, x-gzip"
-
-- # In twisted 13.1.0 the _parse() function was replaced by the _URI class
-- if hasattr(client, '_parse'):
-+ # In Twisted 13.1.0 _parse() function replaced by _URI class.
-+ # In Twisted 15.0.0 _URI class renamed to URI.
-+ if hasattr(client, "_parse"):
- scheme, host, port, path = client._parse(url)
- else:
-- from twisted.web.client import _URI
-- uri = _URI.fromBytes(url)
-+ try:
-+ from twisted.web.client import _URI as URI
-+ except ImportError:
-+ from twisted.web.client import URI
-+
-+ uri = URI.fromBytes(url)
- scheme = uri.scheme
- host = uri.host
- port = uri.port
- path = uri.path
--
-+
- factory = HTTPDownloader(url, filename, callback, headers, force_filename, allow_compression)
- if scheme == "https":
- from twisted.internet import ssl
---
-cgit v0.9.2
More information about the arch-commits
mailing list