[arch-commits] Commit in deluge/repos/extra-any (9 files)
Jan Steffens
heftig at nymeria.archlinux.org
Tue Feb 11 21:13:26 UTC 2014
Date: Tuesday, February 11, 2014 @ 22:13:25
Author: heftig
Revision: 205858
archrelease: copy trunk to extra-any
Added:
deluge/repos/extra-any/PKGBUILD
(from rev 205857, deluge/trunk/PKGBUILD)
deluge/repos/extra-any/deluge-web.service
(from rev 205857, deluge/trunk/deluge-web.service)
deluge/repos/extra-any/deluge.install
(from rev 205857, deluge/trunk/deluge.install)
deluge/repos/extra-any/deluged.service
(from rev 205857, deluge/trunk/deluged.service)
Deleted:
deluge/repos/extra-any/0001-Fix-twisted-13.1-compat.patch
deluge/repos/extra-any/PKGBUILD
deluge/repos/extra-any/deluge-web.service
deluge/repos/extra-any/deluge.install
deluge/repos/extra-any/deluged.service
------------------------------------+
0001-Fix-twisted-13.1-compat.patch | 18 ------
PKGBUILD | 104 ++++++++++++++++-------------------
deluge-web.service | 20 +++---
deluge.install | 48 +++++++---------
deluged.service | 22 +++----
5 files changed, 93 insertions(+), 119 deletions(-)
Deleted: 0001-Fix-twisted-13.1-compat.patch
===================================================================
--- 0001-Fix-twisted-13.1-compat.patch 2014-02-11 21:12:25 UTC (rev 205857)
+++ 0001-Fix-twisted-13.1-compat.patch 2014-02-11 21:13:25 UTC (rev 205858)
@@ -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":
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2014-02-11 21:12:25 UTC (rev 205857)
+++ PKGBUILD 2014-02-11 21:13:25 UTC (rev 205858)
@@ -1,54 +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.6
-pkgrel=3
-_commit=06ee112
-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)
-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://git.deluge-torrent.org/deluge/snapshot/$pkgname-$_commit.tar.bz2
- deluged.service deluge-web.service
- 0001-Fix-twisted-13.1-compat.patch)
-md5sums=('c7bd73523b1f6cb6b45d07114985f311'
- '17f51ac9a90f0dc41a20291444a7489b'
- '2a73f62c04e8b147c731fbb50666e846'
- '1caad4531b400e8a8738b93ac6bafb62')
-
-prepare() {
- cd $pkgname-$_commit
- patch -Np1 -i ../0001-Fix-twisted-13.1-compat.patch
-}
-
-build() {
- cd $pkgname-$_commit
- python2 setup.py build
-}
-
-package() {
- cd $pkgname-$_commit
- python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
-
- sed -i '1s/python$/&2/' \
- "$pkgdir/usr/lib/python2.7/site-packages/deluge/ui/Win32IconImagePlugin.py"
-
- cd ..
- 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 205857, deluge/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2014-02-11 21:13:25 UTC (rev 205858)
@@ -0,0 +1,50 @@
+# $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.6
+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
+ 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://git.deluge-torrent.org/deluge/snapshot/$pkgname-$_commit.tar.bz2
+ deluged.service deluge-web.service)
+md5sums=('272853d17d9ec67769efda16bb3b14e9'
+ '17f51ac9a90f0dc41a20291444a7489b'
+ '2a73f62c04e8b147c731fbb50666e846')
+
+prepare() {
+ cd $pkgname-$_commit
+}
+
+build() {
+ cd $pkgname-$_commit
+ python2 setup.py build
+}
+
+package() {
+ cd $pkgname-$_commit
+ python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
+
+ sed -i '1s/python$/&2/' \
+ "$pkgdir/usr/lib/python2.7/site-packages/deluge/ui/Win32IconImagePlugin.py"
+
+ cd ..
+ 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 2014-02-11 21:12:25 UTC (rev 205857)
+++ deluge-web.service 2014-02-11 21:13:25 UTC (rev 205858)
@@ -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 205857, deluge/trunk/deluge-web.service)
===================================================================
--- deluge-web.service (rev 0)
+++ deluge-web.service 2014-02-11 21:13:25 UTC (rev 205858)
@@ -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 2014-02-11 21:12:25 UTC (rev 205857)
+++ deluge.install 2014-02-11 21:13:25 UTC (rev 205858)
@@ -1,26 +0,0 @@
-post_install() {
- getent group deluge &>/dev/null || groupadd -g 125 deluge
- if ! getent passwd deluge &>/dev/null; then
- useradd -c 'Deluge user' -u 125 -g deluge -d /srv/deluge -s /bin/false deluge
- passwd -l deluge &>/dev/null
- 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
-}
-
-post_remove() {
- getent passwd deluge &>/dev/null && userdel deluge
- getent group deluge &>/dev/null && groupdel deluge
-
- post_upgrade
-}
Copied: deluge/repos/extra-any/deluge.install (from rev 205857, deluge/trunk/deluge.install)
===================================================================
--- deluge.install (rev 0)
+++ deluge.install 2014-02-11 21:13:25 UTC (rev 205858)
@@ -0,0 +1,22 @@
+post_install() {
+ getent group deluge &>/dev/null || groupadd -g 125 deluge
+ if ! getent passwd deluge &>/dev/null; then
+ 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
+ true
+}
+
+post_remove() {
+ getent passwd deluge &>/dev/null && userdel deluge
+ getent group deluge &>/dev/null && groupdel deluge
+
+ post_upgrade
+}
Deleted: deluged.service
===================================================================
--- deluged.service 2014-02-11 21:12:25 UTC (rev 205857)
+++ deluged.service 2014-02-11 21:13:25 UTC (rev 205858)
@@ -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 205857, deluge/trunk/deluged.service)
===================================================================
--- deluged.service (rev 0)
+++ deluged.service 2014-02-11 21:13:25 UTC (rev 205858)
@@ -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
More information about the arch-commits
mailing list