[arch-commits] Commit in deluge/trunk (9 files)
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
===
--- PKGBUILD2013-01-10 11:18:18 UTC (rev 175001)
+++ PKGBUILD2013-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
[arch-commits] Commit in deluge/trunk (9 files)
Date: Friday, March 9, 2012 @ 12:50:37
Author: heftig
Revision: 152816
1.3.4. revamp scripts
Added:
deluge/trunk/deluge-web.service
deluge/trunk/deluge.tmpfiles.conf
deluge/trunk/deluged.conf
(from rev 152801, deluge/trunk/deluged.conf.d)
deluge/trunk/deluged.service
Modified:
deluge/trunk/PKGBUILD
deluge/trunk/deluge-web (contents, properties)
deluge/trunk/deluge.install
deluge/trunk/deluged (contents, properties)
Deleted:
deluge/trunk/deluged.conf.d
--+
PKGBUILD | 31 +++
deluge-web | 13 -
deluge-web.service |8
deluge.install | 16
deluge.tmpfiles.conf |1 +
deluged | 13 ++---
deluged.conf |2 ++
deluged.conf.d |1 -
deluged.service |9 +
9 files changed, 61 insertions(+), 33 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-03-09 17:34:10 UTC (rev 152815)
+++ PKGBUILD2012-03-09 17:50:37 UTC (rev 152816)
@@ -4,8 +4,8 @@
# Contributor: Hugo Doria h...@archlinux.org
pkgname=deluge
-pkgver=1.3.3
-pkgrel=5
+pkgver=1.3.4
+pkgrel=1
pkgdesc=A BitTorrent client with multiple user interfaces in a client/server
model
arch=('any')
url=http://deluge-torrent.org/;
@@ -21,19 +21,22 @@
backup=(etc/conf.d/deluged)
install=deluge.install
source=(http://download.deluge-torrent.org/source/$pkgname-$pkgver.tar.bz2
-deluged deluged.conf.d deluge-web)
-md5sums=('4027c60bb5d1c5da61e97a47e62ab1ab'
- '7d5790eeb14cd0b47d1bb3e0a19c9935'
- '332d23fe0d21ce92b494efd73322856c'
- '6c913ec7322eaa60494ac9d53103005f')
+deluge.tmpfiles.conf deluged deluge-web deluged.service
deluge-web.service deluged.conf)
+md5sums=('44166604853180bb44de2d86b3705bf7'
+ 'c50385d32a2db0ef3f46b8caadb0e988'
+ 'd58897b9deab9c46c1cff24c30e0f92a'
+ '358dcf943f2251abee6caac62cb10f40'
+ '496f1709ca609e65b8bd592c3705f596'
+ '6a30f7a98ee234b08e255e81f08a65d8'
+ '71d556cf7ce3bb59391797827347e80c')
build() {
- cd $srcdir/$pkgname-$pkgver
+ cd $pkgname-$pkgver
python2 setup.py build
}
package() {
- cd $srcdir/$pkgname-$pkgver
+ cd $pkgname-$pkgver
python2 setup.py install --prefix=/usr --root=$pkgdir --optimize=1
install -Dm644 deluge/data/pixmaps/deluge.svg
$pkgdir/usr/share/pixmaps/deluge.svg
@@ -42,8 +45,12 @@
-i $_dir/Win32IconImagePlugin.py \
-i $_dir/web/gen_gettext.py
+ cd ..
install -d $pkgdir/srv/deluge
- install -D $srcdir/deluged $pkgdir/etc/rc.d/deluged
- install -D $srcdir/deluge-web $pkgdir/etc/rc.d/deluge-web
- install -Dm644 $srcdir/deluged.conf.d $pkgdir/etc/conf.d/deluged
+ 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/lib/systemd/system/deluged.service
+ install -Dm644 deluge-web.service
$pkgdir/lib/systemd/system/deluge-web.service
+ install -Dm644 deluged.conf $pkgdir/etc/conf.d/deluged
}
Modified: deluge-web
===
--- deluge-web 2012-03-09 17:34:10 UTC (rev 152815)
+++ deluge-web 2012-03-09 17:50:37 UTC (rev 152816)
@@ -4,18 +4,21 @@
. /etc/rc.d/functions
. /etc/conf.d/deluged
-[[ -f /var/run/deluge-web.pid ]] PID=$(cat /var/run/deluge-web.pid)
-[[ -d /proc/$PID ]] || PID=
+PIDFILE=/run/deluge/deluge-web.pid
+WEB_OPTIONS=-f $WEB_OPTIONS
+[[ -f $PIDFILE ]] PID=$($PIDFILE)
+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 -f /dev/null
$DELUGE_USER
+[[ -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_USER deluge-web) /var/run/deluge-web.pid
+ echo $(pgrep -u deluge deluge-web) $PIDFILE
add_daemon deluge-web
stat_done
fi
@@ -26,7 +29,7 @@
if [ $? -gt 0 ]; then
stat_fail
else
- rm /var/run/deluge-web.pid
+ rm $PIDFILE
rm_daemon deluge-web
stat_done
fi
Property changes on: deluge/trunk/deluge-web
___
Added: svn:executable
## -0,0 +1 ##
+*
Added: deluge-web.service
===
--- deluge-web.service (rev 0)
+++ deluge-web.service 2012-03-09 17:50:37 UTC (rev 152816)
@@ -0,0 +1,8 @@
+[Unit]
+Description=Deluge WebUI
+After=deluged.service
+
+[Service]
+User=deluge
+EnvironmentFile=/etc/conf.d/deluged
+ExecStart=/usr/bin/deluge-web $WEB_OPTIONS
Modified: deluge.install
