[arch-commits] Commit in deluge/trunk (PKGBUILD)

2012-04-14 Thread Jan Steffens
Date: Saturday, April 14, 2012 @ 10:21:34
  Author: heftig
Revision: 156148

1.3.5

Modified:
  deluge/trunk/PKGBUILD

--+
 PKGBUILD |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-04-14 12:49:49 UTC (rev 156147)
+++ PKGBUILD2012-04-14 14:21:34 UTC (rev 156148)
@@ -4,8 +4,8 @@
 # Contributor: Hugo Doria 
 
 pkgname=deluge
-pkgver=1.3.4
-pkgrel=2
+pkgver=1.3.5
+pkgrel=1
 pkgdesc="A BitTorrent client with multiple user interfaces in a client/server 
model"
 arch=('any')
 url="http://deluge-torrent.org/";
@@ -22,7 +22,7 @@
 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)
-md5sums=('44166604853180bb44de2d86b3705bf7'
+md5sums=('f17ef6686f33e12694b44976e5ed7721'
  'c50385d32a2db0ef3f46b8caadb0e988'
  'd58897b9deab9c46c1cff24c30e0f92a'
  '358dcf943f2251abee6caac62cb10f40'
@@ -49,8 +49,8 @@
   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.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"



[arch-commits] Commit in deluge/trunk (PKGBUILD)

2012-08-23 Thread Jan Steffens
Date: Thursday, August 23, 2012 @ 08:01:29
  Author: heftig
Revision: 165542

Make /srv/deluge 0664

Modified:
  deluge/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-08-23 12:00:31 UTC (rev 165541)
+++ PKGBUILD2012-08-23 12:01:29 UTC (rev 165542)
@@ -54,5 +54,5 @@
   install -Dm644 deluged.conf "$pkgdir/etc/conf.d/deluged"
  
   install -d "$pkgdir/srv"
-  install -d -o 125 -g 125 "$pkgdir/srv/deluge"
+  install -d -m 664 -o 125 -g 125 "$pkgdir/srv/deluge"
 }



[arch-commits] Commit in deluge/trunk (PKGBUILD)

2011-12-22 Thread Ionut Biru
Date: Thursday, December 22, 2011 @ 12:28:06
  Author: ibiru
Revision: 145454

fix dependency

Modified:
  deluge/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-12-22 17:14:44 UTC (rev 145453)
+++ PKGBUILD2011-12-22 17:28:06 UTC (rev 145454)
@@ -5,7 +5,7 @@
 
 pkgname=deluge
 pkgver=1.3.3
-pkgrel=4
+pkgrel=5
 pkgdesc="A BitTorrent client with multiple user interfaces in a client/server 
model"
 arch=('any')
 url="http://deluge-torrent.org/";
@@ -13,11 +13,11 @@
 depends=('pyxdg' 'libtorrent-rasterbar>=0.15.0' 'twisted' 'python2-pyopenssl'
  'xdg-utils' 'python2-chardet' 'desktop-file-utils' 
'hicolor-icon-theme'
  'python2-distribute')
-makedepends=('intltool' 'pygtk' 'librsvg' 'python-mako')
+makedepends=('intltool' 'pygtk' 'librsvg' 'python2-mako')
 optdepends=('python-notify: libnotify notifications'
 'pygtk: needed for gtk ui'
 'librsvg: needed for gtk ui'
-'python-mako: needed for web 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



[arch-commits] Commit in deluge/trunk (PKGBUILD)

2011-09-23 Thread Jan Steffens
Date: Friday, September 23, 2011 @ 05:31:51
  Author: heftig
Revision: 138437

upgpkg: deluge 1.3.3-4

undo dep change

Modified:
  deluge/trunk/PKGBUILD

--+
 PKGBUILD |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-09-23 04:20:09 UTC (rev 138436)
+++ PKGBUILD2011-09-23 09:31:51 UTC (rev 138437)
@@ -5,14 +5,15 @@
 
 pkgname=deluge
 pkgver=1.3.3
-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=('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')
+ 'xdg-utils' 'python2-chardet' 'desktop-file-utils' 
'hicolor-icon-theme'
+ 'python2-distribute')
+makedepends=('intltool' 'pygtk' 'librsvg' 'python-mako')
 optdepends=('python-notify: libnotify notifications'
 'pygtk: needed for gtk ui'
 'librsvg: needed for gtk ui'



[arch-commits] Commit in deluge/trunk (PKGBUILD)

2009-12-05 Thread Ionut Biru
Date: Saturday, December 5, 2009 @ 19:42:27
  Author: ibiru
Revision: 60658

upgpkg: deluge 1.1.9-3
rebuild agaisnt libtorrent-rasterbar 0.14.7

Modified:
  deluge/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2009-12-06 00:17:51 UTC (rev 60657)
+++ PKGBUILD2009-12-06 00:42:27 UTC (rev 60658)
@@ -3,13 +3,13 @@
 
 pkgname=deluge
 pkgver=1.1.9
-pkgrel=2
+pkgrel=3
 pkgdesc="A bittorrent client written with python and pygtk"
 arch=('i686' 'x86_64')
 url="http://deluge-torrent.org/";
 license=('GPL3')
-depends=('pygtk' 'boost>=1.39.0' 'pyxdg' 'dbus-python' 'librsvg' 
-'setuptools' 'libtorrent-rasterbar>=0.14.2')
+depends=('pygtk' 'boost>=1.41.0' 'pyxdg' 'dbus-python' 'librsvg'
+'setuptools' 'libtorrent-rasterbar>=0.14.7')
 makedepends=('subversion' 'intltool')
 optdepends=('python-chardet: used to load non-UTF8 encoded torrents')
 source=(http://download.deluge-torrent.org/source/${pkgname}-${pkgver}.tar.bz2 
deluged)



[arch-commits] Commit in deluge/trunk (PKGBUILD)

2009-12-10 Thread Ionut Biru
Date: Thursday, December 10, 2009 @ 17:20:20
  Author: ibiru
Revision: 61075

clean up dependency FS#17458

Modified:
  deluge/trunk/PKGBUILD

--+
 PKGBUILD |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2009-12-10 22:13:28 UTC (rev 61074)
+++ PKGBUILD2009-12-10 22:20:20 UTC (rev 61075)
@@ -8,8 +8,7 @@
 arch=('i686' 'x86_64')
 url="http://deluge-torrent.org/";
 license=('GPL3')
-depends=('pygtk' 'boost>=1.41.0' 'pyxdg' 'dbus-python' 'librsvg'
-'setuptools' 'libtorrent-rasterbar>=0.14.7')
+depends=('pygtk' 'pyxdg' 'dbus-python' 'librsvg' 'setuptools' 
'libtorrent-rasterbar>=0.14.7')
 makedepends=('subversion' 'intltool')
 optdepends=('python-chardet: used to load non-UTF8 encoded torrents')
 source=(http://download.deluge-torrent.org/source/${pkgname}-${pkgver}.tar.bz2 
deluged)



[arch-commits] Commit in deluge/trunk (PKGBUILD)

2013-08-12 Thread Jan Steffens
Date: Monday, August 12, 2013 @ 21:37:17
  Author: heftig
Revision: 192469

Update to stable snapshot

Modified:
  deluge/trunk/PKGBUILD

--+
 PKGBUILD |   13 ++---
 1 file changed, 6 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-08-12 19:24:44 UTC (rev 192468)
+++ PKGBUILD2013-08-12 19:37:17 UTC (rev 192469)
@@ -5,7 +5,8 @@
 
 pkgname=deluge
 pkgver=1.3.6
-pkgrel=1
+pkgrel=2
+_commit=06ee112
 pkgdesc="A BitTorrent client with multiple user interfaces in a client/server 
model"
 arch=('any')
 url="http://deluge-torrent.org/";
@@ -19,22 +20,20 @@
 '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
+source=(http://git.deluge-torrent.org/deluge/snapshot/$pkgname-$_commit.tar.bz2
 deluged.service deluge-web.service)
-md5sums=('956e70928437223d22b4a782134fa8c3'
+md5sums=('c7bd73523b1f6cb6b45d07114985f311'
  '17f51ac9a90f0dc41a20291444a7489b'
  '2a73f62c04e8b147c731fbb50666e846')
 
 build() {
-  cd $pkgname-$pkgver
+  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"
-  mv "$pkgdir/usr/share/icons/scalable" "$pkgdir/usr/share/icons/hicolor/"
 
   sed -i '1s/python$/&2/' \
 "$pkgdir/usr/lib/python2.7/site-packages/deluge/ui/Win32IconImagePlugin.py"



[arch-commits] Commit in deluge/trunk (PKGBUILD)

2013-08-17 Thread Jan Steffens
Date: Saturday, August 17, 2013 @ 21:39:29
  Author: heftig
Revision: 193173

dep

Modified:
  deluge/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-08-17 19:15:26 UTC (rev 193172)
+++ PKGBUILD2013-08-17 19:39:29 UTC (rev 193173)
@@ -13,7 +13,7 @@
 license=('GPL3')
 depends=(python2-xdg libtorrent-rasterbar twisted python2-pyopenssl
  xdg-utils python2-chardet desktop-file-utils hicolor-icon-theme
- python2-distribute)
+ python2-setuptools)
 makedepends=(intltool pygtk librsvg python2-mako)
 optdepends=('python2-notify: libnotify notifications'
 'pygtk: needed for gtk ui'



[arch-commits] Commit in deluge/trunk (PKGBUILD)

2013-08-25 Thread Jan Steffens
Date: Sunday, August 25, 2013 @ 09:58:37
  Author: heftig
Revision: 193599

try to fix twisted, again. FS#36413

Modified:
  deluge/trunk/PKGBUILD

--+
 PKGBUILD |   13 ++---
 1 file changed, 10 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-08-25 07:07:14 UTC (rev 193598)
+++ PKGBUILD2013-08-25 07:58:37 UTC (rev 193599)
@@ -5,7 +5,7 @@
 
 pkgname=deluge
 pkgver=1.3.6
-pkgrel=2
+pkgrel=3
 _commit=06ee112
 pkgdesc="A BitTorrent client with multiple user interfaces in a client/server 
model"
 arch=('any')
@@ -21,11 +21,18 @@
 '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)
+deluged.service deluge-web.service
+0001-Fix-twisted-13.1-compat.patch)
 md5sums=('c7bd73523b1f6cb6b45d07114985f311'
  '17f51ac9a90f0dc41a20291444a7489b'
- '2a73f62c04e8b147c731fbb50666e846')
+ '2a73f62c04e8b147c731fbb50666e846'
+ '1caad4531b400e8a8738b93ac6bafb62')
 
+prepare() {
+  cd $pkgname-$_commit
+  patch -Np1 -i ../0001-Fix-twisted-13.1-compat.patch
+}
+
 build() {
   cd $pkgname-$_commit
   python2 setup.py build



[arch-commits] Commit in deluge/trunk (PKGBUILD)

2013-06-23 Thread Jan Steffens
Date: Sunday, June 23, 2013 @ 21:48:20
  Author: heftig
Revision: 188879

there's no scalable theme. move to hicolor

Modified:
  deluge/trunk/PKGBUILD

--+
 PKGBUILD |1 +
 1 file changed, 1 insertion(+)

Modified: PKGBUILD
===
--- PKGBUILD2013-06-23 19:20:06 UTC (rev 188878)
+++ PKGBUILD2013-06-23 19:48:20 UTC (rev 188879)
@@ -34,6 +34,7 @@
   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"
+  mv "$pkgdir/usr/share/icons/scalable" "$pkgdir/usr/share/icons/hicolor/"
 
   sed -i '1s/python$/&2/' \
 "$pkgdir/usr/lib/python2.7/site-packages/deluge/ui/Win32IconImagePlugin.py"



[arch-commits] Commit in deluge/trunk (PKGBUILD)

2013-02-25 Thread Jan Steffens
Date: Tuesday, February 26, 2013 @ 08:35:27
  Author: heftig
Revision: 178684

1.3.6

Modified:
  deluge/trunk/PKGBUILD

--+
 PKGBUILD |   17 -
 1 file changed, 8 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-02-26 07:34:24 UTC (rev 178683)
+++ PKGBUILD2013-02-26 07:35:27 UTC (rev 178684)
@@ -4,8 +4,8 @@
 # Contributor: Hugo Doria 
 
 pkgname=deluge
-pkgver=1.3.5
-pkgrel=4
+pkgver=1.3.6
+pkgrel=1
 pkgdesc="A BitTorrent client with multiple user interfaces in a client/server 
model"
 arch=('any')
 url="http://deluge-torrent.org/";
@@ -19,25 +19,24 @@
 'librsvg: needed for gtk ui'
 'python2-mako: needed for web ui')
 install=deluge.install
-_commit=dcd85e64c0870306bfe412d9dfa675152f799dcb
-source=(http://git.deluge-torrent.org/deluge/snapshot/$pkgname-$_commit.tar.bz2
+source=(http://download.deluge-torrent.org/source/$pkgname-$pkgver.tar.lzma
 deluged.service deluge-web.service)
-md5sums=('a37bce6070b8cb6a652c262af9736f55'
+md5sums=('956e70928437223d22b4a782134fa8c3'
  'b55cb839a37e8315da4a0f6c99a75fd3'
  '2a73f62c04e8b147c731fbb50666e846')
 
 build() {
-  cd $pkgname-$_commit
+  cd $pkgname-$pkgver
   python2 setup.py build
 }
 
 package() {
-  cd $pkgname-$_commit
+  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"
 
-  _dir="$pkgdir/usr/lib/python2.7/site-packages/deluge/ui"
-  sed -i '1s/python$/&2/' "$_dir"/{Win32IconImagePlugin.py,web/gen_gettext.py}
+  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"



[arch-commits] Commit in deluge/trunk (PKGBUILD)

2011-07-22 Thread Ionut Biru
Date: Friday, July 22, 2011 @ 17:04:34
  Author: ibiru
Revision: 132319

update to 1.3.3

Modified:
  deluge/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-07-22 16:59:11 UTC (rev 132318)
+++ PKGBUILD2011-07-22 21:04:34 UTC (rev 132319)
@@ -3,7 +3,7 @@
 # Contributor: Hugo Doria 
 
 pkgname=deluge
-pkgver=1.3.2
+pkgver=1.3.3
 pkgrel=1
 pkgdesc="A bittorrent client written with python and pygtk"
 arch=('any')
@@ -18,7 +18,7 @@
 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=('f9e46e054c92e4fdd190eb17827a0bca'
+md5sums=('4027c60bb5d1c5da61e97a47e62ab1ab'
  '7d5790eeb14cd0b47d1bb3e0a19c9935'
  '332d23fe0d21ce92b494efd73322856c'
  '6c913ec7322eaa60494ac9d53103005f')



[arch-commits] Commit in deluge/trunk (PKGBUILD)

2014-11-30 Thread Jan Steffens
Date: Monday, December 1, 2014 @ 06:07:01
  Author: heftig
Revision: 227216

1.3.11

Modified:
  deluge/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-12-01 03:15:58 UTC (rev 227215)
+++ PKGBUILD2014-12-01 05:07:01 UTC (rev 227216)
@@ -4,7 +4,7 @@
 # Contributor: Hugo Doria 
 
 pkgname=deluge
-pkgver=1.3.10
+pkgver=1.3.11
 pkgrel=1
 pkgdesc="A BitTorrent client with multiple user interfaces in a client/server 
model"
 arch=('any')
@@ -20,7 +20,7 @@
 install=deluge.install
 source=(http://download.deluge-torrent.org/source/$pkgname-$pkgver.tar.lzma
 deluged.service deluge-web.service)
-md5sums=('94de62c6cc964b847ff9983461eb28e4'
+md5sums=('49f9f5fc751d49ddd415f02123de77a8'
  '17f51ac9a90f0dc41a20291444a7489b'
  '2a73f62c04e8b147c731fbb50666e846')
 


[arch-commits] Commit in deluge/trunk (PKGBUILD)

2014-08-18 Thread Bartłomiej Piotrowski
Date: Monday, August 18, 2014 @ 10:29:20
  Author: bpiotrowski
Revision: 220183

Rename twisted dependency to python2-twisted.

Modified:
  deluge/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-08-18 07:19:19 UTC (rev 220182)
+++ PKGBUILD2014-08-18 08:29:20 UTC (rev 220183)
@@ -10,7 +10,7 @@
 arch=('any')
 url="http://deluge-torrent.org/";
 license=('GPL3')
-depends=(python2-xdg libtorrent-rasterbar twisted python2-pyopenssl
+depends=(python2-xdg libtorrent-rasterbar python2-twisted python2-pyopenssl
  python2-chardet python2-setuptools)
 makedepends=(intltool pygtk librsvg python2-mako)
 optdepends=('python2-notify: libnotify notifications'
@@ -43,7 +43,7 @@
   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"
 }



[arch-commits] Commit in deluge/trunk (PKGBUILD)

2014-08-31 Thread Jan Steffens
Date: Sunday, August 31, 2014 @ 21:35:37
  Author: heftig
Revision: 220847

Don't patch python files post-install

Modified:
  deluge/trunk/PKGBUILD

--+
 PKGBUILD |   11 ---
 1 file changed, 4 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-08-31 19:25:05 UTC (rev 220846)
+++ PKGBUILD2014-08-31 19:35:37 UTC (rev 220847)
@@ -5,7 +5,7 @@
 
 pkgname=deluge
 pkgver=1.3.7
-pkgrel=2
+pkgrel=3
 pkgdesc="A BitTorrent client with multiple user interfaces in a client/server 
model"
 arch=('any')
 url="http://deluge-torrent.org/";
@@ -26,6 +26,7 @@
 
 prepare() {
   cd $pkgname-$pkgver
+  sed -i '1s/python$/&2/' deluge/ui/Win32IconImagePlugin.py
 }
 
 build() {
@@ -37,13 +38,9 @@
   cd $pkgname-$pkgver
   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"
+  install -Dm644 ../deluged.service 
"$pkgdir/usr/lib/systemd/system/deluged.service"
+  install -Dm644 ../deluge-web.service 
"$pkgdir/usr/lib/systemd/system/deluge-web.service"
 
-  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"
 }



[arch-commits] Commit in deluge/trunk (PKGBUILD)

2014-10-25 Thread Jan Steffens
Date: Sunday, October 26, 2014 @ 00:05:03
  Author: heftig
Revision: 225331

1.3.8

Modified:
  deluge/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-10-25 18:46:23 UTC (rev 225330)
+++ PKGBUILD2014-10-25 22:05:03 UTC (rev 225331)
@@ -4,8 +4,8 @@
 # Contributor: Hugo Doria 
 
 pkgname=deluge
-pkgver=1.3.7
-pkgrel=3
+pkgver=1.3.8
+pkgrel=1
 pkgdesc="A BitTorrent client with multiple user interfaces in a client/server 
model"
 arch=('any')
 url="http://deluge-torrent.org/";
@@ -20,7 +20,7 @@
 install=deluge.install
 source=(http://download.deluge-torrent.org/source/$pkgname-$pkgver.tar.lzma
 deluged.service deluge-web.service)
-md5sums=('86a9a4033b6e3bd4823fbd60a6db316e'
+md5sums=('1aa06bd196711a3169023827462ee21d'
  '17f51ac9a90f0dc41a20291444a7489b'
  '2a73f62c04e8b147c731fbb50666e846')
 


[arch-commits] Commit in deluge/trunk (PKGBUILD)

2014-10-25 Thread Jan Steffens
Date: Sunday, October 26, 2014 @ 00:10:37
  Author: heftig
Revision: 225333

1.3.10

Modified:
  deluge/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-10-25 22:05:46 UTC (rev 225332)
+++ PKGBUILD2014-10-25 22:10:37 UTC (rev 225333)
@@ -4,7 +4,7 @@
 # Contributor: Hugo Doria 
 
 pkgname=deluge
-pkgver=1.3.8
+pkgver=1.3.10
 pkgrel=1
 pkgdesc="A BitTorrent client with multiple user interfaces in a client/server 
model"
 arch=('any')
@@ -20,7 +20,7 @@
 install=deluge.install
 source=(http://download.deluge-torrent.org/source/$pkgname-$pkgver.tar.lzma
 deluged.service deluge-web.service)
-md5sums=('1aa06bd196711a3169023827462ee21d'
+md5sums=('94de62c6cc964b847ff9983461eb28e4'
  '17f51ac9a90f0dc41a20291444a7489b'
  '2a73f62c04e8b147c731fbb50666e846')
 


[arch-commits] Commit in deluge/trunk (PKGBUILD)

2014-07-11 Thread Jan Steffens
Date: Friday, July 11, 2014 @ 19:21:35
  Author: heftig
Revision: 216811

1.3.7

Modified:
  deluge/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-07-11 17:21:33 UTC (rev 216810)
+++ PKGBUILD2014-07-11 17:21:35 UTC (rev 216811)
@@ -4,8 +4,8 @@
 # Contributor: Hugo Doria 
 
 pkgname=deluge
-pkgver=1.3.6
-pkgrel=4
+pkgver=1.3.7
+pkgrel=1
 _commit=018330c
 pkgdesc="A BitTorrent client with multiple user interfaces in a client/server 
model"
 arch=('any')



[arch-commits] Commit in deluge/trunk (PKGBUILD)

2014-07-12 Thread Jan Steffens
Date: Saturday, July 12, 2014 @ 15:06:37
  Author: heftig
Revision: 216835

1.3.7, for real this time

Modified:
  deluge/trunk/PKGBUILD

--+
 PKGBUILD |   13 ++---
 1 file changed, 6 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-07-12 04:49:50 UTC (rev 216834)
+++ PKGBUILD2014-07-12 13:06:37 UTC (rev 216835)
@@ -5,8 +5,7 @@
 
 pkgname=deluge
 pkgver=1.3.7
-pkgrel=1
-_commit=018330c
+pkgrel=2
 pkgdesc="A BitTorrent client with multiple user interfaces in a client/server 
model"
 arch=('any')
 url="http://deluge-torrent.org/";
@@ -19,23 +18,23 @@
 '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
+source=(http://download.deluge-torrent.org/source/$pkgname-$pkgver.tar.lzma
 deluged.service deluge-web.service)
-md5sums=('272853d17d9ec67769efda16bb3b14e9'
+md5sums=('86a9a4033b6e3bd4823fbd60a6db316e'
  '17f51ac9a90f0dc41a20291444a7489b'
  '2a73f62c04e8b147c731fbb50666e846')
 
 prepare() {
-  cd $pkgname-$_commit
+  cd $pkgname-$pkgver
 }
 
 build() {
-  cd $pkgname-$_commit
+  cd $pkgname-$pkgver
   python2 setup.py build
 }
 
 package() {
-  cd $pkgname-$_commit
+  cd $pkgname-$pkgver
   python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
 
   sed -i '1s/python$/&2/' \



[arch-commits] Commit in deluge/trunk (PKGBUILD)

2010-10-31 Thread Ionut Biru
Date: Sunday, October 31, 2010 @ 18:31:52
  Author: ibiru
Revision: 97661

upgpkg: deluge 1.3.1-1
update to 1.3.1

Modified:
  deluge/trunk/PKGBUILD

--+
 PKGBUILD |   13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-10-31 22:07:27 UTC (rev 97660)
+++ PKGBUILD2010-10-31 22:31:52 UTC (rev 97661)
@@ -3,8 +3,8 @@
 # Contributor: Hugo Doria 
 
 pkgname=deluge
-pkgver=1.3.0
-pkgrel=2
+pkgver=1.3.1
+pkgrel=1
 pkgdesc="A bittorrent client written with python and pygtk"
 arch=('any')
 url="http://deluge-torrent.org/";
@@ -18,6 +18,11 @@
 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=('496a9cfaf01e6cf7ab141498acf2d1f1'
+ '7d5790eeb14cd0b47d1bb3e0a19c9935'
+ '332d23fe0d21ce92b494efd73322856c'
+ '6c913ec7322eaa60494ac9d53103005f')
+
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   python2 setup.py build
@@ -33,7 +38,3 @@
   install -D -m755 "${srcdir}"/deluge-web "${pkgdir}"/etc/rc.d/deluge-web
   install -D -m644 "${srcdir}"/deluged.conf.d "${pkgdir}"/etc/conf.d/deluged
 }
-md5sums=('5fca34e2e31753a8ba0ccb942f0e993e'
- '7d5790eeb14cd0b47d1bb3e0a19c9935'
- '332d23fe0d21ce92b494efd73322856c'
- '6c913ec7322eaa60494ac9d53103005f')



[arch-commits] Commit in deluge/trunk (PKGBUILD)

2010-10-31 Thread Ionut Biru
Date: Sunday, October 31, 2010 @ 18:48:57
  Author: ibiru
Revision: 97664

setuptools was replaced by python2-distribute

Modified:
  deluge/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-10-31 22:32:21 UTC (rev 97663)
+++ PKGBUILD2010-10-31 22:48:57 UTC (rev 97664)
@@ -9,8 +9,8 @@
 arch=('any')
 url="http://deluge-torrent.org/";
 license=('GPL3')
-depends=('pyxdg' 'setuptools' 'libtorrent-rasterbar>=0.15.0' 'twisted' 
'pyopenssl' 'xdg-utils' 'python-chardet')
-makedepends=( 'intltool' 'pygtk' 'librsvg' 'python-mako')
+depends=('pyxdg' 'python2-distribute' 'libtorrent-rasterbar>=0.15.0' 'twisted' 
'pyopenssl' 'xdg-utils' 'python-chardet')
+makedepends=('intltool' 'pygtk' 'librsvg' 'python-mako')
 optdepends=('python-notify: libnotify notifications'
'pygtk: needed for gtk ui'
'librsvg: needed for gtk ui'



[arch-commits] Commit in deluge/trunk (PKGBUILD)

2010-12-05 Thread Ionut Biru
Date: Sunday, December 5, 2010 @ 11:03:42
  Author: ibiru
Revision: 102087

upgpkg: deluge 1.3.1-2
depend on python2-chardet now that python-chardet is built for python3

Modified:
  deluge/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-12-05 16:00:20 UTC (rev 102086)
+++ PKGBUILD2010-12-05 16:03:42 UTC (rev 102087)
@@ -4,12 +4,12 @@
 
 pkgname=deluge
 pkgver=1.3.1
-pkgrel=1
+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' 
'pyopenssl' 'xdg-utils' 'python-chardet')
+depends=('pyxdg' 'python2-distribute' 'libtorrent-rasterbar>=0.15.0' 'twisted' 
'pyopenssl' 'xdg-utils' 'python2-chardet')
 makedepends=('intltool' 'pygtk' 'librsvg' 'python-mako')
 optdepends=('python-notify: libnotify notifications'
'pygtk: needed for gtk ui'



[arch-commits] Commit in deluge/trunk (PKGBUILD)

2011-01-24 Thread Ionut Biru
Date: Monday, January 24, 2011 @ 08:58:44
  Author: ibiru
Revision: 107374

upgpkg: deluge 1.3.1-3
use python2-pyopenssl

Modified:
  deluge/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-01-24 13:55:19 UTC (rev 107373)
+++ PKGBUILD2011-01-24 13:58:44 UTC (rev 107374)
@@ -4,12 +4,12 @@
 
 pkgname=deluge
 pkgver=1.3.1
-pkgrel=2
+pkgrel=3
 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' 
'pyopenssl' 'xdg-utils' 'python2-chardet')
+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'



[arch-commits] Commit in deluge/trunk (PKGBUILD)

2010-02-05 Thread Ionut Biru
Date: Friday, February 5, 2010 @ 18:53:23
  Author: ibiru
Revision: 67278

upgpkg: deluge 1.2.0-2
FS#17865 move python-chardet to dependency as is used by both UIs

Modified:
  deluge/trunk/PKGBUILD

--+
 PKGBUILD |   11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-02-05 23:51:00 UTC (rev 67277)
+++ PKGBUILD2010-02-05 23:53:23 UTC (rev 67278)
@@ -1,22 +1,23 @@
 # $Id$
-# Maintainer: Hugo Doria 
+# Maintainer : Ionut Biru 
+# Contributor: Hugo Doria 
 
 pkgname=deluge
 pkgver=1.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A bittorrent client written with python and pygtk"
 arch=('i686' 'x86_64')
 url="http://deluge-torrent.org/";
 license=('GPL3')
-depends=('pyxdg' 'dbus-python' 'setuptools' 'libtorrent-rasterbar>=0.14.7' 
'twisted' 'pyopenssl' 'xdg-utils')
+depends=('pyxdg' 'dbus-python' 'setuptools' 'libtorrent-rasterbar>=0.14.7' 
'twisted' 'pyopenssl' 'xdg-utils' 'python-chardet')
 makedepends=( 'intltool' 'pygtk' 'librsvg' 'python-mako')
 optdepends=('python-notify: libnotify notifications'
-   'python-chardet: needed for UIs'
'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)
-install="deluge.install"
+install=deluge.install
+backup=(etc/conf.d/deluged)
 md5sums=('13ac84e9b5b0293eccb5d89a9fc49461'
  'a462fc27d283ecec9bbd52b840d27262'
  '332d23fe0d21ce92b494efd73322856c')



[arch-commits] Commit in deluge/trunk (PKGBUILD)

2010-03-05 Thread Ionut Biru
Date: Friday, March 5, 2010 @ 03:17:54
  Author: ibiru
Revision: 71184

upgpkg: deluge 1.2.1-2
remove dbus-python depedendency and moved xdg-utils to optdepends since is 
needed only for gtk gui

Modified:
  deluge/trunk/PKGBUILD

--+
 PKGBUILD |9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-03-05 04:20:51 UTC (rev 71183)
+++ PKGBUILD2010-03-05 08:17:54 UTC (rev 71184)
@@ -1,19 +1,20 @@
 # $Id$
-# Maintainer : Ionut Biru 
+# Maintainer : Ionut Biru 
 # Contributor: Hugo Doria 
 
 pkgname=deluge
 pkgver=1.2.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A bittorrent client written with python and pygtk"
 arch=('i686' 'x86_64')
 url="http://deluge-torrent.org/";
 license=('GPL3')
-depends=('pyxdg' 'dbus-python' 'setuptools' 'libtorrent-rasterbar>=0.14.9' 
'twisted' 'pyopenssl' 'xdg-utils' 'python-chardet')
+depends=('pyxdg' 'setuptools' 'libtorrent-rasterbar>=0.14.9' 'twisted' 
'pyopenssl' 'python-chardet')
 makedepends=( 'intltool' 'pygtk' 'librsvg' 'python-mako')
 optdepends=('python-notify: libnotify notifications'
'pygtk: needed for gtk ui'
'librsvg: needed for gtk ui'
+   'xdg-utils: 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)
 install=deluge.install
@@ -25,7 +26,7 @@
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   python setup.py build || return 1
-  python setup.py install --prefix=/usr --root="${pkgdir}" || return 1
+  python setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 || 
return 1
 
   install -d -m755 "${pkgdir}"/srv/deluge || return 1
   install -D -m644 deluge/data/pixmaps/deluge.svg 
"${pkgdir}"/usr/share/pixmaps/deluge.svg || return 1



[arch-commits] Commit in deluge/trunk (PKGBUILD)

2010-03-05 Thread Ionut Biru
Date: Friday, March 5, 2010 @ 03:50:44
  Author: ibiru
Revision: 71189

upgpkg: deluge 1.2.1-2
xdg-utils is used in .install

Modified:
  deluge/trunk/PKGBUILD

--+
 PKGBUILD |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-03-05 08:18:54 UTC (rev 71188)
+++ PKGBUILD2010-03-05 08:50:44 UTC (rev 71189)
@@ -9,12 +9,11 @@
 arch=('i686' 'x86_64')
 url="http://deluge-torrent.org/";
 license=('GPL3')
-depends=('pyxdg' 'setuptools' 'libtorrent-rasterbar>=0.14.9' 'twisted' 
'pyopenssl' 'python-chardet')
+depends=('pyxdg' 'setuptools' 'libtorrent-rasterbar>=0.14.9' 'twisted' 
'pyopenssl' 'xdg-utils' 'python-chardet')
 makedepends=( 'intltool' 'pygtk' 'librsvg' 'python-mako')
 optdepends=('python-notify: libnotify notifications'
'pygtk: needed for gtk ui'
'librsvg: needed for gtk ui'
-   'xdg-utils: 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)
 install=deluge.install



[arch-commits] Commit in deluge/trunk (PKGBUILD)

2010-03-20 Thread Ionut Biru
Date: Saturday, March 20, 2010 @ 15:08:40
  Author: ibiru
Revision: 72857

upgpkg: deluge 1.2.2-1
update to 1.2.2

Modified:
  deluge/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-03-20 18:54:48 UTC (rev 72856)
+++ PKGBUILD2010-03-20 19:08:40 UTC (rev 72857)
@@ -3,8 +3,8 @@
 # Contributor: Hugo Doria 
 
 pkgname=deluge
-pkgver=1.2.1
-pkgrel=2
+pkgver=1.2.2
+pkgrel=1
 pkgdesc="A bittorrent client written with python and pygtk"
 arch=('i686' 'x86_64')
 url="http://deluge-torrent.org/";
@@ -18,7 +18,7 @@
 source=(http://download.deluge-torrent.org/source/${pkgname}-${pkgver}.tar.bz2 
deluged deluged.conf.d deluge-web)
 install=deluge.install
 backup=(etc/conf.d/deluged)
-md5sums=('ea6d6c7af48ca05e4e808c960563d78d' 'e187f10be1f4a445ae1bc76693a16e8a'
+md5sums=('535f65ef9854073189c9fb604a673c9f' 'e187f10be1f4a445ae1bc76693a16e8a'
  '332d23fe0d21ce92b494efd73322856c' '25a4c2b62e0e00427dd72247c0da1617')
 
 build() {



[arch-commits] Commit in deluge/trunk (PKGBUILD)

2010-03-27 Thread Ionut Biru
Date: Saturday, March 27, 2010 @ 19:55:24
  Author: ibiru
Revision: 73748

upgpkg: deluge 1.2.3-1
update to 1.2.3

Modified:
  deluge/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-03-27 23:55:13 UTC (rev 73747)
+++ PKGBUILD2010-03-27 23:55:24 UTC (rev 73748)
@@ -3,13 +3,13 @@
 # Contributor: Hugo Doria 
 
 pkgname=deluge
-pkgver=1.2.2
+pkgver=1.2.3
 pkgrel=1
 pkgdesc="A bittorrent client written with python and pygtk"
 arch=('i686' 'x86_64')
 url="http://deluge-torrent.org/";
 license=('GPL3')
-depends=('pyxdg' 'setuptools' 'libtorrent-rasterbar>=0.14.9' 'twisted' 
'pyopenssl' 'xdg-utils' 'python-chardet')
+depends=('pyxdg' 'setuptools' 'libtorrent-rasterbar>=0.15.0' 'twisted' 
'pyopenssl' 'xdg-utils' 'python-chardet')
 makedepends=( 'intltool' 'pygtk' 'librsvg' 'python-mako')
 optdepends=('python-notify: libnotify notifications'
'pygtk: needed for gtk ui'
@@ -18,7 +18,7 @@
 source=(http://download.deluge-torrent.org/source/${pkgname}-${pkgver}.tar.bz2 
deluged deluged.conf.d deluge-web)
 install=deluge.install
 backup=(etc/conf.d/deluged)
-md5sums=('535f65ef9854073189c9fb604a673c9f' 'e187f10be1f4a445ae1bc76693a16e8a'
+md5sums=('f1dbc8734c1881b115b98f572e523a4d' 'e187f10be1f4a445ae1bc76693a16e8a'
  '332d23fe0d21ce92b494efd73322856c' '25a4c2b62e0e00427dd72247c0da1617')
 
 build() {



[arch-commits] Commit in deluge/trunk (PKGBUILD)

2011-05-25 Thread Ionut Biru
Date: Wednesday, May 25, 2011 @ 08:03:05
  Author: ibiru
Revision: 124945

update to 1.3.2

Modified:
  deluge/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-05-25 10:38:26 UTC (rev 124944)
+++ PKGBUILD2011-05-25 12:03:05 UTC (rev 124945)
@@ -3,8 +3,8 @@
 # Contributor: Hugo Doria 
 
 pkgname=deluge
-pkgver=1.3.1
-pkgrel=3
+pkgver=1.3.2
+pkgrel=1
 pkgdesc="A bittorrent client written with python and pygtk"
 arch=('any')
 url="http://deluge-torrent.org/";
@@ -18,7 +18,7 @@
 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=('496a9cfaf01e6cf7ab141498acf2d1f1'
+md5sums=('f9e46e054c92e4fdd190eb17827a0bca'
  '7d5790eeb14cd0b47d1bb3e0a19c9935'
  '332d23fe0d21ce92b494efd73322856c'
  '6c913ec7322eaa60494ac9d53103005f')



[arch-commits] Commit in deluge/trunk (PKGBUILD)

2016-07-21 Thread Jan Steffens
Date: Thursday, July 21, 2016 @ 09:04:27
  Author: heftig
Revision: 272082

1.3.13-1

Modified:
  deluge/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-07-21 08:58:38 UTC (rev 272081)
+++ PKGBUILD2016-07-21 09:04:27 UTC (rev 272082)
@@ -4,7 +4,7 @@
 # Contributor: Hugo Doria 
 
 pkgname=deluge
-pkgver=1.3.12+73+g5f92810
+pkgver=1.3.13
 pkgrel=1
 pkgdesc="A BitTorrent client with multiple user interfaces in a client/server 
model"
 arch=(any)
@@ -18,7 +18,7 @@
 'librsvg: needed for gtk ui'
 'python2-mako: needed for web ui')
 install=deluge.install
-_commit=5f92810f761e7df7b1f03e916535ad8b4ce6c08c
+_commit=226346311412c164cfb5e467d04b1ee8627bc015
 source=("git://git.deluge-torrent.org/deluge.git#commit=$_commit"
 deluged.service deluge-web.service)
 sha256sums=('SKIP'


[arch-commits] Commit in deluge/trunk (PKGBUILD)

2010-09-02 Thread Rémy Oudompheng
Date: Thursday, September 2, 2010 @ 16:08:48
  Author: remy
Revision: 89641

upgpkg: deluge 1.2.3-7
Change  to any. Rebuild for python2.

Modified:
  deluge/trunk/PKGBUILD

--+
 PKGBUILD |   12 
 1 file changed, 8 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-09-02 19:59:34 UTC (rev 89640)
+++ PKGBUILD2010-09-02 20:08:48 UTC (rev 89641)
@@ -4,9 +4,9 @@
 
 pkgname=deluge
 pkgver=1.2.3
-pkgrel=6
+pkgrel=7
 pkgdesc="A bittorrent client written with python and pygtk"
-arch=('i686' 'x86_64')
+arch=('any')
 url="http://deluge-torrent.org/";
 license=('GPL3')
 depends=('pyxdg' 'setuptools' 'libtorrent-rasterbar>=0.15.0' 'twisted' 
'pyopenssl' 'xdg-utils' 'python-chardet')
@@ -28,9 +28,13 @@
 
   patch -Np1 -i "${srcdir}/fix_freeze.patch" || return 1
 
-  python setup.py build || return 1
-  python setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 || 
return 1
+  python2 setup.py build
+}
 
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  python2 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 || 
return 1
+
   install -d -m755 "${pkgdir}"/srv/deluge || return 1
   install -D -m644 deluge/data/pixmaps/deluge.svg 
"${pkgdir}"/usr/share/pixmaps/deluge.svg || return 1
   install -D -m755 "${srcdir}"/deluged "${pkgdir}"/etc/rc.d/deluged || return 1



[arch-commits] Commit in deluge/trunk (PKGBUILD)

2010-09-19 Thread Ionut Biru
Date: Sunday, September 19, 2010 @ 05:08:01
  Author: ibiru
Revision: 90949

upgpkg: deluge 1.3.0-1
update to 1.3.0

Modified:
  deluge/trunk/PKGBUILD

--+
 PKGBUILD |   31 +--
 1 file changed, 13 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-09-19 08:53:03 UTC (rev 90948)
+++ PKGBUILD2010-09-19 09:08:01 UTC (rev 90949)
@@ -3,8 +3,8 @@
 # Contributor: Hugo Doria 
 
 pkgname=deluge
-pkgver=1.2.3
-pkgrel=7
+pkgver=1.3.0
+pkgrel=1
 pkgdesc="A bittorrent client written with python and pygtk"
 arch=('any')
 url="http://deluge-torrent.org/";
@@ -15,29 +15,24 @@
'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
-   fix_freeze.patch)
+source=(http://download.deluge-torrent.org/source/${pkgname}-${pkgver}.tar.bz2 
deluged deluged.conf.d deluge-web)
 install=deluge.install
-backup=(etc/conf.d/deluged)
-md5sums=('f1dbc8734c1881b115b98f572e523a4d' '7d5790eeb14cd0b47d1bb3e0a19c9935'
- '332d23fe0d21ce92b494efd73322856c' '6c913ec7322eaa60494ac9d53103005f'
- '09af9b6badccb2fd5d24f8cbe9a109a7')
-
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-
-  patch -Np1 -i "${srcdir}/fix_freeze.patch" || return 1
-
   python2 setup.py build
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  python2 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 || 
return 1
+  python2 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1
 
-  install -d -m755 "${pkgdir}"/srv/deluge || return 1
-  install -D -m644 deluge/data/pixmaps/deluge.svg 
"${pkgdir}"/usr/share/pixmaps/deluge.svg || return 1
-  install -D -m755 "${srcdir}"/deluged "${pkgdir}"/etc/rc.d/deluged || return 1
-  install -D -m755 "${srcdir}"/deluge-web "${pkgdir}"/etc/rc.d/deluge-web || 
return 1
-  install -D -m644 "${srcdir}"/deluged.conf.d "${pkgdir}"/etc/conf.d/deluged 
|| return 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
 }
+md5sums=('5fca34e2e31753a8ba0ccb942f0e993e'
+ '7d5790eeb14cd0b47d1bb3e0a19c9935'
+ '332d23fe0d21ce92b494efd73322856c'
+ '6c913ec7322eaa60494ac9d53103005f')



[arch-commits] Commit in deluge/trunk (PKGBUILD)

2010-09-19 Thread Ionut Biru
Date: Sunday, September 19, 2010 @ 05:20:39
  Author: ibiru
Revision: 90954

upgpkg: deluge 1.3.0-2
python 2.7

Modified:
  deluge/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-09-19 09:14:30 UTC (rev 90953)
+++ PKGBUILD2010-09-19 09:20:39 UTC (rev 90954)
@@ -4,7 +4,7 @@
 
 pkgname=deluge
 pkgver=1.3.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A bittorrent client written with python and pygtk"
 arch=('any')
 url="http://deluge-torrent.org/";



[arch-commits] Commit in deluge/trunk (PKGBUILD)

2017-03-07 Thread Jan Steffens
Date: Tuesday, March 7, 2017 @ 15:28:44
  Author: heftig
Revision: 290095

1.3.14-1

Modified:
  deluge/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-03-07 15:24:02 UTC (rev 290094)
+++ PKGBUILD2017-03-07 15:28:44 UTC (rev 290095)
@@ -4,7 +4,7 @@
 # Contributor: Hugo Doria 
 
 pkgname=deluge
-pkgver=1.3.13+11+g48cedf635
+pkgver=1.3.14
 pkgrel=1
 pkgdesc="A BitTorrent client with multiple user interfaces in a client/server 
model"
 arch=(any)
@@ -18,7 +18,7 @@
 'librsvg: needed for gtk ui'
 'python2-mako: needed for web ui')
 install=deluge.install
-_commit=48cedf635feb01b81d927e7e84d13067931381d7  # 1.3-stable
+_commit=9bec5142c72a386a3cb40d3b3169b1ad68a1d969  # tags/deluge-1.3.14^0
 source=("git://git.deluge-torrent.org/deluge.git#commit=$_commit"
 untag-build.patch
 deluged.service deluge-web.service)


[arch-commits] Commit in deluge/trunk (PKGBUILD)

2017-01-07 Thread Jan Steffens
Date: Saturday, January 7, 2017 @ 15:25:20
  Author: heftig
Revision: 285529

1.3.13+11+g48cedf635-1

Modified:
  deluge/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-01-07 15:11:33 UTC (rev 285528)
+++ PKGBUILD2017-01-07 15:25:20 UTC (rev 285529)
@@ -4,7 +4,7 @@
 # Contributor: Hugo Doria 
 
 pkgname=deluge
-pkgver=1.3.13+2+g6c73105
+pkgver=1.3.13+11+g48cedf635
 pkgrel=1
 pkgdesc="A BitTorrent client with multiple user interfaces in a client/server 
model"
 arch=(any)
@@ -18,7 +18,7 @@
 'librsvg: needed for gtk ui'
 'python2-mako: needed for web ui')
 install=deluge.install
-_commit=6c73105a7307508c8267614bfe0be9a34b9bfb36  # 1.3-stable
+_commit=48cedf635feb01b81d927e7e84d13067931381d7  # 1.3-stable
 source=("git://git.deluge-torrent.org/deluge.git#commit=$_commit"
 untag-build.patch
 deluged.service deluge-web.service)


[arch-commits] Commit in deluge/trunk (PKGBUILD)

2017-05-12 Thread Jan Steffens
Date: Friday, May 12, 2017 @ 21:49:47
  Author: heftig
Revision: 295873

1.3.15-1

Modified:
  deluge/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-05-12 19:40:12 UTC (rev 295872)
+++ PKGBUILD2017-05-12 21:49:47 UTC (rev 295873)
@@ -4,7 +4,7 @@
 # Contributor: Hugo Doria 
 
 pkgname=deluge
-pkgver=1.3.14
+pkgver=1.3.15
 pkgrel=1
 pkgdesc="A BitTorrent client with multiple user interfaces in a client/server 
model"
 arch=(any)
@@ -18,7 +18,7 @@
 'librsvg: needed for gtk ui'
 'python2-mako: needed for web ui')
 install=deluge.install
-_commit=9bec5142c72a386a3cb40d3b3169b1ad68a1d969  # tags/deluge-1.3.14^0
+_commit=a6e8ac8725c2be28679e26b7c6674aad339338b1  # tags/deluge-1.3.15^0
 source=("git://git.deluge-torrent.org/deluge.git#commit=$_commit"
 untag-build.patch
 deluged.service deluge-web.service)


[arch-commits] Commit in deluge/trunk (PKGBUILD)

2017-05-27 Thread Jan Steffens
Date: Saturday, May 27, 2017 @ 08:50:53
  Author: heftig
Revision: 296670

1.3.15+2+g38d7b7cdf-1

Modified:
  deluge/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-05-27 07:01:40 UTC (rev 296669)
+++ PKGBUILD2017-05-27 08:50:53 UTC (rev 296670)
@@ -4,7 +4,7 @@
 # Contributor: Hugo Doria 
 
 pkgname=deluge
-pkgver=1.3.15
+pkgver=1.3.15+2+g38d7b7cdf
 pkgrel=1
 pkgdesc="A BitTorrent client with multiple user interfaces in a client/server 
model"
 arch=(any)
@@ -18,7 +18,7 @@
 'librsvg: needed for gtk ui'
 'python2-mako: needed for web ui')
 install=deluge.install
-_commit=a6e8ac8725c2be28679e26b7c6674aad339338b1  # tags/deluge-1.3.15^0
+_commit=38d7b7cdfde3c50d6263602ffb03af92fcbfa52e  # 1.3-stable
 source=("git://git.deluge-torrent.org/deluge.git#commit=$_commit"
 untag-build.patch
 deluged.service deluge-web.service)


[arch-commits] Commit in deluge/trunk (PKGBUILD)

2020-07-19 Thread Jan Steffens via arch-commits
Date: Sunday, July 19, 2020 @ 09:09:05
  Author: heftig
Revision: 392268

maintainer

Modified:
  deluge/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-07-19 09:07:50 UTC (rev 392267)
+++ PKGBUILD2020-07-19 09:09:05 UTC (rev 392268)
@@ -1,4 +1,4 @@
-# Maintainer: Jan Alexander Steffens (heftig) 
+# Maintainer: Jan Alexander Steffens (heftig) 
 # Contributor: Ionut Biru 
 # Contributor: Hugo Doria 
 


[arch-commits] Commit in deluge/trunk (PKGBUILD)

2020-11-12 Thread Evangelos Foutras via arch-commits
Date: Thursday, November 12, 2020 @ 18:45:49
  Author: foutrelis
Revision: 400676

upgpkg: deluge 2.0.4.dev38+g23a48dd01-3: Python 3.9 rebuild

Modified:
  deluge/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-11-12 18:45:26 UTC (rev 400675)
+++ PKGBUILD2020-11-12 18:45:49 UTC (rev 400676)
@@ -5,7 +5,7 @@
 pkgbase=deluge
 pkgname=(deluge deluge-gtk)
 pkgver=2.0.4.dev38+g23a48dd01
-pkgrel=2
+pkgrel=3
 pkgdesc="BitTorrent client with multiple user interfaces in a client/server 
model"
 url="https://deluge-torrent.org/";
 arch=(any)


[arch-commits] Commit in deluge/trunk (PKGBUILD)

2020-02-21 Thread Jan Steffens via arch-commits
Date: Friday, February 21, 2020 @ 15:19:51
  Author: heftig
Revision: 375989

2.0.4.dev23+g2f1c008a2-2: FS#64947: Split GTK UI and move xdg-utils dep

Modified:
  deluge/trunk/PKGBUILD

--+
 PKGBUILD |   66 +++--
 1 file changed, 47 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-02-21 13:54:53 UTC (rev 375988)
+++ PKGBUILD2020-02-21 15:19:51 UTC (rev 375989)
@@ -2,12 +2,13 @@
 # Contributor: Ionut Biru 
 # Contributor: Hugo Doria 
 
-pkgname=deluge
+pkgbase=deluge
+pkgname=(deluge deluge-gtk)
 pkgver=2.0.4.dev23+g2f1c008a2
-pkgrel=1
-pkgdesc="A BitTorrent client with multiple user interfaces in a client/server 
model"
+pkgrel=2
+pkgdesc="BitTorrent client with multiple user interfaces in a client/server 
model"
+url="https://deluge-torrent.org/";
 arch=(any)
-url="https://deluge-torrent.org/";
 license=(GPL3)
 depends=(
   # Follows DEPENDS.md
@@ -16,7 +17,6 @@
   python-pyopenssl
   'python-rencode>=1.0.2'
   python-xdg
-  xdg-utils
   python-six
   'python-zope-interface>=4.4.2' 
   python-chardet 
@@ -35,40 +35,42 @@
   python-gobject
   python-cairo
   librsvg
+  xdg-utils
   libappindicator-gtk3
   #python-pygame
   libnotify
   git
 )
-optdepends=(
-  'gtk3: gtk ui'
-  'python-gobject: gtk ui'
-  'python-cairo: gtk ui'
-  'librsvg: gtk ui'
-  'libappindicator-gtk3: appindicator notifications'
-  #'python-pygame: audible notifications'
-  'libnotify: desktop notifications'
-)
 _commit=2f1c008a26b50ab3487bd03bcabb39347d441f23  # develop
 source=("git://git.deluge-torrent.org/deluge.git#commit=$_commit")
 sha256sums=('SKIP')
 
 pkgver() {
-  cd $pkgname
+  cd deluge
   git describe --tags | sed 's/^deluge-//;s/dev0-/dev/;s/-/+/g'
 }
 
 prepare() {
-  cd $pkgname
+  cd deluge
 }
 
 build() {
-  cd $pkgname
+  cd deluge
   python setup.py build
 }
 
-package() {
-  cd $pkgname
+_pick() {
+  local p="$1" f d; shift
+  for f; do
+d="$srcdir/$p/${f#$pkgdir/}"
+mkdir -p "$(dirname "$d")"
+mv "$f" "$d"
+rmdir -p --ignore-fail-on-non-empty "$(dirname "$f")"
+  done
+}
+
+package_deluge() {
+  cd deluge
   python setup.py install --root="$pkgdir" --optimize=1 --skip-build
 
   install -Dt "$pkgdir/usr/lib/systemd/system" \
@@ -82,6 +84,32 @@
 install -Dm644 /dev/stdin "$pkgdir/usr/lib/sysusers.d/$pkgname.conf"
   echo 'd /srv/deluge 0770 deluge deluge' |
 install -Dm644 /dev/stdin "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf"
+
+  cd "$pkgdir"
+
+  _pick gtk usr/bin/deluge-gtk usr/share/man/man1/deluge-gtk.1
+  _pick gtk usr/share/{appdata,applications,icons,pixmaps}
+  _pick gtk usr/lib/python3.8/site-packages/deluge/ui/gtk3
 }
 
+package_deluge-gtk() {
+  pkgdesc="GTK UI for Deluge"
+  depends=(
+"deluge=$pkgver-$pkgrel"
+gtk3
+librsvg
+python-cairo
+python-gobject
+xdg-utils
+  )
+  optdepends=(
+'libappindicator-gtk3: appindicator notifications'
+#'python-pygame: audible notifications'
+'libnotify: desktop notifications'
+  )
+  replaces=('deluge<2.0.4.dev23+g2f1c008a2-2')
+
+  mv gtk/* "$pkgdir"
+}
+
 # vim:set sw=2 et:


[arch-commits] Commit in deluge/trunk (PKGBUILD)

2019-11-04 Thread Felix Yan via arch-commits
Date: Monday, November 4, 2019 @ 08:11:22
  Author: felixonmars
Revision: 366696

Python 3.8 rebuild

Modified:
  deluge/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-11-04 07:59:45 UTC (rev 366695)
+++ PKGBUILD2019-11-04 08:11:22 UTC (rev 366696)
@@ -4,7 +4,7 @@
 
 pkgname=deluge
 pkgver=2.0.3
-pkgrel=1
+pkgrel=2
 pkgdesc="A BitTorrent client with multiple user interfaces in a client/server 
model"
 arch=(any)
 url="https://deluge-torrent.org/";


[arch-commits] Commit in deluge/trunk (PKGBUILD)

2018-01-22 Thread Jan Steffens via arch-commits
Date: Monday, January 22, 2018 @ 14:33:40
  Author: heftig
Revision: 315260

Update optdepends (FS#56745 FS#48512)

Modified:
  deluge/trunk/PKGBUILD

--+
 PKGBUILD |2 ++
 1 file changed, 2 insertions(+)

Modified: PKGBUILD
===
--- PKGBUILD2018-01-22 14:33:02 UTC (rev 315259)
+++ PKGBUILD2018-01-22 14:33:40 UTC (rev 315260)
@@ -14,6 +14,8 @@
  python2-chardet python2-setuptools)
 makedepends=(intltool pygtk librsvg python2-mako git)
 optdepends=('python2-notify: libnotify notifications'
+'python2-pygame: audible notifications'
+'python2-libappindicator: appindicator notifications'
 'pygtk: needed for gtk ui'
 'librsvg: needed for gtk ui'
 'python2-mako: needed for web ui')


[arch-commits] Commit in deluge/trunk (PKGBUILD)

2019-02-15 Thread Jan Steffens via arch-commits
Date: Friday, February 15, 2019 @ 16:09:12
  Author: heftig
Revision: 346288

1.3.15+18+ge050905b2-1

Modified:
  deluge/trunk/PKGBUILD

--+
 PKGBUILD |   11 ---
 1 file changed, 4 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-02-15 16:04:32 UTC (rev 346287)
+++ PKGBUILD2019-02-15 16:09:12 UTC (rev 346288)
@@ -3,11 +3,11 @@
 # Contributor: Hugo Doria 
 
 pkgname=deluge
-pkgver=1.3.15+14+gb8e5ebe82
+pkgver=1.3.15+18+ge050905b2
 pkgrel=1
 pkgdesc="A BitTorrent client with multiple user interfaces in a client/server 
model"
 arch=(any)
-url="http://deluge-torrent.org/";
+url="https://deluge-torrent.org/";
 license=(GPL3)
 depends=(python2-xdg libtorrent-rasterbar python2-twisted python2-pyopenssl
  python2-chardet python2-setuptools)
@@ -18,7 +18,7 @@
 'pygtk: needed for gtk ui'
 'librsvg: needed for gtk ui'
 'python2-mako: needed for web ui')
-_commit=b8e5ebe8220c8365e186127e381a2d2dbaf9e460  # 1.3-stable
+_commit=e050905b291f4d9b417270e38f2aa04366057919  # 1.3-stable
 source=("git://git.deluge-torrent.org/deluge.git#commit=$_commit"
 untag-build.patch
 deluged.service deluge-web.service)
@@ -48,10 +48,7 @@
 package() {
   cd $pkgname
   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 -Dt "$pkgdir/usr/lib/systemd/system" -m644 ../*.service
   echo 'u deluge - "Deluge BitTorrent daemon" /srv/deluge' |
 install -Dm644 /dev/stdin "$pkgdir/usr/lib/sysusers.d/$pkgname.conf"
   echo 'd /srv/deluge 0775 deluge deluge' |


[arch-commits] Commit in deluge/trunk (PKGBUILD deluge.install)

2012-03-10 Thread Jan Steffens
Date: Saturday, March 10, 2012 @ 05:43:17
  Author: heftig
Revision: 152857

Set ownership in package; Generate rundir on upgrade

Modified:
  deluge/trunk/PKGBUILD
  deluge/trunk/deluge.install

+
 PKGBUILD   |6 --
 deluge.install |9 +
 2 files changed, 9 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-03-10 09:53:45 UTC (rev 152856)
+++ PKGBUILD2012-03-10 10:43:17 UTC (rev 152857)
@@ -5,7 +5,7 @@
 
 pkgname=deluge
 pkgver=1.3.4
-pkgrel=1
+pkgrel=2
 pkgdesc="A BitTorrent client with multiple user interfaces in a client/server 
model"
 arch=('any')
 url="http://deluge-torrent.org/";
@@ -46,11 +46,13 @@
   -i "$_dir/web/gen_gettext.py"
 
   cd ..
-  install -d "$pkgdir/srv/deluge"
   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"
+ 
+  install -d "$pkgdir/srv"
+  install -d -o 125 -g 125 "$pkgdir/srv/deluge"
 }

Modified: deluge.install
===
--- deluge.install  2012-03-10 09:53:45 UTC (rev 152856)
+++ deluge.install  2012-03-10 10:43:17 UTC (rev 152857)
@@ -5,9 +5,6 @@
 passwd -l deluge &>/dev/null
   fi
 
-  mkdir -p run/deluge
-  chown deluge:deluge srv/deluge run/deluge
-  
   post_upgrade
 
 cat /dev/null && groupdel deluge
 
-  post_upgrade
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  update-desktop-database -q
 }



[arch-commits] Commit in deluge/trunk (PKGBUILD deluged.service)

2012-08-23 Thread Jan Steffens
Date: Thursday, August 23, 2012 @ 08:00:31
  Author: heftig
Revision: 165541

Add UMask FS#31256

Modified:
  deluge/trunk/PKGBUILD
  deluge/trunk/deluged.service

-+
 PKGBUILD|2 +-
 deluged.service |1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-08-23 11:37:14 UTC (rev 165540)
+++ PKGBUILD2012-08-23 12:00:31 UTC (rev 165541)
@@ -26,7 +26,7 @@
  'c50385d32a2db0ef3f46b8caadb0e988'
  '443690c730263b76a465dc413f695a86'
  '37538a1b049b177e9ea1014331e29689'
- '5ef8e612ce533ec91de20e134ba7ded0'
+ '6b831c889f365f58317dc4b78c167a62'
  'b3fff6601a5971bba89fa9a85dcf9ce8'
  '71d556cf7ce3bb59391797827347e80c')
 

Modified: deluged.service
===
--- deluged.service 2012-08-23 11:37:14 UTC (rev 165540)
+++ deluged.service 2012-08-23 12:00:31 UTC (rev 165541)
@@ -7,6 +7,7 @@
 ExecStart=/usr/bin/deluged -P /run/deluge/deluged.pid $OPTIONS
 Type=forking
 PIDFile=/run/deluge/deluged.pid
+UMask=0002
 
 [Install]
 WantedBy=multi-user.target



[arch-commits] Commit in deluge/trunk (PKGBUILD deluge.install)

2011-09-21 Thread Jan Steffens
Date: Wednesday, September 21, 2011 @ 17:50:56
  Author: heftig
Revision: 138413

upgpkg: deluge 1.3.3-3

make python2-distribute a makedepend. cleanup. fix some shebangs. use 
gtk-update-icon-cache. use update-desktop-database.

Modified:
  deluge/trunk/PKGBUILD
  deluge/trunk/deluge.install

+
 PKGBUILD   |   42 +-
 deluge.install |   32 ++--
 2 files changed, 43 insertions(+), 31 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-09-21 21:33:41 UTC (rev 138412)
+++ PKGBUILD2011-09-21 21:50:56 UTC (rev 138413)
@@ -1,40 +1,48 @@
 # $Id$
-# Maintainer : Ionut Biru 
+# Maintainer: Jan "heftig" Steffens 
+# Contributor: Ionut Biru 
 # Contributor: Hugo Doria 
 
 pkgname=deluge
 pkgver=1.3.3
-pkgrel=2
-pkgdesc="A bittorrent client written with python and pygtk"
+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' 'python2-distribute' 'libtorrent-rasterbar>=0.15.0' 'twisted' 
'python2-pyopenssl' 'xdg-utils' 'python2-chardet')
-makedepends=('intltool' 'pygtk' 'librsvg' 'python-mako')
+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')
-source=(http://download.deluge-torrent.org/source/${pkgname}-${pkgver}.tar.bz2 
deluged deluged.conf.d deluge-web)
+'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}"
+  cd "$srcdir/$pkgname-$pkgver"
   python2 setup.py build
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  python2 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1
+  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"
 
-  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
+  _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"
 }

Modified: deluge.install
===
--- deluge.install  2011-09-21 21:33:41 UTC (rev 138412)
+++ deluge.install  2011-09-21 21:50:56 UTC (rev 138413)
@@ -1,25 +1,29 @@
 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
+  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
-  usr/bin/passwd -l deluge &>/dev/null
 
-  chown deluge.deluge srv/deluge
-  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+  chown deluge:deluge srv/deluge
 
+  post_upgrade
+
 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
+>>> 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/hicolo

[arch-commits] Commit in deluge/trunk (PKGBUILD deluge.install)

2012-10-15 Thread Jan Steffens
Date: Monday, October 15, 2012 @ 18:48:38
  Author: heftig
Revision: 168779

staging rebuild (python)

Modified:
  deluge/trunk/PKGBUILD
  deluge/trunk/deluge.install

+
 PKGBUILD   |   18 --
 deluge.install |2 +-
 2 files changed, 9 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-10-15 22:15:07 UTC (rev 168778)
+++ PKGBUILD2012-10-15 22:48:38 UTC (rev 168779)
@@ -1,20 +1,20 @@
 # $Id$
-# Maintainer: Jan "heftig" Steffens 
+# Maintainer: Jan Alexander Steffens (heftig) 
 # Contributor: Ionut Biru 
 # Contributor: Hugo Doria 
 
 pkgname=deluge
 pkgver=1.3.5
-pkgrel=1
+pkgrel=2
 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'
- 'python2-distribute')
-makedepends=('intltool' 'pygtk' 'librsvg' 'python2-mako')
-optdepends=('python-notify: libnotify notifications'
+depends=(python2-xdg 'libtorrent-rasterbar>=0.15.0' twisted python2-pyopenssl
+ xdg-utils python2-chardet desktop-file-utils hicolor-icon-theme
+ python2-distribute)
+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')
@@ -41,9 +41,7 @@
   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"
+  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"

Modified: deluge.install
===
--- deluge.install  2012-10-15 22:15:07 UTC (rev 168778)
+++ deluge.install  2012-10-15 22:48:38 UTC (rev 168779)
@@ -8,7 +8,7 @@
   post_upgrade
 
 cat <>> The optional headless daemon started using /etc/rc.d/deluged uses the 
"deluge" user.
+>>> The optional headless daemon started using deluged.service uses the 
"deluge" user.
 Its default download directory is /srv/deluge.
 EOF
 }



[arch-commits] Commit in deluge/trunk (PKGBUILD deluged.service)

2013-04-15 Thread Jan Steffens
Date: Monday, April 15, 2013 @ 16:44:49
  Author: heftig
Revision: 182812

Add After=network.target

Modified:
  deluge/trunk/PKGBUILD
  deluge/trunk/deluged.service

-+
 PKGBUILD|2 +-
 deluged.service |1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-04-15 14:05:59 UTC (rev 182811)
+++ PKGBUILD2013-04-15 14:44:49 UTC (rev 182812)
@@ -22,7 +22,7 @@
 source=(http://download.deluge-torrent.org/source/$pkgname-$pkgver.tar.lzma
 deluged.service deluge-web.service)
 md5sums=('956e70928437223d22b4a782134fa8c3'
- 'b55cb839a37e8315da4a0f6c99a75fd3'
+ '17f51ac9a90f0dc41a20291444a7489b'
  '2a73f62c04e8b147c731fbb50666e846')
 
 build() {

Modified: deluged.service
===
--- deluged.service 2013-04-15 14:05:59 UTC (rev 182811)
+++ deluged.service 2013-04-15 14:44:49 UTC (rev 182812)
@@ -1,5 +1,6 @@
 [Unit]
 Description=Deluge Daemon
+After=network.target
 
 [Service]
 User=deluge



[arch-commits] Commit in deluge/trunk (PKGBUILD deluge.install)

2011-07-22 Thread Ionut Biru
Date: Saturday, July 23, 2011 @ 01:09:02
  Author: ibiru
Revision: 132330

improve .install file

Modified:
  deluge/trunk/PKGBUILD
  deluge/trunk/deluge.install

+
 PKGBUILD   |2 +-
 deluge.install |6 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-07-23 00:44:51 UTC (rev 132329)
+++ PKGBUILD2011-07-23 05:09:02 UTC (rev 132330)
@@ -4,7 +4,7 @@
 
 pkgname=deluge
 pkgver=1.3.3
-pkgrel=1
+pkgrel=2
 pkgdesc="A bittorrent client written with python and pygtk"
 arch=('any')
 url="http://deluge-torrent.org/";

Modified: deluge.install
===
--- deluge.install  2011-07-23 00:44:51 UTC (rev 132329)
+++ deluge.install  2011-07-23 05:09:02 UTC (rev 132330)
@@ -16,11 +16,7 @@
 _EOF
 }
 
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
+post_remove() {
   getent passwd deluge >/dev/null 2>&1 && userdel deluge
   getent group deluge >/dev/null 2>&1 && groupdel deluge
 



[arch-commits] Commit in deluge/trunk (PKGBUILD deluge.install)

2015-02-27 Thread Jan Steffens
Date: Friday, February 27, 2015 @ 13:50:55
  Author: heftig
Revision: 232071

don't remove user

Modified:
  deluge/trunk/PKGBUILD
  deluge/trunk/deluge.install

+
 PKGBUILD   |2 +-
 deluge.install |7 ++-
 2 files changed, 3 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-02-27 12:49:05 UTC (rev 232070)
+++ PKGBUILD2015-02-27 12:50:55 UTC (rev 232071)
@@ -5,7 +5,7 @@
 
 pkgname=deluge
 pkgver=1.3.11
-pkgrel=1
+pkgrel=2
 pkgdesc="A BitTorrent client with multiple user interfaces in a client/server 
model"
 arch=('any')
 url="http://deluge-torrent.org/";

Modified: deluge.install
===
--- deluge.install  2015-02-27 12:49:05 UTC (rev 232070)
+++ deluge.install  2015-02-27 12:50:55 UTC (rev 232071)
@@ -1,6 +1,6 @@
 post_install() {
-  getent group deluge &>/dev/null || groupadd -g 125 deluge
   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
@@ -11,12 +11,9 @@
 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
+  return 0
 }
 
 post_remove() {
-  getent passwd deluge &>/dev/null && userdel deluge
-  getent group deluge &>/dev/null && groupdel deluge
-
   post_upgrade
 }


[arch-commits] Commit in deluge/trunk (PKGBUILD fix_freeze.patch)

2010-05-13 Thread Ionut Biru
Date: Thursday, May 13, 2010 @ 17:51:24
  Author: ibiru
Revision: 80228

upgpkg: deluge 1.2.3-6
fixes hangs when closing deluge

Added:
  deluge/trunk/fix_freeze.patch
Modified:
  deluge/trunk/PKGBUILD

--+
 PKGBUILD |   10 +--
 fix_freeze.patch |   73 +
 2 files changed, 80 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-05-13 18:06:31 UTC (rev 80227)
+++ PKGBUILD2010-05-13 21:51:24 UTC (rev 80228)
@@ -4,7 +4,7 @@
 
 pkgname=deluge
 pkgver=1.2.3
-pkgrel=5
+pkgrel=6
 pkgdesc="A bittorrent client written with python and pygtk"
 arch=('i686' 'x86_64')
 url="http://deluge-torrent.org/";
@@ -15,15 +15,19 @@
'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)
+source=(http://download.deluge-torrent.org/source/${pkgname}-${pkgver}.tar.bz2 
deluged deluged.conf.d deluge-web
+   fix_freeze.patch)
 install=deluge.install
 backup=(etc/conf.d/deluged)
 md5sums=('f1dbc8734c1881b115b98f572e523a4d' '7d5790eeb14cd0b47d1bb3e0a19c9935'
- '332d23fe0d21ce92b494efd73322856c' '6c913ec7322eaa60494ac9d53103005f')
+ '332d23fe0d21ce92b494efd73322856c' '6c913ec7322eaa60494ac9d53103005f'
+ '09af9b6badccb2fd5d24f8cbe9a109a7')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
+  patch -Np1 -i "${srcdir}/fix_freeze.patch" || return 1
+
   python setup.py build || return 1
   python setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 || 
return 1
 

Added: fix_freeze.patch
===
--- fix_freeze.patch(rev 0)
+++ fix_freeze.patch2010-05-13 21:51:24 UTC (rev 80228)
@@ -0,0 +1,73 @@
+diff --git a/deluge/ui/gtkui/connectionmanager.py 
b/deluge/ui/gtkui/connectionmanager.py
+index 554c570..3b9ddf4 100644
+--- a/deluge/ui/gtkui/connectionmanager.py
 b/deluge/ui/gtkui/connectionmanager.py
+@@ -99,12 +99,16 @@ class ConnectionManager(component.Component):
+ 
+ self.config = ConfigManager("hostlist.conf.1.2", DEFAULT_CONFIG)
+ 
++self.running = False
++
+ # Component overrides
+ def start(self):
+ pass
+ 
+ def stop(self):
+-pass
++# Close this dialog when we are shutting down
++if self.running:
++self.connection_manager.response(gtk.RESPONSE_CLOSE)
+ 
+ def shutdown(self):
+ pass
+diff --git a/deluge/ui/gtkui/gtkui.py b/deluge/ui/gtkui/gtkui.py
+index 255622a..4856986 100644
+--- a/deluge/ui/gtkui/gtkui.py
 b/deluge/ui/gtkui/gtkui.py
+@@ -167,7 +167,7 @@ class GtkUI(object):
+ self.gnome_prog = gnome.init("Deluge", 
deluge.common.get_version())
+ self.gnome_client = gnome.ui.master_client()
+ def on_die(*args):
+-gtk.main_quit()
++reactor.stop()
+ self.gnome_client.connect("die", on_die)
+ log.debug("GNOME session 'die' handler registered!")
+ except Exception, e:
+@@ -180,7 +180,7 @@ class GtkUI(object):
+ def win_handler(ctrl_type):
+ log.debug("ctrl_type: %s", ctrl_type)
+ if ctrl_type in (CTRL_CLOSE_EVENT, CTRL_SHUTDOWN_EVENT):
+-gtk.main_quit()
++reactor.stop()
+ return 1
+ SetConsoleCtrlHandler(win_handler)
+ 
+diff --git a/deluge/ui/gtkui/mainwindow.py b/deluge/ui/gtkui/mainwindow.py
+index ad33fd0..1153b1e 100644
+--- a/deluge/ui/gtkui/mainwindow.py
 b/deluge/ui/gtkui/mainwindow.py
+@@ -46,6 +46,7 @@ from deluge.ui.client import client
+ import deluge.component as component
+ from deluge.configmanager import ConfigManager
+ from deluge.ui.gtkui.ipcinterface import process_args
++from twisted.internet import reactor
+ 
+ import deluge.common
+ import common
+@@ -152,7 +153,7 @@ class MainWindow(component.Component):
+ return self.main_glade
+ 
+ def quit(self):
+-gtk.main_quit()
++reactor.stop()
+ 
+ def load_window_state(self):
+ x = self.config["window_x_pos"]
+@@ -238,7 +239,6 @@ class MainWindow(component.Component):
+ 
+ def on_newversionavailable_event(self, new_version):
+ if self.config["show_new_releases"]:
+-from twisted.internet import reactor
+ from deluge.ui.gtkui.new_release_dialog import NewReleaseDialog
+ reactor.callLater(5.0, NewReleaseDialog().show, new_version)
+ 
\ No newline at end of file



[arch-commits] Commit in deluge/trunk (PKGBUILD deluge.install)

2016-07-07 Thread Jan Steffens
Date: Thursday, July 7, 2016 @ 20:27:00
  Author: heftig
Revision: 271149

1.3.12+73+g5f92810-1

Modified:
  deluge/trunk/PKGBUILD
  deluge/trunk/deluge.install

+
 PKGBUILD   |   32 
 deluge.install |   12 
 2 files changed, 20 insertions(+), 24 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-07-07 20:20:49 UTC (rev 271148)
+++ PKGBUILD2016-07-07 20:27:00 UTC (rev 271149)
@@ -4,38 +4,46 @@
 # Contributor: Hugo Doria 
 
 pkgname=deluge
-pkgver=1.3.12
+pkgver=1.3.12+73+g5f92810
 pkgrel=1
 pkgdesc="A BitTorrent client with multiple user interfaces in a client/server 
model"
-arch=('any')
+arch=(any)
 url="http://deluge-torrent.org/";
-license=('GPL3')
+license=(GPL3)
 depends=(python2-xdg libtorrent-rasterbar python2-twisted python2-pyopenssl
  python2-chardet python2-setuptools)
-makedepends=(intltool pygtk librsvg python2-mako)
+makedepends=(intltool pygtk librsvg python2-mako git)
 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
+_commit=5f92810f761e7df7b1f03e916535ad8b4ce6c08c
+source=("git://git.deluge-torrent.org/deluge.git#commit=$_commit"
 deluged.service deluge-web.service)
-md5sums=('56f5c1cd3f671fecc58a9168f5bd6d48'
- '17f51ac9a90f0dc41a20291444a7489b'
- '2a73f62c04e8b147c731fbb50666e846')
+sha256sums=('SKIP'
+'58a451bb6cf4fe6ff78a4fb71d51c5910340a2de032ff435c3c7365015ab538f'
+'c3f2d6ad5bc9de5ffd9973d92badbe04a9ecf12c0c575e13d505a96add03275a')
 
 prepare() {
-  cd $pkgname-$pkgver
-  sed -i '1s/python$/&2/' deluge/ui/Win32IconImagePlugin.py
+  cd $pkgname
+  sed -i '1s/python$/&2/' \
+deluge/ui/Win32IconImagePlugin.py \
+deluge/ui/web/gen_gettext.py
 }
 
+pkgver() {
+  cd $pkgname
+  git describe | sed 's/^deluge-//;s/-/+/g'
+}
+
 build() {
-  cd $pkgname-$pkgver
+  cd $pkgname
   python2 setup.py build
 }
 
 package() {
-  cd $pkgname-$pkgver
+  cd $pkgname
   python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
 
   install -Dm644 ../deluged.service 
"$pkgdir/usr/lib/systemd/system/deluged.service"

Modified: deluge.install
===
--- deluge.install  2016-07-07 20:20:49 UTC (rev 271148)
+++ deluge.install  2016-07-07 20:27:00 UTC (rev 271149)
@@ -4,16 +4,4 @@
 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
-}


[arch-commits] Commit in deluge/trunk (PKGBUILD deluge.install)

2017-12-15 Thread Jan Steffens via arch-commits
Date: Saturday, December 16, 2017 @ 02:38:14
  Author: heftig
Revision: 312955

1.3.15+14+gb8e5ebe82-1

Modified:
  deluge/trunk/PKGBUILD
Deleted:
  deluge/trunk/deluge.install

+
 PKGBUILD   |   11 ++-
 deluge.install |7 ---
 2 files changed, 6 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-12-16 02:30:53 UTC (rev 312954)
+++ PKGBUILD2017-12-16 02:38:14 UTC (rev 312955)
@@ -4,7 +4,7 @@
 # Contributor: Hugo Doria 
 
 pkgname=deluge
-pkgver=1.3.15+2+g38d7b7cdf
+pkgver=1.3.15+14+gb8e5ebe82
 pkgrel=1
 pkgdesc="A BitTorrent client with multiple user interfaces in a client/server 
model"
 arch=(any)
@@ -17,8 +17,7 @@
 'pygtk: needed for gtk ui'
 'librsvg: needed for gtk ui'
 'python2-mako: needed for web ui')
-install=deluge.install
-_commit=38d7b7cdfde3c50d6263602ffb03af92fcbfa52e  # 1.3-stable
+_commit=b8e5ebe8220c8365e186127e381a2d2dbaf9e460  # 1.3-stable
 source=("git://git.deluge-torrent.org/deluge.git#commit=$_commit"
 untag-build.patch
 deluged.service deluge-web.service)
@@ -52,6 +51,8 @@
   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"
+  echo 'u deluge - "Deluge BitTorrent daemon" /srv/deluge' |
+install -Dm644 /dev/stdin "$pkgdir/usr/lib/sysusers.d/$pkgname.conf"
+  echo 'd /srv/deluge 0775 deluge deluge' |
+install -Dm644 /dev/stdin "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf"
 }

Deleted: deluge.install
===
--- deluge.install  2017-12-16 02:30:53 UTC (rev 312954)
+++ deluge.install  2017-12-16 02:38:14 UTC (rev 312955)
@@ -1,7 +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
-}


[arch-commits] Commit in deluge/trunk (PKGBUILD fs31433.patch)

2012-10-23 Thread Jan Steffens
Date: Wednesday, October 24, 2012 @ 00:20:00
  Author: heftig
Revision: 169592

Fix FS#31433; fix directory permissions

Added:
  deluge/trunk/fs31433.patch
Modified:
  deluge/trunk/PKGBUILD

---+
 PKGBUILD  |   14 ++
 fs31433.patch |   29 +
 2 files changed, 39 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-10-24 01:48:33 UTC (rev 169591)
+++ PKGBUILD2012-10-24 04:20:00 UTC (rev 169592)
@@ -5,7 +5,7 @@
 
 pkgname=deluge
 pkgver=1.3.5
-pkgrel=2
+pkgrel=3
 pkgdesc="A BitTorrent client with multiple user interfaces in a client/server 
model"
 arch=('any')
 url="http://deluge-torrent.org/";
@@ -21,17 +21,23 @@
 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)
+deluge.tmpfiles.conf deluged deluge-web deluged.service 
deluge-web.service deluged.conf
+fs31433.patch)
 md5sums=('f17ef6686f33e12694b44976e5ed7721'
  'c50385d32a2db0ef3f46b8caadb0e988'
  '443690c730263b76a465dc413f695a86'
  '37538a1b049b177e9ea1014331e29689'
  '6b831c889f365f58317dc4b78c167a62'
  'b3fff6601a5971bba89fa9a85dcf9ce8'
- '71d556cf7ce3bb59391797827347e80c')
+ '71d556cf7ce3bb59391797827347e80c'
+ '65311330bd87440c50f2bb7251f46fcd')
 
 build() {
   cd $pkgname-$pkgver
+
+  # Fix moving to storage (FS#31433)
+  patch -Np1 -i ../fs31433.patch
+
   python2 setup.py build
 }
 
@@ -52,5 +58,5 @@
   install -Dm644 deluged.conf "$pkgdir/etc/conf.d/deluged"
  
   install -d "$pkgdir/srv"
-  install -d -m 664 -o 125 -g 125 "$pkgdir/srv/deluge"
+  install -d -m 775 -o 125 -g 125 "$pkgdir/srv/deluge"
 }

Added: fs31433.patch
===
--- fs31433.patch   (rev 0)
+++ fs31433.patch   2012-10-24 04:20:00 UTC (rev 169592)
@@ -0,0 +1,29 @@
+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.py2012-04-10 03:53:16.0 
+0200
 deluge-1.3.5-fs31433/deluge/core/torrent.py2012-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



[arch-commits] Commit in deluge/trunk (PKGBUILD twisted15.patch)

2015-02-27 Thread Jan Steffens
Date: Friday, February 27, 2015 @ 16:49:16
  Author: heftig
Revision: 232085

FS#43974 twisted 15 compat

Added:
  deluge/trunk/twisted15.patch
Modified:
  deluge/trunk/PKGBUILD

-+
 PKGBUILD|8 +---
 twisted15.patch |   49 +
 2 files changed, 54 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-02-27 15:02:33 UTC (rev 232084)
+++ PKGBUILD2015-02-27 15:49:16 UTC (rev 232085)
@@ -5,7 +5,7 @@
 
 pkgname=deluge
 pkgver=1.3.11
-pkgrel=2
+pkgrel=3
 pkgdesc="A BitTorrent client with multiple user interfaces in a client/server 
model"
 arch=('any')
 url="http://deluge-torrent.org/";
@@ -19,13 +19,15 @@
 '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)
+deluged.service deluge-web.service twisted15.patch)
 md5sums=('49f9f5fc751d49ddd415f02123de77a8'
  '17f51ac9a90f0dc41a20291444a7489b'
- '2a73f62c04e8b147c731fbb50666e846')
+ '2a73f62c04e8b147c731fbb50666e846'
+ '6ff539de47871258bb484fc5b0590fe2')
 
 prepare() {
   cd $pkgname-$pkgver
+  patch -Np1 -i ../twisted15.patch
   sed -i '1s/python$/&2/' deluge/ui/Win32IconImagePlugin.py
 }
 

Added: twisted15.patch
===
--- twisted15.patch (rev 0)
+++ twisted15.patch 2015-02-27 15:49:16 UTC (rev 232085)
@@ -0,0 +1,49 @@
+From d40dfcd53c2439de121ddaff476e66194dc2c738 Mon Sep 17 00:00:00 2001
+From: Andrew Resch 
+Date: Mon, 23 Feb 2015 08:31:00 +
+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


[arch-commits] Commit in deluge/trunk (PKGBUILD deluge.install fix_freeze.patch)

2010-10-21 Thread Ionut Biru
Date: Thursday, October 21, 2010 @ 16:54:23
  Author: ibiru
Revision: 96485

added etc/conf.d/deluged to backup, don't change the owner recursively, drop 
unuset patch

Modified:
  deluge/trunk/PKGBUILD
  deluge/trunk/deluge.install
Deleted:
  deluge/trunk/fix_freeze.patch

--+
 PKGBUILD |1 
 deluge.install   |2 -
 fix_freeze.patch |   73 -
 3 files changed, 2 insertions(+), 74 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-10-21 15:13:36 UTC (rev 96484)
+++ PKGBUILD2010-10-21 20:54:23 UTC (rev 96485)
@@ -16,6 +16,7 @@
'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
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"

Modified: deluge.install
===
--- deluge.install  2010-10-21 15:13:36 UTC (rev 96484)
+++ deluge.install  2010-10-21 20:54:23 UTC (rev 96485)
@@ -7,7 +7,7 @@
   fi
   usr/bin/passwd -l deluge &>/dev/null
 
-  chown deluge.deluge srv/deluge -R
+  chown deluge.deluge srv/deluge
   xdg-icon-resource forceupdate --theme hicolor &> /dev/null
 
 cat << _EOF

Deleted: fix_freeze.patch
===
--- fix_freeze.patch2010-10-21 15:13:36 UTC (rev 96484)
+++ fix_freeze.patch2010-10-21 20:54:23 UTC (rev 96485)
@@ -1,73 +0,0 @@
-diff --git a/deluge/ui/gtkui/connectionmanager.py 
b/deluge/ui/gtkui/connectionmanager.py
-index 554c570..3b9ddf4 100644
 a/deluge/ui/gtkui/connectionmanager.py
-+++ b/deluge/ui/gtkui/connectionmanager.py
-@@ -99,12 +99,16 @@ class ConnectionManager(component.Component):
- 
- self.config = ConfigManager("hostlist.conf.1.2", DEFAULT_CONFIG)
- 
-+self.running = False
-+
- # Component overrides
- def start(self):
- pass
- 
- def stop(self):
--pass
-+# Close this dialog when we are shutting down
-+if self.running:
-+self.connection_manager.response(gtk.RESPONSE_CLOSE)
- 
- def shutdown(self):
- pass
-diff --git a/deluge/ui/gtkui/gtkui.py b/deluge/ui/gtkui/gtkui.py
-index 255622a..4856986 100644
 a/deluge/ui/gtkui/gtkui.py
-+++ b/deluge/ui/gtkui/gtkui.py
-@@ -167,7 +167,7 @@ class GtkUI(object):
- self.gnome_prog = gnome.init("Deluge", 
deluge.common.get_version())
- self.gnome_client = gnome.ui.master_client()
- def on_die(*args):
--gtk.main_quit()
-+reactor.stop()
- self.gnome_client.connect("die", on_die)
- log.debug("GNOME session 'die' handler registered!")
- except Exception, e:
-@@ -180,7 +180,7 @@ class GtkUI(object):
- def win_handler(ctrl_type):
- log.debug("ctrl_type: %s", ctrl_type)
- if ctrl_type in (CTRL_CLOSE_EVENT, CTRL_SHUTDOWN_EVENT):
--gtk.main_quit()
-+reactor.stop()
- return 1
- SetConsoleCtrlHandler(win_handler)
- 
-diff --git a/deluge/ui/gtkui/mainwindow.py b/deluge/ui/gtkui/mainwindow.py
-index ad33fd0..1153b1e 100644
 a/deluge/ui/gtkui/mainwindow.py
-+++ b/deluge/ui/gtkui/mainwindow.py
-@@ -46,6 +46,7 @@ from deluge.ui.client import client
- import deluge.component as component
- from deluge.configmanager import ConfigManager
- from deluge.ui.gtkui.ipcinterface import process_args
-+from twisted.internet import reactor
- 
- import deluge.common
- import common
-@@ -152,7 +153,7 @@ class MainWindow(component.Component):
- return self.main_glade
- 
- def quit(self):
--gtk.main_quit()
-+reactor.stop()
- 
- def load_window_state(self):
- x = self.config["window_x_pos"]
-@@ -238,7 +239,6 @@ class MainWindow(component.Component):
- 
- def on_newversionavailable_event(self, new_version):
- if self.config["show_new_releases"]:
--from twisted.internet import reactor
- from deluge.ui.gtkui.new_release_dialog import NewReleaseDialog
- reactor.callLater(5.0, NewReleaseDialog().show, new_version)
- 
\ No newline at end of file



[arch-commits] Commit in deluge/trunk (PKGBUILD twisted15.patch)

2015-09-13 Thread Jan Steffens
Date: Monday, September 14, 2015 @ 01:27:44
  Author: heftig
Revision: 246026

1.3.12

Modified:
  deluge/trunk/PKGBUILD
Deleted:
  deluge/trunk/twisted15.patch

-+
 PKGBUILD|   12 +---
 twisted15.patch |   49 -
 2 files changed, 5 insertions(+), 56 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-09-13 22:00:40 UTC (rev 246025)
+++ PKGBUILD2015-09-13 23:27:44 UTC (rev 246026)
@@ -4,8 +4,8 @@
 # Contributor: Hugo Doria 
 
 pkgname=deluge
-pkgver=1.3.11
-pkgrel=3
+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/";
@@ -19,15 +19,13 @@
 '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'
+deluged.service deluge-web.service)
+md5sums=('56f5c1cd3f671fecc58a9168f5bd6d48'
  '17f51ac9a90f0dc41a20291444a7489b'
- '2a73f62c04e8b147c731fbb50666e846'
- '6ff539de47871258bb484fc5b0590fe2')
+ '2a73f62c04e8b147c731fbb50666e846')
 
 prepare() {
   cd $pkgname-$pkgver
-  patch -Np1 -i ../twisted15.patch
   sed -i '1s/python$/&2/' deluge/ui/Win32IconImagePlugin.py
 }
 

Deleted: twisted15.patch
===
--- twisted15.patch 2015-09-13 22:00:40 UTC (rev 246025)
+++ twisted15.patch 2015-09-13 23:27:44 UTC (rev 246026)
@@ -1,49 +0,0 @@
-From d40dfcd53c2439de121ddaff476e66194dc2c738 Mon Sep 17 00:00:00 2001
-From: Andrew Resch 
-Date: Mon, 23 Feb 2015 08:31:00 +
-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


[arch-commits] Commit in deluge/trunk (PKGBUILD untag-build.patch)

2016-10-04 Thread Jan Steffens
Date: Tuesday, October 4, 2016 @ 17:06:15
  Author: heftig
Revision: 277701

1.3.13+2+g6c73105-1

Added:
  deluge/trunk/untag-build.patch
Modified:
  deluge/trunk/PKGBUILD

---+
 PKGBUILD  |7 +--
 untag-build.patch |   10 ++
 2 files changed, 15 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-10-04 16:21:29 UTC (rev 277700)
+++ PKGBUILD2016-10-04 17:06:15 UTC (rev 277701)
@@ -4,7 +4,7 @@
 # Contributor: Hugo Doria 
 
 pkgname=deluge
-pkgver=1.3.13
+pkgver=1.3.13+2+g6c73105
 pkgrel=1
 pkgdesc="A BitTorrent client with multiple user interfaces in a client/server 
model"
 arch=(any)
@@ -18,15 +18,18 @@
 'librsvg: needed for gtk ui'
 'python2-mako: needed for web ui')
 install=deluge.install
-_commit=226346311412c164cfb5e467d04b1ee8627bc015
+_commit=6c73105a7307508c8267614bfe0be9a34b9bfb36  # 1.3-stable
 source=("git://git.deluge-torrent.org/deluge.git#commit=$_commit"
+untag-build.patch
 deluged.service deluge-web.service)
 sha256sums=('SKIP'
+'fbd17f13765f5560bab01a81a42aff0f2f757a4a6fa29379ae31d95b9721e4f2'
 '58a451bb6cf4fe6ff78a4fb71d51c5910340a2de032ff435c3c7365015ab538f'
 'c3f2d6ad5bc9de5ffd9973d92badbe04a9ecf12c0c575e13d505a96add03275a')
 
 prepare() {
   cd $pkgname
+  patch -Np1 -i ../untag-build.patch
   sed -i '1s/python$/&2/' \
 deluge/ui/Win32IconImagePlugin.py \
 deluge/ui/web/gen_gettext.py

Added: untag-build.patch
===
--- untag-build.patch   (rev 0)
+++ untag-build.patch   2016-10-04 17:06:15 UTC (rev 277701)
@@ -0,0 +1,10 @@
+diff --git i/setup.cfg w/setup.cfg
+index 2dfe955fdbcb5f63..8d568e8ce4785fbb 100644
+--- i/setup.cfg
 w/setup.cfg
+@@ -1,5 +1,4 @@
+ [egg_info]
+-tag_build = -dev
+ tag_svn_revision = false
+ 
+ [build_docs]


[arch-commits] Commit in deluge/trunk (PKGBUILD fix-ngettext.diff)

2020-06-27 Thread Jan Steffens via arch-commits
Date: Sunday, June 28, 2020 @ 02:24:57
  Author: heftig
Revision: 390533

2.0.4.dev38+g23a48dd01-1

Modified:
  deluge/trunk/PKGBUILD
Deleted:
  deluge/trunk/fix-ngettext.diff

---+
 PKGBUILD  |   13 +
 fix-ngettext.diff |   13 -
 2 files changed, 5 insertions(+), 21 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-06-28 01:56:41 UTC (rev 390532)
+++ PKGBUILD2020-06-28 02:24:57 UTC (rev 390533)
@@ -4,8 +4,8 @@
 
 pkgbase=deluge
 pkgname=(deluge deluge-gtk)
-pkgver=2.0.4.dev23+g2f1c008a2
-pkgrel=3
+pkgver=2.0.4.dev38+g23a48dd01
+pkgrel=1
 pkgdesc="BitTorrent client with multiple user interfaces in a client/server 
model"
 url="https://deluge-torrent.org/";
 arch=(any)
@@ -41,11 +41,9 @@
   libnotify
   git
 )
-_commit=2f1c008a26b50ab3487bd03bcabb39347d441f23  # develop
-source=("git://git.deluge-torrent.org/deluge.git#commit=$_commit"
-fix-ngettext.diff)
-sha256sums=('SKIP'
-'27154397f2b22e55e2ad74f74da2f4f083bce1fcee90f8ba9306e6ef13ce98c0')
+_commit=23a48dd01c86ef01cd1d13371de51247ec9a503b  # develop
+source=("git://git.deluge-torrent.org/deluge.git#commit=$_commit")
+sha256sums=('SKIP')
 
 pkgver() {
   cd deluge
@@ -54,7 +52,6 @@
 
 prepare() {
   cd deluge
-  git apply -3 ../fix-ngettext.diff
 }
 
 build() {

Deleted: fix-ngettext.diff
===
--- fix-ngettext.diff   2020-06-28 01:56:41 UTC (rev 390532)
+++ fix-ngettext.diff   2020-06-28 02:24:57 UTC (rev 390533)
@@ -1,13 +0,0 @@
-diff --git i/deluge/i18n/util.py w/deluge/i18n/util.py
-index bd002f7a2..90568fc5b 100644
 i/deluge/i18n/util.py
-+++ w/deluge/i18n/util.py
-@@ -114,7 +114,7 @@ def setup_translation():
- # Workaround for Python 2 unicode gettext (keyword removed in Py3).
- kwargs = {} if not deluge.common.PY2 else {'unicode': True}
- 
--gettext.install(I18N_DOMAIN, translations_path, names='ngettext', 
**kwargs)
-+gettext.install(I18N_DOMAIN, translations_path, names=['ngettext'], 
**kwargs)
- builtins.__dict__['_n'] = builtins.__dict__['ngettext']
- 
- libintl = None


[arch-commits] Commit in deluge/trunk (PKGBUILD fix-ngettext.diff)

2020-02-23 Thread Jan Steffens via arch-commits
Date: Sunday, February 23, 2020 @ 20:11:18
  Author: heftig
Revision: 376109

2.0.4.dev23+g2f1c008a2-3: FS#65598 fix ngettext

Added:
  deluge/trunk/fix-ngettext.diff
Modified:
  deluge/trunk/PKGBUILD

---+
 PKGBUILD  |9 ++---
 fix-ngettext.diff |   13 +
 2 files changed, 19 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-02-23 20:04:20 UTC (rev 376108)
+++ PKGBUILD2020-02-23 20:11:18 UTC (rev 376109)
@@ -5,7 +5,7 @@
 pkgbase=deluge
 pkgname=(deluge deluge-gtk)
 pkgver=2.0.4.dev23+g2f1c008a2
-pkgrel=2
+pkgrel=3
 pkgdesc="BitTorrent client with multiple user interfaces in a client/server 
model"
 url="https://deluge-torrent.org/";
 arch=(any)
@@ -42,8 +42,10 @@
   git
 )
 _commit=2f1c008a26b50ab3487bd03bcabb39347d441f23  # develop
-source=("git://git.deluge-torrent.org/deluge.git#commit=$_commit")
-sha256sums=('SKIP')
+source=("git://git.deluge-torrent.org/deluge.git#commit=$_commit"
+fix-ngettext.diff)
+sha256sums=('SKIP'
+'27154397f2b22e55e2ad74f74da2f4f083bce1fcee90f8ba9306e6ef13ce98c0')
 
 pkgver() {
   cd deluge
@@ -52,6 +54,7 @@
 
 prepare() {
   cd deluge
+  git apply -3 ../fix-ngettext.diff
 }
 
 build() {

Added: fix-ngettext.diff
===
--- fix-ngettext.diff   (rev 0)
+++ fix-ngettext.diff   2020-02-23 20:11:18 UTC (rev 376109)
@@ -0,0 +1,13 @@
+diff --git i/deluge/i18n/util.py w/deluge/i18n/util.py
+index bd002f7a2..90568fc5b 100644
+--- i/deluge/i18n/util.py
 w/deluge/i18n/util.py
+@@ -114,7 +114,7 @@ def setup_translation():
+ # Workaround for Python 2 unicode gettext (keyword removed in Py3).
+ kwargs = {} if not deluge.common.PY2 else {'unicode': True}
+ 
+-gettext.install(I18N_DOMAIN, translations_path, names='ngettext', 
**kwargs)
++gettext.install(I18N_DOMAIN, translations_path, names=['ngettext'], 
**kwargs)
+ builtins.__dict__['_n'] = builtins.__dict__['ngettext']
+ 
+ libintl = None


[arch-commits] Commit in deluge/trunk (PKGBUILD py3.8.diff)

2019-12-22 Thread Jan Steffens via arch-commits
Date: Sunday, December 22, 2019 @ 23:57:18
  Author: heftig
Revision: 372137

2.0.4.dev23+g2f1c008a2-1

Modified:
  deluge/trunk/PKGBUILD
Deleted:
  deluge/trunk/py3.8.diff

+
 PKGBUILD   |   16 +---
 py3.8.diff |   30 --
 2 files changed, 5 insertions(+), 41 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-12-22 21:49:53 UTC (rev 372136)
+++ PKGBUILD2019-12-22 23:57:18 UTC (rev 372137)
@@ -3,7 +3,7 @@
 # Contributor: Hugo Doria 
 
 pkgname=deluge
-pkgver=2.0.3+23+g5f1eada3e
+pkgver=2.0.4.dev23+g2f1c008a2
 pkgrel=1
 pkgdesc="A BitTorrent client with multiple user interfaces in a client/server 
model"
 arch=(any)
@@ -49,23 +49,17 @@
   #'python-pygame: audible notifications'
   'libnotify: desktop notifications'
 )
-_commit=5f1eada3eae215f0fd489000e97792c892fb7b17  # develop
-source=("git://git.deluge-torrent.org/deluge.git#commit=$_commit"
-py3.8.diff)
-sha256sums=('SKIP'
-'a0225692e5c312d7980f0047f8e840803e8e05d6c525464ae9f335f56e205297')
+_commit=2f1c008a26b50ab3487bd03bcabb39347d441f23  # develop
+source=("git://git.deluge-torrent.org/deluge.git#commit=$_commit")
+sha256sums=('SKIP')
 
 pkgver() {
   cd $pkgname
-  git describe | sed 's/^deluge-//;s/-/+/g'
+  git describe --tags | sed 's/^deluge-//;s/dev0-/dev/;s/-/+/g'
 }
 
 prepare() {
   cd $pkgname
-
-  # Remove a broken logging.Logger.findCaller override
-  # https://bugs.archlinux.org/task/64571
-  patch -Np1 -i ../py3.8.diff
 }
 
 build() {

Deleted: py3.8.diff
===
--- py3.8.diff  2019-12-22 21:49:53 UTC (rev 372136)
+++ py3.8.diff  2019-12-22 23:57:18 UTC (rev 372137)
@@ -1,30 +0,0 @@
-diff --git i/deluge/log.py w/deluge/log.py
-index 75e8308b5..fbe206ad9 100644
 i/deluge/log.py
-+++ w/deluge/log.py
-@@ -86,25 +86,6 @@ def critical(self, msg, *args, **kwargs):
- def exception(self, msg, *args, **kwargs):
- yield LoggingLoggerClass.exception(self, msg, *args, **kwargs)
- 
--def findCaller(self, stack_info=False):  # NOQA: N802
--f = logging.currentframe().f_back
--rv = '(unknown file)', 0, '(unknown function)'
--while hasattr(f, 'f_code'):
--co = f.f_code
--filename = os.path.normcase(co.co_filename)
--if filename in (
--__file__.replace('.pyc', '.py'),
--defer.__file__.replace('.pyc', '.py'),
--):
--f = f.f_back
--continue
--if common.PY2:
--rv = (filename, f.f_lineno, co.co_name)
--else:
--rv = (filename, f.f_lineno, co.co_name, None)
--break
--return rv
--
- 
- levels = {
- 'info': logging.INFO,


[arch-commits] Commit in deluge/trunk (PKGBUILD py3.8.diff)

2019-11-19 Thread Jan Steffens via arch-commits
Date: Wednesday, November 20, 2019 @ 01:12:00
  Author: heftig
Revision: 369452

2.0.3+23+g5f1eada3e-1

Added:
  deluge/trunk/py3.8.diff
Modified:
  deluge/trunk/PKGBUILD

+
 PKGBUILD   |   16 +++-
 py3.8.diff |   30 ++
 2 files changed, 41 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-11-20 00:47:48 UTC (rev 369451)
+++ PKGBUILD2019-11-20 01:12:00 UTC (rev 369452)
@@ -3,8 +3,8 @@
 # Contributor: Hugo Doria 
 
 pkgname=deluge
-pkgver=2.0.3
-pkgrel=2
+pkgver=2.0.3+23+g5f1eada3e
+pkgrel=1
 pkgdesc="A BitTorrent client with multiple user interfaces in a client/server 
model"
 arch=(any)
 url="https://deluge-torrent.org/";
@@ -49,9 +49,11 @@
   #'python-pygame: audible notifications'
   'libnotify: desktop notifications'
 )
-_commit=b711cd258ae3001d5f1aa69617c22a2d258b1c06  # tags/deluge-2.0.3^0
-source=("git://git.deluge-torrent.org/deluge.git#commit=$_commit")
-sha256sums=('SKIP')
+_commit=5f1eada3eae215f0fd489000e97792c892fb7b17  # develop
+source=("git://git.deluge-torrent.org/deluge.git#commit=$_commit"
+py3.8.diff)
+sha256sums=('SKIP'
+'a0225692e5c312d7980f0047f8e840803e8e05d6c525464ae9f335f56e205297')
 
 pkgver() {
   cd $pkgname
@@ -60,6 +62,10 @@
 
 prepare() {
   cd $pkgname
+
+  # Remove a broken logging.Logger.findCaller override
+  # https://bugs.archlinux.org/task/64571
+  patch -Np1 -i ../py3.8.diff
 }
 
 build() {

Added: py3.8.diff
===
--- py3.8.diff  (rev 0)
+++ py3.8.diff  2019-11-20 01:12:00 UTC (rev 369452)
@@ -0,0 +1,30 @@
+diff --git i/deluge/log.py w/deluge/log.py
+index 75e8308b5..fbe206ad9 100644
+--- i/deluge/log.py
 w/deluge/log.py
+@@ -86,25 +86,6 @@ def critical(self, msg, *args, **kwargs):
+ def exception(self, msg, *args, **kwargs):
+ yield LoggingLoggerClass.exception(self, msg, *args, **kwargs)
+ 
+-def findCaller(self, stack_info=False):  # NOQA: N802
+-f = logging.currentframe().f_back
+-rv = '(unknown file)', 0, '(unknown function)'
+-while hasattr(f, 'f_code'):
+-co = f.f_code
+-filename = os.path.normcase(co.co_filename)
+-if filename in (
+-__file__.replace('.pyc', '.py'),
+-defer.__file__.replace('.pyc', '.py'),
+-):
+-f = f.f_back
+-continue
+-if common.PY2:
+-rv = (filename, f.f_lineno, co.co_name)
+-else:
+-rv = (filename, f.f_lineno, co.co_name, None)
+-break
+-return rv
+-
+ 
+ levels = {
+ 'info': logging.INFO,


[arch-commits] Commit in deluge/trunk (PKGBUILD deluge-web.service deluged.service)

2012-08-05 Thread Jan Steffens
Date: Sunday, August 5, 2012 @ 13:59:03
  Author: heftig
Revision: 164791

Add Install sections

Modified:
  deluge/trunk/PKGBUILD
  deluge/trunk/deluge-web.service
  deluge/trunk/deluged.service

+
 PKGBUILD   |8 
 deluge-web.service |3 +++
 deluged.service|3 +++
 3 files changed, 10 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-08-05 12:11:43 UTC (rev 164790)
+++ PKGBUILD2012-08-05 17:59:03 UTC (rev 164791)
@@ -24,10 +24,10 @@
 deluge.tmpfiles.conf deluged deluge-web deluged.service 
deluge-web.service deluged.conf)
 md5sums=('f17ef6686f33e12694b44976e5ed7721'
  'c50385d32a2db0ef3f46b8caadb0e988'
- 'd58897b9deab9c46c1cff24c30e0f92a'
- '358dcf943f2251abee6caac62cb10f40'
- '496f1709ca609e65b8bd592c3705f596'
- '6a30f7a98ee234b08e255e81f08a65d8'
+ '443690c730263b76a465dc413f695a86'
+ '37538a1b049b177e9ea1014331e29689'
+ '5ef8e612ce533ec91de20e134ba7ded0'
+ 'b3fff6601a5971bba89fa9a85dcf9ce8'
  '71d556cf7ce3bb59391797827347e80c')
 
 build() {

Modified: deluge-web.service
===
--- deluge-web.service  2012-08-05 12:11:43 UTC (rev 164790)
+++ deluge-web.service  2012-08-05 17:59:03 UTC (rev 164791)
@@ -6,3 +6,6 @@
 User=deluge
 EnvironmentFile=/etc/conf.d/deluged
 ExecStart=/usr/bin/deluge-web $WEB_OPTIONS
+
+[Install]
+WantedBy=multi-user.target

Modified: deluged.service
===
--- deluged.service 2012-08-05 12:11:43 UTC (rev 164790)
+++ deluged.service 2012-08-05 17:59:03 UTC (rev 164791)
@@ -7,3 +7,6 @@
 ExecStart=/usr/bin/deluged -P /run/deluge/deluged.pid $OPTIONS
 Type=forking
 PIDFile=/run/deluge/deluged.pid
+
+[Install]
+WantedBy=multi-user.target



[arch-commits] Commit in deluge/trunk (PKGBUILD deluge.install deluged deluged.conf.d)

2010-01-11 Thread Ionut Biru
Date: Monday, January 11, 2010 @ 14:32:49
  Author: ibiru
Revision: 62760

upgpkg: deluge 1.2.0-1
update to 1.2.0, fixed running deluged daemon with deluge user, added the 
possibility to change the user in /etc/conf.d/deluged, moved dependency that 
are needed for UIs on optdepends. FS#14142 FS#15949 FS#16772

Added:
  deluge/trunk/deluged.conf.d
Modified:
  deluge/trunk/PKGBUILD
  deluge/trunk/deluge.install
  deluge/trunk/deluged

+
 PKGBUILD   |   34 +++---
 deluge.install |   15 +--
 deluged|3 ++-
 deluged.conf.d |1 +
 4 files changed, 31 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-01-11 19:13:12 UTC (rev 62759)
+++ PKGBUILD2010-01-11 19:32:49 UTC (rev 62760)
@@ -2,29 +2,33 @@
 # Maintainer: Hugo Doria 
 
 pkgname=deluge
-pkgver=1.1.9
-pkgrel=3
+pkgver=1.2.0
+pkgrel=1
 pkgdesc="A bittorrent client written with python and pygtk"
 arch=('i686' 'x86_64')
 url="http://deluge-torrent.org/";
 license=('GPL3')
-depends=('pygtk' 'pyxdg' 'dbus-python' 'librsvg' 'setuptools' 
'libtorrent-rasterbar>=0.14.7')
-makedepends=('subversion' 'intltool')
-optdepends=('python-chardet: used to load non-UTF8 encoded torrents')
-source=(http://download.deluge-torrent.org/source/${pkgname}-${pkgver}.tar.bz2 
deluged)
-md5sums=('38b9dbf255ed9620760d546dbb757882' '6e1585bdc79243b1cd22ed9423cc4ec2')
+depends=('pyxdg' 'dbus-python' 'setuptools' 'libtorrent-rasterbar>=0.14.7' 
'twisted' 'pyopenssl' 'xdg-utils')
+makedepends=( 'intltool' 'pygtk' 'librsvg' 'python-mako')
+optdepends=('python-notify: libnotify notifications'
+   'python-chardet: needed for UIs'
+   '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)
 install="deluge.install"
-
+md5sums=('13ac84e9b5b0293eccb5d89a9fc49461'
+ 'a462fc27d283ecec9bbd52b840d27262'
+ '332d23fe0d21ce92b494efd73322856c')
 build() {
 
-  cd ${srcdir}/${pkgname}-${pkgver}/
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
   python setup.py build || return 1
-  python setup.py install --prefix=/usr --root=${pkgdir} || return 1
+  python setup.py install --prefix=/usr --root="${pkgdir}" || return 1
 
-  install -d -m755 ${pkgdir}/srv/deluge || return 1
-  install -D -m644 deluge/data/pixmaps/deluge.svg 
${pkgdir}/usr/share/pixmaps/deluge.svg || return 1
-  install -D -m755 ${srcdir}/deluged ${pkgdir}/etc/rc.d/deluged || return 1
-
+  install -d -m755 "${pkgdir}"/srv/deluge || return 1
+  install -D -m644 deluge/data/pixmaps/deluge.svg 
"${pkgdir}"/usr/share/pixmaps/deluge.svg || return 1
+  install -D -m755 "${srcdir}"/deluged "${pkgdir}"/etc/rc.d/deluged || return 1
+  install -D -m644 "${srcdir}"/deluged.conf.d "${pkgdir}"/etc/conf.d/deluged 
|| return 1
 }
-

Modified: deluge.install
===
--- deluge.install  2010-01-11 19:13:12 UTC (rev 62759)
+++ deluge.install  2010-01-11 19:32:49 UTC (rev 62760)
@@ -1,14 +1,14 @@
 post_install() {
-  getent group deluge >/dev/null || usr/sbin/groupadd -g 125 deluge
-  getent passwd deluge >/dev/null || usr/sbin/useradd -c 'Deluge user' -u 125 
-g deluge -d /srv/deluge -s /bin/false deluge 
+  getent group deluge >/dev/null 2>&1 || usr/sbin/groupadd -g 125 deluge
+  getent passwd deluge >/dev/null 2>&1 || usr/sbin/useradd -c 'Deluge user' -u 
125 -g deluge -d /srv/deluge -s /bin/bash deluge
   usr/bin/passwd -l deluge &>/dev/null
 
   chown deluge.deluge srv/deluge -R
+  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
 
 cat << _EOF
-
->>> Deluge's daemon is running with the "deluge" user. The default download 
directory is /srv/deluge/
-
+>>> 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/deluge
 _EOF
 }
 
@@ -17,6 +17,9 @@
 }
 
 pre_remove() {
-  usr/sbin/userdel deluge &> /dev/null
+  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
 }
 

Modified: deluged
===
--- deluged 2010-01-11 19:13:12 UTC (rev 62759)
+++ deluged 2010-01-11 19:32:49 UTC (rev 62760)
@@ -2,13 +2,14 @@
 
 . /etc/rc.conf
 . /etc/rc.d/functions
+. /etc/conf.d/deluged
 
 [[ -f /var/run/deluged.pid ]] && PID=`cat /var/run/deluged.pid`
 
 case "$1" in
   start)
 stat_busy "Starting Deluge Daemon"
-[[ -z $PID ]] && /usr/bin/deluged 2>&1
+[[ -z $PID ]] && su -l -c "/usr/bin/deluged" $DELUGE_USER
 if [ $? -gt 0 ]; then
   stat_fail
 else

Added: deluged.conf.d
===

[arch-commits] Commit in deluge/trunk (PKGBUILD deluge-web deluged)

2010-04-21 Thread Ionut Biru
Date: Wednesday, April 21, 2010 @ 19:03:56
  Author: ibiru
Revision: 78352

upgpkg: deluge 1.2.3-3
revert FS#19047, the logic is plain wrong

Modified:
  deluge/trunk/PKGBUILD
  deluge/trunk/deluge-web
  deluge/trunk/deluged

+
 PKGBUILD   |6 +++---
 deluge-web |1 -
 deluged|1 -
 3 files changed, 3 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-04-21 16:48:34 UTC (rev 78351)
+++ PKGBUILD2010-04-21 23:03:56 UTC (rev 78352)
@@ -4,7 +4,7 @@
 
 pkgname=deluge
 pkgver=1.2.3
-pkgrel=2
+pkgrel=3
 pkgdesc="A bittorrent client written with python and pygtk"
 arch=('i686' 'x86_64')
 url="http://deluge-torrent.org/";
@@ -18,8 +18,8 @@
 source=(http://download.deluge-torrent.org/source/${pkgname}-${pkgver}.tar.bz2 
deluged deluged.conf.d deluge-web)
 install=deluge.install
 backup=(etc/conf.d/deluged)
-md5sums=('f1dbc8734c1881b115b98f572e523a4d' 'a873e1935688df487e2f5ca5dda1176d'
- '332d23fe0d21ce92b494efd73322856c' '0fdce620e4e6ac0e2205509dc8ce99b0')
+md5sums=('f1dbc8734c1881b115b98f572e523a4d' 'a623a074720135dad49708eca17ba03c'
+ '332d23fe0d21ce92b494efd73322856c' 'de148d12ecee40203f0c5517cdf319a4')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"

Modified: deluge-web
===
--- deluge-web  2010-04-21 16:48:34 UTC (rev 78351)
+++ deluge-web  2010-04-21 23:03:56 UTC (rev 78352)
@@ -11,7 +11,6 @@
   start)
 stat_busy "Starting Deluge WebUI"
 [[ -z $PID ]] && su -l -s /bin/sh -c "/usr/bin/deluge-web -f" $DELUGE_USER
-sleep 1
 if [ $? -gt 0 ]; then
   stat_fail
 else

Modified: deluged
===
--- deluged 2010-04-21 16:48:34 UTC (rev 78351)
+++ deluged 2010-04-21 23:03:56 UTC (rev 78352)
@@ -11,7 +11,6 @@
   start)
 stat_busy "Starting Deluge Daemon"
 [[ -z $PID ]] && su -l -s /bin/sh -c "/usr/bin/deluged" $DELUGE_USER
-sleep 1
 if [ $? -gt 0 ]; then
   stat_fail
 else



[arch-commits] Commit in deluge/trunk (PKGBUILD deluge-web deluged)

2010-04-22 Thread Ionut Biru
Date: Thursday, April 22, 2010 @ 05:53:37
  Author: ibiru
Revision: 78360

upgpkg: deluge 1.2.3-4
restrict pgrep to search only for DELUGE_USER processes

Modified:
  deluge/trunk/PKGBUILD
  deluge/trunk/deluge-web
  deluge/trunk/deluged

+
 PKGBUILD   |6 +++---
 deluge-web |2 +-
 deluged|2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-04-22 02:44:31 UTC (rev 78359)
+++ PKGBUILD2010-04-22 09:53:37 UTC (rev 78360)
@@ -4,7 +4,7 @@
 
 pkgname=deluge
 pkgver=1.2.3
-pkgrel=3
+pkgrel=4
 pkgdesc="A bittorrent client written with python and pygtk"
 arch=('i686' 'x86_64')
 url="http://deluge-torrent.org/";
@@ -18,8 +18,8 @@
 source=(http://download.deluge-torrent.org/source/${pkgname}-${pkgver}.tar.bz2 
deluged deluged.conf.d deluge-web)
 install=deluge.install
 backup=(etc/conf.d/deluged)
-md5sums=('f1dbc8734c1881b115b98f572e523a4d' 'a623a074720135dad49708eca17ba03c'
- '332d23fe0d21ce92b494efd73322856c' 'de148d12ecee40203f0c5517cdf319a4')
+md5sums=('f1dbc8734c1881b115b98f572e523a4d' 'c98e3c3fcaaa2542ab08020b135ff351'
+ '332d23fe0d21ce92b494efd73322856c' '73a8d554983b833044f0613734308192')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"

Modified: deluge-web
===
--- deluge-web  2010-04-22 02:44:31 UTC (rev 78359)
+++ deluge-web  2010-04-22 09:53:37 UTC (rev 78360)
@@ -14,7 +14,7 @@
 if [ $? -gt 0 ]; then
   stat_fail
 else
-  echo $(pgrep deluge-web) > /var/run/deluge-web.pid
+  echo $(pgrep -u $DELUGE_USER deluge-web) > /var/run/deluge-web.pid
   add_daemon deluge-web
   stat_done
 fi

Modified: deluged
===
--- deluged 2010-04-22 02:44:31 UTC (rev 78359)
+++ deluged 2010-04-22 09:53:37 UTC (rev 78360)
@@ -14,7 +14,7 @@
 if [ $? -gt 0 ]; then
   stat_fail
 else
-  echo $(pgrep deluged) > /var/run/deluged.pid
+  echo $(pgrep -u $DELUGE_USER deluged) > /var/run/deluged.pid
   add_daemon deluged
   stat_done
 fi



[arch-commits] Commit in deluge/trunk (PKGBUILD deluge-web deluged)

2010-05-01 Thread Ionut Biru
Date: Saturday, May 1, 2010 @ 11:37:50
  Author: ibiru
Revision: 79177

upgpkg: deluge 1.2.3-5
suppres messages from console after starting daemons

Modified:
  deluge/trunk/PKGBUILD
  deluge/trunk/deluge-web
  deluge/trunk/deluged

+
 PKGBUILD   |6 +++---
 deluge-web |3 ++-
 deluged|3 ++-
 3 files changed, 7 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-05-01 13:18:25 UTC (rev 79176)
+++ PKGBUILD2010-05-01 15:37:50 UTC (rev 79177)
@@ -4,7 +4,7 @@
 
 pkgname=deluge
 pkgver=1.2.3
-pkgrel=4
+pkgrel=5
 pkgdesc="A bittorrent client written with python and pygtk"
 arch=('i686' 'x86_64')
 url="http://deluge-torrent.org/";
@@ -18,8 +18,8 @@
 source=(http://download.deluge-torrent.org/source/${pkgname}-${pkgver}.tar.bz2 
deluged deluged.conf.d deluge-web)
 install=deluge.install
 backup=(etc/conf.d/deluged)
-md5sums=('f1dbc8734c1881b115b98f572e523a4d' 'c98e3c3fcaaa2542ab08020b135ff351'
- '332d23fe0d21ce92b494efd73322856c' '73a8d554983b833044f0613734308192')
+md5sums=('f1dbc8734c1881b115b98f572e523a4d' '7d5790eeb14cd0b47d1bb3e0a19c9935'
+ '332d23fe0d21ce92b494efd73322856c' '6c913ec7322eaa60494ac9d53103005f')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"

Modified: deluge-web
===
--- deluge-web  2010-05-01 13:18:25 UTC (rev 79176)
+++ deluge-web  2010-05-01 15:37:50 UTC (rev 79177)
@@ -10,10 +10,11 @@
 case "$1" in
   start)
 stat_busy "Starting Deluge WebUI"
-[[ -z $PID ]] && su -l -s /bin/sh -c "/usr/bin/deluge-web -f" $DELUGE_USER
+[[ -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

Modified: deluged
===
--- deluged 2010-05-01 13:18:25 UTC (rev 79176)
+++ deluged 2010-05-01 15:37:50 UTC (rev 79177)
@@ -10,10 +10,11 @@
 case "$1" in
   start)
 stat_busy "Starting Deluge Daemon"
-[[ -z $PID ]] && su -l -s /bin/sh -c "/usr/bin/deluged" $DELUGE_USER
+[[ -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



[arch-commits] Commit in deluge/trunk (PKGBUILD user-agent-override.diff)

2020-07-19 Thread Jan Steffens via arch-commits
Date: Sunday, July 19, 2020 @ 09:07:50
  Author: heftig
Revision: 392267

2.0.4.dev38+g23a48dd01-2: FS#64937 override user agent

Added:
  deluge/trunk/user-agent-override.diff
Modified:
  deluge/trunk/PKGBUILD

--+
 PKGBUILD |   11 ---
 user-agent-override.diff |   13 +
 2 files changed, 21 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-07-19 06:44:12 UTC (rev 392266)
+++ PKGBUILD2020-07-19 09:07:50 UTC (rev 392267)
@@ -5,7 +5,7 @@
 pkgbase=deluge
 pkgname=(deluge deluge-gtk)
 pkgver=2.0.4.dev38+g23a48dd01
-pkgrel=1
+pkgrel=2
 pkgdesc="BitTorrent client with multiple user interfaces in a client/server 
model"
 url="https://deluge-torrent.org/";
 arch=(any)
@@ -42,8 +42,10 @@
   git
 )
 _commit=23a48dd01c86ef01cd1d13371de51247ec9a503b  # develop
-source=("git://git.deluge-torrent.org/deluge.git#commit=$_commit")
-sha256sums=('SKIP')
+source=("git://git.deluge-torrent.org/deluge.git#commit=$_commit"
+user-agent-override.diff)
+sha256sums=('SKIP'
+'f5ef4db7f1b78cd20cab91f25c7823f91f4e105639225b37aa4750d0cdd65104')
 
 pkgver() {
   cd deluge
@@ -52,6 +54,9 @@
 
 prepare() {
   cd deluge
+
+  # Pretend to be stable deluge
+  patch -Np1 -i ../user-agent-override.diff
 }
 
 build() {

Added: user-agent-override.diff
===
--- user-agent-override.diff(rev 0)
+++ user-agent-override.diff2020-07-19 09:07:50 UTC (rev 392267)
@@ -0,0 +1,13 @@
+diff --git i/deluge/core/core.py w/deluge/core/core.py
+index 8498ff9a8..fbef1cbd7 100644
+--- i/deluge/core/core.py
 w/deluge/core/core.py
+@@ -120,7 +120,7 @@ def __init__(
+ component.Component.__init__(self, 'Core')
+ 
+ # Start the libtorrent session.
+-user_agent = 'Deluge/{} libtorrent/{}'.format(DELUGE_VER, LT_VERSION)
++user_agent = 'Deluge/{} libtorrent/{}'.format('2.0.3', LT_VERSION)
+ peer_id = self._create_peer_id(DELUGE_VER)
+ log.debug('Starting session (peer_id: %s, user_agent: %s)', peer_id, 
user_agent)
+ settings_pack = {


[arch-commits] Commit in deluge/trunk (PKGBUILD deluge-web deluge.install deluged)

2010-02-20 Thread Ionut Biru
Date: Saturday, February 20, 2010 @ 18:17:13
  Author: ibiru
Revision: 69546

upgpkg: deluge 1.2.1-1
update to 1.2.1 and added deluge-web daemon script

Added:
  deluge/trunk/deluge-web
Modified:
  deluge/trunk/PKGBUILD
  deluge/trunk/deluge.install
  deluge/trunk/deluged

+
 PKGBUILD   |   16 
 deluge-web |   40 
 deluge.install |2 +-
 deluged|2 --
 4 files changed, 49 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-02-20 21:51:51 UTC (rev 69545)
+++ PKGBUILD2010-02-20 23:17:13 UTC (rev 69546)
@@ -3,26 +3,25 @@
 # Contributor: Hugo Doria 
 
 pkgname=deluge
-pkgver=1.2.0
-pkgrel=2
+pkgver=1.2.1
+pkgrel=1
 pkgdesc="A bittorrent client written with python and pygtk"
 arch=('i686' 'x86_64')
 url="http://deluge-torrent.org/";
 license=('GPL3')
-depends=('pyxdg' 'dbus-python' 'setuptools' 'libtorrent-rasterbar>=0.14.7' 
'twisted' 'pyopenssl' 'xdg-utils' 'python-chardet')
+depends=('pyxdg' 'dbus-python' 'setuptools' 'libtorrent-rasterbar>=0.14.9' 
'twisted' 'pyopenssl' 'xdg-utils' 'python-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)
+source=(http://download.deluge-torrent.org/source/${pkgname}-${pkgver}.tar.bz2 
deluged deluged.conf.d deluge-web)
 install=deluge.install
 backup=(etc/conf.d/deluged)
-md5sums=('13ac84e9b5b0293eccb5d89a9fc49461'
- 'a462fc27d283ecec9bbd52b840d27262'
- '332d23fe0d21ce92b494efd73322856c')
+md5sums=('ea6d6c7af48ca05e4e808c960563d78d' 'e187f10be1f4a445ae1bc76693a16e8a'
+ '332d23fe0d21ce92b494efd73322856c' '25a4c2b62e0e00427dd72247c0da1617')
+
 build() {
-
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   python setup.py build || return 1
@@ -31,5 +30,6 @@
   install -d -m755 "${pkgdir}"/srv/deluge || return 1
   install -D -m644 deluge/data/pixmaps/deluge.svg 
"${pkgdir}"/usr/share/pixmaps/deluge.svg || return 1
   install -D -m755 "${srcdir}"/deluged "${pkgdir}"/etc/rc.d/deluged || return 1
+  install -D -m755 "${srcdir}"/deluge-web "${pkgdir}"/etc/rc.d/deluge-web || 
return 1
   install -D -m644 "${srcdir}"/deluged.conf.d "${pkgdir}"/etc/conf.d/deluged 
|| return 1
 }

Added: deluge-web
===
--- deluge-web  (rev 0)
+++ deluge-web  2010-02-20 23:17:13 UTC (rev 69546)
@@ -0,0 +1,40 @@
+#!/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`
+
+case "$1" in
+  start)
+stat_busy "Starting Deluge WebUI"
+[[ -z $PID ]] && su -l -c "/usr/bin/deluge-web -f" $DELUGE_USER
+if [ $? -gt 0 ]; then
+  stat_fail
+else
+  echo $(pgrep 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

Modified: deluge.install
===
--- deluge.install  2010-02-20 21:51:51 UTC (rev 69545)
+++ deluge.install  2010-02-20 23:17:13 UTC (rev 69546)
@@ -8,7 +8,7 @@
 
 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/deluge
+You can change the user by editing /etc/conf.d/deluged
 _EOF
 }
 

Modified: deluged
===
--- deluged 2010-02-20 21:51:51 UTC (rev 69545)
+++ deluged 2010-02-20 23:17:13 UTC (rev 69546)
@@ -39,5 +39,3 @@
 esac
 exit 0
 
-
-



[arch-commits] Commit in deluge/trunk (PKGBUILD deluge-web deluge.install deluged)

2010-04-21 Thread Ionut Biru
Date: Wednesday, April 21, 2010 @ 09:45:04
  Author: ibiru
Revision: 78337

upgpkg: deluge 1.2.3-2
check if we have a stalled process, changed the default shell from bin/bash to 
/bin/false, fixes FS#19193,FS#19191 and FS#19047

Modified:
  deluge/trunk/PKGBUILD
  deluge/trunk/deluge-web
  deluge/trunk/deluge.install
  deluge/trunk/deluged

+
 PKGBUILD   |6 +++---
 deluge-web |6 --
 deluge.install |6 +-
 deluged|6 --
 4 files changed, 16 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-04-21 12:48:29 UTC (rev 78336)
+++ PKGBUILD2010-04-21 13:45:04 UTC (rev 78337)
@@ -4,7 +4,7 @@
 
 pkgname=deluge
 pkgver=1.2.3
-pkgrel=1
+pkgrel=2
 pkgdesc="A bittorrent client written with python and pygtk"
 arch=('i686' 'x86_64')
 url="http://deluge-torrent.org/";
@@ -18,8 +18,8 @@
 source=(http://download.deluge-torrent.org/source/${pkgname}-${pkgver}.tar.bz2 
deluged deluged.conf.d deluge-web)
 install=deluge.install
 backup=(etc/conf.d/deluged)
-md5sums=('f1dbc8734c1881b115b98f572e523a4d' 'e187f10be1f4a445ae1bc76693a16e8a'
- '332d23fe0d21ce92b494efd73322856c' '25a4c2b62e0e00427dd72247c0da1617')
+md5sums=('f1dbc8734c1881b115b98f572e523a4d' 'a873e1935688df487e2f5ca5dda1176d'
+ '332d23fe0d21ce92b494efd73322856c' '0fdce620e4e6ac0e2205509dc8ce99b0')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"

Modified: deluge-web
===
--- deluge-web  2010-04-21 12:48:29 UTC (rev 78336)
+++ deluge-web  2010-04-21 13:45:04 UTC (rev 78337)
@@ -4,12 +4,14 @@
 . /etc/rc.d/functions
 . /etc/conf.d/deluged
 
-[[ -f /var/run/deluge-web.pid ]] && PID=`cat /var/run/deluge-web.pid`
+[[ -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 -c "/usr/bin/deluge-web -f" $DELUGE_USER
+[[ -z $PID ]] && su -l -s /bin/sh -c "/usr/bin/deluge-web -f" $DELUGE_USER
+sleep 1
 if [ $? -gt 0 ]; then
   stat_fail
 else

Modified: deluge.install
===
--- deluge.install  2010-04-21 12:48:29 UTC (rev 78336)
+++ deluge.install  2010-04-21 13:45:04 UTC (rev 78337)
@@ -1,6 +1,10 @@
 post_install() {
   getent group deluge >/dev/null 2>&1 || usr/sbin/groupadd -g 125 deluge
-  getent passwd deluge >/dev/null 2>&1 || usr/sbin/useradd -c 'Deluge user' -u 
125 -g deluge -d /srv/deluge -s /bin/bash 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 -R

Modified: deluged
===
--- deluged 2010-04-21 12:48:29 UTC (rev 78336)
+++ deluged 2010-04-21 13:45:04 UTC (rev 78337)
@@ -4,12 +4,14 @@
 . /etc/rc.d/functions
 . /etc/conf.d/deluged
 
-[[ -f /var/run/deluged.pid ]] && PID=`cat /var/run/deluged.pid`
+[[ -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 -c "/usr/bin/deluged" $DELUGE_USER
+[[ -z $PID ]] && su -l -s /bin/sh -c "/usr/bin/deluged" $DELUGE_USER
+sleep 1
 if [ $? -gt 0 ]; then
   stat_fail
 else