[arch-commits] Commit in deluge/trunk (9 files)
Jan Steffens
heftig at archlinux.org
Thu Jan 10 12:38:47 UTC 2013
Date: Thursday, January 10, 2013 @ 07:38:46
Author: heftig
Revision: 175002
Upgrade to a git snapshot (FS#29414). Get rid of initscripts (check http://pkgbuild.com/~heftig/killed-rc.d/ )
Modified:
deluge/trunk/PKGBUILD
deluge/trunk/deluge-web.service
deluge/trunk/deluge.install
deluge/trunk/deluged.service
Deleted:
deluge/trunk/deluge-web
deluge/trunk/deluge.tmpfiles.conf
deluge/trunk/deluged
deluge/trunk/deluged.conf
deluge/trunk/fs31433.patch
----------------------+
PKGBUILD | 34 ++++++++++------------------------
deluge-web | 45 ---------------------------------------------
deluge-web.service | 3 +--
deluge.install | 4 +---
deluge.tmpfiles.conf | 1 -
deluged | 43 -------------------------------------------
deluged.conf | 2 --
deluged.service | 5 +----
fs31433.patch | 29 -----------------------------
9 files changed, 13 insertions(+), 153 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-01-10 11:18:18 UTC (rev 175001)
+++ PKGBUILD 2013-01-10 12:38:46 UTC (rev 175002)
@@ -5,12 +5,12 @@
pkgname=deluge
pkgver=1.3.5
-pkgrel=3
+pkgrel=4
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>=0.15.0' twisted python2-pyopenssl
+depends=(python2-xdg libtorrent-rasterbar twisted python2-pyopenssl
xdg-utils python2-chardet desktop-file-utils hicolor-icon-theme
python2-distribute)
makedepends=(intltool pygtk librsvg python2-mako)
@@ -18,31 +18,21 @@
'pygtk: needed for gtk ui'
'librsvg: needed for gtk ui'
'python2-mako: needed for web ui')
-backup=(etc/conf.d/deluged)
install=deluge.install
-source=(http://download.deluge-torrent.org/source/$pkgname-$pkgver.tar.bz2
- deluge.tmpfiles.conf deluged deluge-web deluged.service deluge-web.service deluged.conf
- fs31433.patch)
-md5sums=('f17ef6686f33e12694b44976e5ed7721'
- 'c50385d32a2db0ef3f46b8caadb0e988'
- '443690c730263b76a465dc413f695a86'
- '37538a1b049b177e9ea1014331e29689'
- '6b831c889f365f58317dc4b78c167a62'
- 'b3fff6601a5971bba89fa9a85dcf9ce8'
- '71d556cf7ce3bb59391797827347e80c'
- '65311330bd87440c50f2bb7251f46fcd')
+_commit=dcd85e64c0870306bfe412d9dfa675152f799dcb
+source=(http://git.deluge-torrent.org/deluge/snapshot/$pkgname-$_commit.tar.bz2
+ deluged.service deluge-web.service)
+md5sums=('a37bce6070b8cb6a652c262af9736f55'
+ 'b55cb839a37e8315da4a0f6c99a75fd3'
+ '2a73f62c04e8b147c731fbb50666e846')
build() {
- cd $pkgname-$pkgver
-
- # Fix moving to storage (FS#31433)
- patch -Np1 -i ../fs31433.patch
-
+ cd $pkgname-$_commit
python2 setup.py build
}
package() {
- cd $pkgname-$pkgver
+ cd $pkgname-$_commit
python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
install -Dm644 deluge/data/pixmaps/deluge.svg "$pkgdir/usr/share/pixmaps/deluge.svg"
@@ -50,12 +40,8 @@
sed -i '1s/python$/&2/' "$_dir"/{Win32IconImagePlugin.py,web/gen_gettext.py}
cd ..
- install -Dm644 deluge.tmpfiles.conf "$pkgdir/usr/lib/tmpfiles.d/deluge.conf"
- install -D deluged "$pkgdir/etc/rc.d/deluged"
- install -D deluge-web "$pkgdir/etc/rc.d/deluge-web"
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 -Dm644 deluged.conf "$pkgdir/etc/conf.d/deluged"
install -d "$pkgdir/srv"
install -d -m 775 -o 125 -g 125 "$pkgdir/srv/deluge"
Deleted: deluge-web
===================================================================
--- deluge-web 2013-01-10 11:18:18 UTC (rev 175001)
+++ deluge-web 2013-01-10 12:38:46 UTC (rev 175002)
@@ -1,45 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/deluged
-
-PIDFILE=/run/deluge/deluge-web.pid
-WEB_OPTIONS="-f $WEB_OPTIONS"
-
-[[ -f $PIDFILE ]] && PID=$(<$PIDFILE)
-[[ -z $PID ]] || kill -0 $PID || PID=
-
-case "$1" in
- start)
- stat_busy "Starting Deluge WebUI"
- [[ -z $PID ]] && su -l -s /bin/sh -c "/usr/bin/deluge-web $WEB_OPTIONS >/dev/null" deluge
- if [ $? -gt 0 ]; then
- stat_fail
- else
- sleep 1
- echo $(pgrep -u deluge deluge-web) > $PIDFILE
- add_daemon deluge-web
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping Deluge WebUI"
- [[ ! -z $PID ]] && kill $PID &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm $PIDFILE
- rm_daemon deluge-web
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
Modified: deluge-web.service
===================================================================
--- deluge-web.service 2013-01-10 11:18:18 UTC (rev 175001)
+++ deluge-web.service 2013-01-10 12:38:46 UTC (rev 175002)
@@ -4,8 +4,7 @@
[Service]
User=deluge
-EnvironmentFile=/etc/conf.d/deluged
-ExecStart=/usr/bin/deluge-web $WEB_OPTIONS
+ExecStart=/usr/bin/deluge-web
[Install]
WantedBy=multi-user.target
Modified: deluge.install
===================================================================
--- deluge.install 2013-01-10 11:18:18 UTC (rev 175001)
+++ deluge.install 2013-01-10 12:38:46 UTC (rev 175002)
@@ -14,7 +14,6 @@
}
post_upgrade() {
- systemd-tmpfiles --create deluge.conf
xdg-icon-resource forceupdate --theme hicolor &> /dev/null
update-desktop-database -q
}
@@ -23,6 +22,5 @@
getent passwd deluge &>/dev/null && userdel deluge
getent group deluge &>/dev/null && groupdel deluge
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-desktop-database -q
+ post_upgrade
}
Deleted: deluge.tmpfiles.conf
===================================================================
--- deluge.tmpfiles.conf 2013-01-10 11:18:18 UTC (rev 175001)
+++ deluge.tmpfiles.conf 2013-01-10 12:38:46 UTC (rev 175002)
@@ -1 +0,0 @@
-d /run/deluge 0755 deluge deluge -
Deleted: deluged
===================================================================
--- deluged 2013-01-10 11:18:18 UTC (rev 175001)
+++ deluged 2013-01-10 12:38:46 UTC (rev 175002)
@@ -1,43 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/deluged
-
-PIDFILE=/run/deluge/deluged.pid
-OPTIONS="-P $PIDFILE $OPTIONS"
-
-[[ -f $PIDFILE ]] && PID=$(<$PIDFILE)
-[[ -z $PID ]] || kill -0 $PID &>/dev/null || PID=
-
-case "$1" in
- start)
- stat_busy "Starting Deluge Daemon"
- [[ -z $PID ]] && su -l -s /bin/sh -c "/usr/bin/deluged $OPTIONS >/dev/null" deluge
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon deluged
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping Deluge Daemon"
- [[ ! -z $PID ]] && kill $PID &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm -f $PIDFILE
- rm_daemon deluged
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
Deleted: deluged.conf
===================================================================
--- deluged.conf 2013-01-10 11:18:18 UTC (rev 175001)
+++ deluged.conf 2013-01-10 12:38:46 UTC (rev 175002)
@@ -1,2 +0,0 @@
-OPTIONS=""
-WEB_OPTIONS=""
Modified: deluged.service
===================================================================
--- deluged.service 2013-01-10 11:18:18 UTC (rev 175001)
+++ deluged.service 2013-01-10 12:38:46 UTC (rev 175002)
@@ -3,10 +3,7 @@
[Service]
User=deluge
-EnvironmentFile=/etc/conf.d/deluged
-ExecStart=/usr/bin/deluged -P /run/deluge/deluged.pid $OPTIONS
-Type=forking
-PIDFile=/run/deluge/deluged.pid
+ExecStart=/usr/bin/deluged -d
UMask=0002
[Install]
Deleted: fs31433.patch
===================================================================
--- fs31433.patch 2013-01-10 11:18:18 UTC (rev 175001)
+++ fs31433.patch 2013-01-10 12:38:46 UTC (rev 175002)
@@ -1,29 +0,0 @@
-diff -u -Nr deluge-1.3.5/deluge/core/torrent.py deluge-1.3.5-fs31433/deluge/core/torrent.py
---- deluge-1.3.5/deluge/core/torrent.py 2012-04-10 03:53:16.000000000 +0200
-+++ deluge-1.3.5-fs31433/deluge/core/torrent.py 2012-10-24 06:14:05.838480957 +0200
-@@ -834,14 +834,17 @@
- def move_storage(self, dest):
- """Move a torrent's storage location"""
-
-- # Attempt to convert utf8 path to unicode
-- # Note: Inconsistent encoding for 'dest', needs future investigation
-- try:
-- dest_u = unicode(dest, "utf-8")
-- except TypeError:
-- # String is already unicode
-- dest_u = dest
--
-+ if deluge.common.windows_check():
-+ # Attempt to convert utf8 path to unicode
-+ # Note: Inconsistent encoding for 'dest', needs future investigation
-+ try:
-+ dest_u = unicode(dest, "utf-8")
-+ except TypeError:
-+ # String is already unicode
-+ dest_u = dest
-+ else:
-+ dest_u = dest
-+
- if not os.path.exists(dest_u):
- try:
- # Try to make the destination path if it doesn't exist
More information about the arch-commits
mailing list