[arch-commits] Commit in deluge/repos/extra-any (10 files)
Jan Steffens
heftig at archlinux.org
Wed Sep 21 21:51:54 UTC 2011
Date: Wednesday, September 21, 2011 @ 17:51:53
Author: heftig
Revision: 138414
archrelease: copy trunk to extra-any
Added:
deluge/repos/extra-any/PKGBUILD
(from rev 138413, deluge/trunk/PKGBUILD)
deluge/repos/extra-any/deluge-web
(from rev 138413, deluge/trunk/deluge-web)
deluge/repos/extra-any/deluge.install
(from rev 138413, deluge/trunk/deluge.install)
deluge/repos/extra-any/deluged
(from rev 138413, deluge/trunk/deluged)
deluge/repos/extra-any/deluged.conf.d
(from rev 138413, deluge/trunk/deluged.conf.d)
Deleted:
deluge/repos/extra-any/PKGBUILD
deluge/repos/extra-any/deluge-web
deluge/repos/extra-any/deluge.install
deluge/repos/extra-any/deluged
deluge/repos/extra-any/deluged.conf.d
----------------+
PKGBUILD | 88 ++++++++++++++++++++++++++++++-------------------------
deluge-web | 84 ++++++++++++++++++++++++++--------------------------
deluge.install | 54 ++++++++++++++++++---------------
deluged | 86 ++++++++++++++++++++++++++---------------------------
deluged.conf.d | 2 -
5 files changed, 163 insertions(+), 151 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2011-09-21 21:50:56 UTC (rev 138413)
+++ PKGBUILD 2011-09-21 21:51:53 UTC (rev 138414)
@@ -1,40 +0,0 @@
-# $Id$
-# Maintainer : Ionut Biru <ibiru at archlinux.org>
-# Contributor: Hugo Doria <hugo at archlinux.org>
-
-pkgname=deluge
-pkgver=1.3.3
-pkgrel=2
-pkgdesc="A bittorrent client written with python and pygtk"
-arch=('any')
-url="http://deluge-torrent.org/"
-license=('GPL3')
-depends=('pyxdg' 'python2-distribute' 'libtorrent-rasterbar>=0.15.0' 'twisted' 'python2-pyopenssl' 'xdg-utils' 'python2-chardet')
-makedepends=('intltool' 'pygtk' 'librsvg' 'python-mako')
-optdepends=('python-notify: libnotify notifications'
- 'pygtk: needed for gtk ui'
- 'librsvg: needed for gtk ui'
- 'python-mako: needed for web ui')
-source=(http://download.deluge-torrent.org/source/${pkgname}-${pkgver}.tar.bz2 deluged deluged.conf.d deluge-web)
-backup=(etc/conf.d/deluged)
-install=deluge.install
-md5sums=('4027c60bb5d1c5da61e97a47e62ab1ab'
- '7d5790eeb14cd0b47d1bb3e0a19c9935'
- '332d23fe0d21ce92b494efd73322856c'
- '6c913ec7322eaa60494ac9d53103005f')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- python2 setup.py build
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- python2 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1
-
- install -d -m755 "${pkgdir}"/srv/deluge
- install -D -m644 deluge/data/pixmaps/deluge.svg "${pkgdir}"/usr/share/pixmaps/deluge.svg
- install -D -m755 "${srcdir}"/deluged "${pkgdir}"/etc/rc.d/deluged
- install -D -m755 "${srcdir}"/deluge-web "${pkgdir}"/etc/rc.d/deluge-web
- install -D -m644 "${srcdir}"/deluged.conf.d "${pkgdir}"/etc/conf.d/deluged
-}
Copied: deluge/repos/extra-any/PKGBUILD (from rev 138413, deluge/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2011-09-21 21:51:53 UTC (rev 138414)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Jan "heftig" Steffens <jan.steffens at gmail.com>
+# Contributor: Ionut Biru <ibiru at archlinux.org>
+# Contributor: Hugo Doria <hugo at archlinux.org>
+
+pkgname=deluge
+pkgver=1.3.3
+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=('pyxdg' 'libtorrent-rasterbar>=0.15.0' 'twisted' 'python2-pyopenssl'
+ 'xdg-utils' 'python2-chardet' 'desktop-file-utils' 'hicolor-icon-theme')
+makedepends=('intltool' 'pygtk' 'librsvg' 'python-mako' 'python2-distribute')
+optdepends=('python-notify: libnotify notifications'
+ 'pygtk: needed for gtk ui'
+ 'librsvg: needed for gtk ui'
+ 'python-mako: needed for web ui')
+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')
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+ python2 setup.py build
+}
+
+package() {
+ cd "$srcdir/$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"
+
+ _dir="$pkgdir/usr/lib/python2.7/site-packages/deluge/ui"
+ sed -e '1s/python$/&2/' \
+ -i "$_dir/Win32IconImagePlugin.py" \
+ -i "$_dir/web/gen_gettext.py"
+
+ 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"
+}
Deleted: deluge-web
===================================================================
--- deluge-web 2011-09-21 21:50:56 UTC (rev 138413)
+++ deluge-web 2011-09-21 21:51:53 UTC (rev 138414)
@@ -1,42 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /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=
-
-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
- if [ $? -gt 0 ]; then
- stat_fail
- else
- sleep 1
- echo $(pgrep -u $DELUGE_USER deluge-web) > /var/run/deluge-web.pid
- 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 /var/run/deluge-web.pid
- rm_daemon deluge-web
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
Copied: deluge/repos/extra-any/deluge-web (from rev 138413, deluge/trunk/deluge-web)
===================================================================
--- deluge-web (rev 0)
+++ deluge-web 2011-09-21 21:51:53 UTC (rev 138414)
@@ -0,0 +1,42 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /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=
+
+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
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ sleep 1
+ echo $(pgrep -u $DELUGE_USER deluge-web) > /var/run/deluge-web.pid
+ 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 /var/run/deluge-web.pid
+ rm_daemon deluge-web
+ stat_done
+ fi
+ ;;
+ restart)
+ $0 stop
+ sleep 1
+ $0 start
+ ;;
+ *)
+ echo "usage: $0 {start|stop|restart}"
+esac
+exit 0
Deleted: deluge.install
===================================================================
--- deluge.install 2011-09-21 21:50:56 UTC (rev 138413)
+++ deluge.install 2011-09-21 21:51:53 UTC (rev 138414)
@@ -1,25 +0,0 @@
-post_install() {
- getent group deluge >/dev/null 2>&1 || usr/sbin/groupadd -g 125 deluge
- if getent passwd deluge > /dev/null 2>&1; then
- usr/sbin/usermod -c 'Deluge user' -d /srv/deluge -s /bin/false deluge > /dev/null 2>&1
- else
- usr/sbin/useradd -c 'Deluge user' -u 125 -g deluge -d /srv/deluge -s /bin/false deluge
- fi
- usr/bin/passwd -l deluge &>/dev/null
-
- chown deluge.deluge srv/deluge
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-
-cat << _EOF
->>> Deluge's daemon is running default with the "deluge" user. The default download directory is /srv/deluge/.
- You can change the user by editing /etc/conf.d/deluged
-_EOF
-}
-
-post_remove() {
- getent passwd deluge >/dev/null 2>&1 && userdel deluge
- getent group deluge >/dev/null 2>&1 && groupdel deluge
-
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
Copied: deluge/repos/extra-any/deluge.install (from rev 138413, deluge/trunk/deluge.install)
===================================================================
--- deluge.install (rev 0)
+++ deluge.install 2011-09-21 21:51:53 UTC (rev 138414)
@@ -0,0 +1,29 @@
+post_install() {
+ getent group deluge &>/dev/null || usr/sbin/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
+
+ chown deluge:deluge srv/deluge
+
+ post_upgrade
+
+cat << _EOF
+>>> The standalone daemon started using /etc/rc.d/deluged uses the "deluge" user
+ by default. Its default download directory is /srv/deluge. You can change
+ the user by editing /etc/conf.d/deluged.
+_EOF
+}
+
+post_upgrade() {
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+ update-desktop-database -q
+}
+
+post_remove() {
+ getent passwd deluge &>/dev/null && userdel deluge
+ getent group deluge &>/dev/null && groupdel deluge
+
+ post_upgrade
+}
Deleted: deluged
===================================================================
--- deluged 2011-09-21 21:50:56 UTC (rev 138413)
+++ deluged 2011-09-21 21:51:53 UTC (rev 138414)
@@ -1,43 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/deluged
-
-[[ -f /var/run/deluged.pid ]] && PID=$(cat /var/run/deluged.pid)
-[[ -d /proc/$PID ]] || PID=
-
-case "$1" in
- start)
- stat_busy "Starting Deluge Daemon"
- [[ -z $PID ]] && su -l -s /bin/sh -c "/usr/bin/deluged >/dev/null" $DELUGE_USER
- if [ $? -gt 0 ]; then
- stat_fail
- else
- sleep 1
- echo $(pgrep -u $DELUGE_USER deluged) > /var/run/deluged.pid
- 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 /var/run/deluged.pid
- rm_daemon deluged
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
-
Copied: deluge/repos/extra-any/deluged (from rev 138413, deluge/trunk/deluged)
===================================================================
--- deluged (rev 0)
+++ deluged 2011-09-21 21:51:53 UTC (rev 138414)
@@ -0,0 +1,43 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+. /etc/conf.d/deluged
+
+[[ -f /var/run/deluged.pid ]] && PID=$(cat /var/run/deluged.pid)
+[[ -d /proc/$PID ]] || PID=
+
+case "$1" in
+ start)
+ stat_busy "Starting Deluge Daemon"
+ [[ -z $PID ]] && su -l -s /bin/sh -c "/usr/bin/deluged >/dev/null" $DELUGE_USER
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ sleep 1
+ echo $(pgrep -u $DELUGE_USER deluged) > /var/run/deluged.pid
+ 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 /var/run/deluged.pid
+ 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.d
===================================================================
--- deluged.conf.d 2011-09-21 21:50:56 UTC (rev 138413)
+++ deluged.conf.d 2011-09-21 21:51:53 UTC (rev 138414)
@@ -1 +0,0 @@
-DELUGE_USER="deluge"
Copied: deluge/repos/extra-any/deluged.conf.d (from rev 138413, deluge/trunk/deluged.conf.d)
===================================================================
--- deluged.conf.d (rev 0)
+++ deluged.conf.d 2011-09-21 21:51:53 UTC (rev 138414)
@@ -0,0 +1 @@
+DELUGE_USER="deluge"
More information about the arch-commits
mailing list