Merge remote-tracking branch 'origin/testing' into testing

Conflicts:
	abs/core/LinHES-config/PKGBUILD

4 files changed, 10 insertions, 10 deletions

diff --git a/abs/extra/community/transmission-cli/PKGBUILD b/abs/extra/community/transmission-cli/PKGBUILD
index 40053ce..09609f9 100644
--- a/abs/extra/community/transmission-cli/PKGBUILD
+++ b/abs/extra/community/transmission-cli/PKGBUILD
@@ -3,14 +3,14 @@
 # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com>
 
 pkgname=transmission-cli
-pkgver=2.33
-pkgrel=1
+pkgver=2.41
+pkgrel=2
 pkgdesc="Fast, easy, and free BitTorrent client (CLI tools, daemon and web client)"
 arch=('i686' 'x86_64')
 url="http://www.transmissionbt.com/"
 license=('MIT')
 depends=('curl' 'libevent>=2.0.10')
-makedepends=('intltool')
+makedepends=('intltool' 'libcroco')
 replaces=('transmission')
 backup=('etc/conf.d/transmissiond')
 install=transmission-cli.install
@@ -38,8 +38,8 @@ package() {
   install -D -m644 "$srcdir/transmission.include" "$pkgdir/etc/transmission/transmission.include" || return 1
   install -D -m644 COPYING "$pkgdir/usr/share/licenses/transmission-cli/COPYING" || return 1
 }
-md5sums=('082217a65713ac879410c622cbe6eb26'
-         'b91534aaf2e403331c611c615ab2c03d'
+md5sums=('799b7bb24e236dbbdc86275f89ea9e67'
+         'e876d24b99c401f782395b053976dffd'
          'ff22c13dbd52565f9e88b1de22514eb9'
          'b5a49ea375333cd0fee40f70dbac4c2e'
          'd05567c7a4f9df9f28602d1356d5c05c')
diff --git a/abs/extra/community/transmission-cli/run.transmissiond b/abs/extra/community/transmission-cli/run.transmissiond
index 714c946..792594a 100755
--- a/abs/extra/community/transmission-cli/run.transmissiond
+++ b/abs/extra/community/transmission-cli/run.transmissiond
@@ -13,7 +13,7 @@ PID=`pidof -o %PPID /usr/bin/transmission-daemon`
              if [ ! -f ${CONFIGDIR}/blocklists/level1 ]; then
                 # update blocklist
                # echo "updating blocklist, ~4MB"
-                wget -q -O level1.gz http://download.m0k.org/transmission/files/level1.gz
+                wget -q -O level1.gz http://www.bluetack.co.uk/config/level1.gz
                 if [ -f level1.gz ]; then
                   gunzip level1.gz
                   if [ $? -eq 0 ]; then
diff --git a/abs/extra/community/twisted/PKGBUILD b/abs/extra/community/twisted/PKGBUILD
index e008e92..13fca6b 100644
--- a/abs/extra/community/twisted/PKGBUILD
+++ b/abs/extra/community/twisted/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=twisted
 pkgver=10.1.0
-pkgrel=1
+pkgrel=3
 pkgdesc="Asynchronous networking framework written in Python."
 arch=('i686' 'x86_64')
 url="http://twistedmatrix.com/"
@@ -23,7 +23,7 @@ build() {
   install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/$pkgname/LICENSE"
 
   sed -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
-      -i ${pkgdir}/usr/lib/python2.7/site-packages/twisted/trial/test/scripttest.py
+      -i ${pkgdir}/usr/lib/python2.6/site-packages/twisted/trial/test/scripttest.py
   sed -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
-      -i ${pkgdir}/usr/lib/python2.7/site-packages/twisted/mail/test/pop3testserver.py
+      -i ${pkgdir}/usr/lib/python2.6/site-packages/twisted/mail/test/pop3testserver.py
 }
diff --git a/abs/extra/community/twisted/twisted.install b/abs/extra/community/twisted/twisted.install
index 8e93ffd..62a2cc5 100644
--- a/abs/extra/community/twisted/twisted.install
+++ b/abs/extra/community/twisted/twisted.install
@@ -7,5 +7,5 @@ post_upgrade() {
 }
 
 post_remove() {
-  find /usr/lib/python2.7/site-packages/twisted/plugins -name dropin.cache | xargs -r rm -f
+  find /usr/lib/python2.6/site-packages/twisted/plugins -name dropin.cache | xargs -r rm -f
 }