Unbreak port and update to 1.3.2.

Take maintainership.

Approved by:	kwm (mentor), pav (portmgr)

4 files changed, 133 insertions, 88 deletions

diff --git a/net-p2p/deluge/Makefile b/net-p2p/deluge/Makefile
index 677748d0a70a..16f86faec1b9 100644
--- a/net-p2p/deluge/Makefile
+++ b/net-p2p/deluge/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME=	deluge
-DISTVERSION=	1.3.1
+DISTVERSION=	1.3.2
 PORTEPOCH=	1
 CATEGORIES=	net-p2p python
 MASTER_SITES=	http://download.deluge-torrent.org/source/
 EXTRACT_SUFX=	.tar.lzma
 
-MAINTAINER=	lioux@FreeBSD.org
+MAINTAINER=	jsa@FreeBSD.org
 COMMENT=	Bittorrent client using Python, GTK+2 and libtorrent-rasterbar
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0.6:${PORTSDIR}/devel/py-setuptools
@@ -23,13 +23,11 @@ RUN_DEPENDS=	boost-python-libs>=1.41.0:${PORTSDIR}/devel/boost-python-libs \
 		${PYTHON_PKGNAMEPREFIX}setuptools>=0.6:${PORTSDIR}/devel/py-setuptools \
 		${PYTHON_PKGNAMEPREFIX}simplejson>=2.0.9:${PORTSDIR}/devel/py-simplejson \
 		${PYTHON_PKGNAMEPREFIX}xdg>=0.18:${PORTSDIR}/devel/py-xdg \
-		${PYTHON_PKGNAMEPREFIX}libtorrent-rasterbar$>=0.15.1:${PORTSDIR}/net-p2p/libtorrent-rasterbar-15-python \
+		${PYTHON_PKGNAMEPREFIX}libtorrent-rasterbar>=0.15.1:${PORTSDIR}/net-p2p/libtorrent-rasterbar-15-python \
 		${PYTHON_PKGNAMEPREFIX}openssl>=0.8:${PORTSDIR}/security/py-openssl \
 		${PYTHON_PKGNAMEPREFIX}chardet>=1.0.1:${PORTSDIR}/textproc/py-chardet \
 		${PYTHON_PKGNAMEPREFIX}mako>=0.2.5:${PORTSDIR}/textproc/py-mako
 
-BROKEN=		bad dependency object
-
 USE_RC_SUBR=	deluged
 SUB_LIST+=	PYTHON_CMD=${PYTHON_CMD}
 
@@ -49,12 +47,7 @@ MAN1=		deluge.1 deluge-console.1 deluge-gtk.1 deluge-web.1 deluged.1
 
 PORTDOCS=	*
 
-DESKTOP_ENTRIES=	"Deluge" \
-			"A peer-to-peer file sharing program utilizing the Bittorrent protocol" \
-			"${PYTHONPREFIX_SITELIBDIR}/${PYEASYINSTALL_EGG}/share/pixmaps/deluge.png" \
-			"deluge" \
-			"Network;FileTransfer;P2P;" \
-			"true"
+PLIST_SUB+=	PYDOTVER="${PYTHON_VERSION:S/thon//}"
 
 .include <bsd.port.pre.mk>
 
@@ -71,7 +64,7 @@ WITHOUT_PSYCO=	yes
 PLIST_FILES+=	${PYTHON_SITELIBDIR:S;${LOCALBASE}/;;}/easy-install.pth
 . endif
 
-# only touch site.py{,c,o} if we installed it ourselves
+# only touch site.py{c,o} if we installed it ourselves
 . for file in site.py site.pyc site.pyo
 .  if !exists(${PYTHONPREFIX_SITELIBDIR}/${file})
 PLIST_FILES+=	${PYTHON_SITELIBDIR:S;${LOCALBASE}/;;}/${file}
@@ -100,16 +93,41 @@ INSTALLS_ICONS=	yes
 .endif
 
 post-patch:
-	${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
-			${WRKSRC}/setup.py
 	${REINPLACE_CMD} -e '/"new_release_check":/s|True,|False,|g ; \
-		 /"geoip_db_location":/s|/usr/share/GeoIP/GeoIP.dat|${LOCALBASE}/share/GeoIP/GeoIP.dat|g' \
+		/"geoip_db_location":/s|/usr/share/GeoIP/GeoIP.dat|${LOCALBASE}/share/GeoIP/GeoIP.dat|g' \
 			${WRKSRC}/deluge/core/preferencesmanager.py
 	${REINPLACE_CMD} -e '/"check_new_releases":/s|True,|False,|g ; \
-		 /"show_new_releases":/s|True,|False,|g' \
+		/"show_new_releases":/s|True,|False,|g' \
 			${WRKSRC}/deluge/ui/gtkui/gtkui.py
+	${REINPLACE_CMD} -e 's|GTK|GTK;|' \
+		${WRKSRC}/deluge/data/share/applications/deluge.desktop
 
 post-install:
+# do these by hand, else they wind up in the wrong place
+	if [ ! -d ${PREFIX}/share/icons/hicolor/scalable/apps ]; then \
+	${MKDIR} ${PREFIX}/share/icons/hicolor/scalable/apps ; \
+	fi
+	${INSTALL_DATA} ${WRKSRC}/deluge/data/icons/scalable/apps/deluge.svg \
+		${PREFIX}/share/icons/hicolor/scalable/apps
+.for size in 16 22 24 32 36 48 64 72 96 128 192 256
+	if [ ! -d ${PREFIX}/share/icons/hicolor/${size}x${size}/apps ]; then \
+		${MKDIR} ${PREFIX}/share/icons/hicolor/${size}x${size}/apps ; \
+	fi
+	${INSTALL_DATA} ${WRKSRC}/deluge/data/icons/hicolor/${size}x${size}/apps/deluge.png \
+		${PREFIX}/share/icons/hicolor/${size}x${size}/apps
+.endfor
+	if [ ! -d ${PREFIX}/share/applications ]; then \
+		${MKDIR} ${PREFIX}/share/applications ; \
+	fi
+	${INSTALL_DATA} ${WRKSRC}/deluge/data/share/applications/deluge.desktop \
+	${PREFIX}/share/applications
+	if [ ! -d ${PREFIX}/share/pixmaps ]; then \
+	${MKDIR} ${PREFIX}/share/pixmaps ; \
+	fi
+.for file in png xpm
+	${INSTALL_DATA} ${WRKSRC}/deluge/data/pixmaps/deluge.${file} \
+		${PREFIX}/share/pixmaps
+.endfor
 .if !defined(WITHOUT_PYGTK)
 	-update-desktop-database
 .endif
diff --git a/net-p2p/deluge/distinfo b/net-p2p/deluge/distinfo
index 11000f285684..96b60b59087f 100644
--- a/net-p2p/deluge/distinfo
+++ b/net-p2p/deluge/distinfo
@@ -1,2 +1,2 @@
-SHA256 (deluge-1.3.1.tar.lzma) = 651b42e7ceb5f00e6a280f954ecff1da3a8ae0efc9a1f5e43eda317f499ec95f
-SIZE (deluge-1.3.1.tar.lzma) = 1869318
+SHA256 (deluge-1.3.2.tar.lzma) = 7420221d861d05357edc338868294b6f600b4ac9783c568e65da389aeea4bf21
+SIZE (deluge-1.3.2.tar.lzma) = 2088854
diff --git a/net-p2p/deluge/files/patch-setup.py b/net-p2p/deluge/files/patch-setup.py
index af911aca30d7..59518c0744ab 100644
--- a/net-p2p/deluge/files/patch-setup.py
+++ b/net-p2p/deluge/files/patch-setup.py
@@ -1,6 +1,6 @@
---- setup.py.orig	2010-09-18 15:31:07.000000000 -0300
-+++ setup.py	2010-09-19 23:33:09.000000000 -0300
-@@ -211,6 +203,7 @@
+--- ./setup.py.orig	2011-07-08 18:15:27.000000000 -0400
++++ ./setup.py	2011-07-08 18:16:21.000000000 -0400
+@@ -213,6 +213,7 @@
      build_libtorrent = True
  else:
      build_libtorrent = False
@@ -8,19 +8,24 @@
  
  if build_libtorrent:
      got_libtorrent = False
-@@ -399,7 +392,7 @@
+@@ -401,27 +402,6 @@
  
  # Data files to be installed to the system
  _data_files = [
 -    ('share/icons/scalable/apps', ['deluge/data/icons/scalable/apps/deluge.svg']),
-+    ('share/icons/hicolor/scalable/apps', ['deluge/data/icons/scalable/apps/deluge.svg']),
-     ('share/icons/hicolor/128x128/apps', ['deluge/data/icons/hicolor/128x128/apps/deluge.png']),
-     ('share/icons/hicolor/16x16/apps', ['deluge/data/icons/hicolor/16x16/apps/deluge.png']),
-     ('share/icons/hicolor/192x192/apps', ['deluge/data/icons/hicolor/192x192/apps/deluge.png']),
-@@ -413,13 +406,7 @@
-     ('share/icons/hicolor/72x72/apps', ['deluge/data/icons/hicolor/72x72/apps/deluge.png']),
-     ('share/icons/hicolor/96x96/apps', ['deluge/data/icons/hicolor/96x96/apps/deluge.png']),
-     ('share/applications', ['deluge/data/share/applications/deluge.desktop']),
+-    ('share/icons/hicolor/128x128/apps', ['deluge/data/icons/hicolor/128x128/apps/deluge.png']),
+-    ('share/icons/hicolor/16x16/apps', ['deluge/data/icons/hicolor/16x16/apps/deluge.png']),
+-    ('share/icons/hicolor/192x192/apps', ['deluge/data/icons/hicolor/192x192/apps/deluge.png']),
+-    ('share/icons/hicolor/22x22/apps', ['deluge/data/icons/hicolor/22x22/apps/deluge.png']),
+-    ('share/icons/hicolor/24x24/apps', ['deluge/data/icons/hicolor/24x24/apps/deluge.png']),
+-    ('share/icons/hicolor/256x256/apps', ['deluge/data/icons/hicolor/256x256/apps/deluge.png']),
+-    ('share/icons/hicolor/32x32/apps', ['deluge/data/icons/hicolor/32x32/apps/deluge.png']),
+-    ('share/icons/hicolor/36x36/apps', ['deluge/data/icons/hicolor/36x36/apps/deluge.png']),
+-    ('share/icons/hicolor/48x48/apps', ['deluge/data/icons/hicolor/48x48/apps/deluge.png']),
+-    ('share/icons/hicolor/64x64/apps', ['deluge/data/icons/hicolor/64x64/apps/deluge.png']),
+-    ('share/icons/hicolor/72x72/apps', ['deluge/data/icons/hicolor/72x72/apps/deluge.png']),
+-    ('share/icons/hicolor/96x96/apps', ['deluge/data/icons/hicolor/96x96/apps/deluge.png']),
+-    ('share/applications', ['deluge/data/share/applications/deluge.desktop']),
 -    ('share/pixmaps', ['deluge/data/pixmaps/deluge.png', 'deluge/data/pixmaps/deluge.xpm']),
 -    ('share/man/man1', [
 -        'docs/man/deluge.1',
@@ -28,7 +33,6 @@
 -        'docs/man/deluge-gtk.1',
 -        'docs/man/deluge-web.1',
 -        'docs/man/deluge-console.1'])
-+    ('share/pixmaps', ['deluge/data/pixmaps/deluge.png', 'deluge/data/pixmaps/deluge.xpm'])
  ]
  
- # Main setup
+ entry_points = {
diff --git a/net-p2p/deluge/pkg-plist b/net-p2p/deluge/pkg-plist
index 214a181792b7..0af0439e3b3b 100644
--- a/net-p2p/deluge/pkg-plist
+++ b/net-p2p/deluge/pkg-plist
@@ -336,12 +336,15 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/data/pixmaps/flags/zw.png
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/data/pixmaps/inactive.svg
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/data/pixmaps/inactive16.png
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/data/pixmaps/loading.gif
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/data/pixmaps/lock48.png
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/data/pixmaps/magnet.png
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/data/pixmaps/queued.svg
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/data/pixmaps/queued16.png
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/data/pixmaps/seeding.svg
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/data/pixmaps/seeding16.png
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/data/pixmaps/tracker_all16.png
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/data/pixmaps/tracker_warning16.png
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/data/pixmaps/traffic.svg
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/data/pixmaps/traffic16.png
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/decorators.py
@@ -378,6 +381,7 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/eu/LC_MESSAGES/deluge.mo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/fa/LC_MESSAGES/deluge.mo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/fi/LC_MESSAGES/deluge.mo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/fo/LC_MESSAGES/deluge.mo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/fr/LC_MESSAGES/deluge.mo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/fy/LC_MESSAGES/deluge.mo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/gl/LC_MESSAGES/deluge.mo
@@ -396,13 +400,17 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/ko/LC_MESSAGES/deluge.mo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/ku/LC_MESSAGES/deluge.mo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/la/LC_MESSAGES/deluge.mo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/lb/LC_MESSAGES/deluge.mo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/lt/LC_MESSAGES/deluge.mo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/lv/LC_MESSAGES/deluge.mo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/mk/LC_MESSAGES/deluge.mo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/ml/LC_MESSAGES/deluge.mo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/ms/LC_MESSAGES/deluge.mo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/nb/LC_MESSAGES/deluge.mo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/nds/LC_MESSAGES/deluge.mo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/nl/LC_MESSAGES/deluge.mo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/nn/LC_MESSAGES/deluge.mo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/oc/LC_MESSAGES/deluge.mo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/pl/LC_MESSAGES/deluge.mo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/pms/LC_MESSAGES/deluge.mo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/pt/LC_MESSAGES/deluge.mo
@@ -415,11 +423,13 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/sr/LC_MESSAGES/deluge.mo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/sv/LC_MESSAGES/deluge.mo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/ta/LC_MESSAGES/deluge.mo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/te/LC_MESSAGES/deluge.mo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/th/LC_MESSAGES/deluge.mo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/tl/LC_MESSAGES/deluge.mo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/tlh/LC_MESSAGES/deluge.mo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/tr/LC_MESSAGES/deluge.mo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/uk/LC_MESSAGES/deluge.mo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/ur/LC_MESSAGES/deluge.mo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/vi/LC_MESSAGES/deluge.mo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/zh_CN/LC_MESSAGES/deluge.mo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/zh_HK/LC_MESSAGES/deluge.mo
@@ -439,14 +449,14 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/pluginmanagerbase.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/pluginmanagerbase.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/pluginmanagerbase.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/plugins/AutoAdd-1.02-py2.6.egg
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/plugins/Blocklist-1.2-py2.6.egg
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/plugins/Execute-1.2-py2.6.egg
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/plugins/Extractor-0.1-py2.6.egg
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/plugins/Label-0.1-py2.6.egg
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/plugins/Notifications-0.1-py2.6.egg
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/plugins/Scheduler-0.2-py2.6.egg
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/plugins/WebUi-0.1-py2.6.egg
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/plugins/AutoAdd-1.02-%%PYDOTVER%%.egg
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/plugins/Blocklist-1.2-%%PYDOTVER%%.egg
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/plugins/Execute-1.2-%%PYDOTVER%%.egg
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/plugins/Extractor-0.1-%%PYDOTVER%%.egg
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/plugins/Label-0.1-%%PYDOTVER%%.egg
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/plugins/Notifications-0.1-%%PYDOTVER%%.egg
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/plugins/Scheduler-0.2-%%PYDOTVER%%.egg
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/plugins/WebUi-0.1-%%PYDOTVER%%.egg
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/plugins/__init__.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/plugins/__init__.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/plugins/__init__.pyo
@@ -1380,58 +1390,57 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/ui/web/web.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/ui/web/web.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/ui/web/web.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share/applications/deluge.desktop
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share/icons/hicolor/128x128/apps/deluge.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share/icons/hicolor/16x16/apps/deluge.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share/icons/hicolor/192x192/apps/deluge.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share/icons/hicolor/22x22/apps/deluge.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share/icons/hicolor/24x24/apps/deluge.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share/icons/hicolor/256x256/apps/deluge.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share/icons/hicolor/32x32/apps/deluge.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share/icons/hicolor/36x36/apps/deluge.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share/icons/hicolor/48x48/apps/deluge.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share/icons/hicolor/64x64/apps/deluge.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share/icons/hicolor/72x72/apps/deluge.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share/icons/hicolor/96x96/apps/deluge.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share/icons/hicolor/scalable/apps/deluge.svg
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share/pixmaps/deluge.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share/pixmaps/deluge.xpm
+share/applications/deluge.desktop
+share/icons/hicolor/128x128/apps/deluge.png
+share/icons/hicolor/16x16/apps/deluge.png
+share/icons/hicolor/192x192/apps/deluge.png
+share/icons/hicolor/22x22/apps/deluge.png
+share/icons/hicolor/24x24/apps/deluge.png
+share/icons/hicolor/256x256/apps/deluge.png
+share/icons/hicolor/32x32/apps/deluge.png
+share/icons/hicolor/36x36/apps/deluge.png
+share/icons/hicolor/48x48/apps/deluge.png
+share/icons/hicolor/64x64/apps/deluge.png
+share/icons/hicolor/72x72/apps/deluge.png
+share/icons/hicolor/96x96/apps/deluge.png
+share/icons/hicolor/scalable/apps/deluge.svg
+share/pixmaps/deluge.png
+share/pixmaps/deluge.xpm
 bin/deluge
 bin/deluge-console
 bin/deluge-gtk
 bin/deluge-web
 bin/deluged
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share/pixmaps
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share/icons/hicolor/scalable/apps
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share/icons/hicolor/scalable
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share/icons/hicolor/96x96/apps
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share/icons/hicolor/96x96
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share/icons/hicolor/72x72/apps
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share/icons/hicolor/72x72
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share/icons/hicolor/64x64/apps
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share/icons/hicolor/64x64
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share/icons/hicolor/48x48/apps
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share/icons/hicolor/48x48
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share/icons/hicolor/36x36/apps
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share/icons/hicolor/36x36
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share/icons/hicolor/32x32/apps
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share/icons/hicolor/32x32
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share/icons/hicolor/256x256/apps
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share/icons/hicolor/256x256
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share/icons/hicolor/24x24/apps
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share/icons/hicolor/24x24
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share/icons/hicolor/22x22/apps
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share/icons/hicolor/22x22
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share/icons/hicolor/192x192/apps
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share/icons/hicolor/192x192
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share/icons/hicolor/16x16/apps
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share/icons/hicolor/16x16
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share/icons/hicolor/128x128/apps
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share/icons/hicolor/128x128
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share/icons/hicolor
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share/icons
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share/applications
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share
+@dirrmtry share/pixmaps
+@dirrmtry share/icons/hicolor/scalable/apps
+@dirrmtry share/icons/hicolor/scalable
+@dirrmtry share/icons/hicolor/96x96/apps
+@dirrmtry share/icons/hicolor/96x96
+@dirrmtry share/icons/hicolor/72x72/apps
+@dirrmtry share/icons/hicolor/72x72
+@dirrmtry share/icons/hicolor/64x64/apps
+@dirrmtry share/icons/hicolor/64x64
+@dirrmtry share/icons/hicolor/48x48/apps
+@dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor/36x36/apps
+@dirrmtry share/icons/hicolor/36x36
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor/256x256/apps
+@dirrmtry share/icons/hicolor/256x256
+@dirrmtry share/icons/hicolor/24x24/apps
+@dirrmtry share/icons/hicolor/24x24
+@dirrmtry share/icons/hicolor/22x22/apps
+@dirrmtry share/icons/hicolor/22x22
+@dirrmtry share/icons/hicolor/192x192/apps
+@dirrmtry share/icons/hicolor/192x192
+@dirrmtry share/icons/hicolor/16x16/apps
+@dirrmtry share/icons/hicolor/16x16
+@dirrmtry share/icons/hicolor/128x128/apps
+@dirrmtry share/icons/hicolor/128x128
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
+@dirrmtry share/applications
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/ui/web/themes/images/vista/toolbar
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/ui/web/themes/images/vista/tabs
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/ui/web/themes/images/vista/sizer
@@ -1515,7 +1524,7 @@ bin/deluged
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/ui/console/commands
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/ui/console
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/ui
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/plugins
+@dirrmtry %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/plugins
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/zh_TW/LC_MESSAGES
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/zh_TW
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/zh_HK/LC_MESSAGES
@@ -1524,6 +1533,8 @@ bin/deluged
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/zh_CN
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/vi/LC_MESSAGES
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/vi
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/ur/LC_MESSAGES
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/ur
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/uk/LC_MESSAGES
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/uk
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/tr/LC_MESSAGES
@@ -1534,6 +1545,8 @@ bin/deluged
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/tl
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/th/LC_MESSAGES
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/th
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/te/LC_MESSAGES
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/te
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/ta/LC_MESSAGES
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/ta
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/sv/LC_MESSAGES
@@ -1558,6 +1571,10 @@ bin/deluged
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/pms
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/pl/LC_MESSAGES
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/pl
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/oc/LC_MESSAGES
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/oc
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/nn/LC_MESSAGES
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/nn
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/nl/LC_MESSAGES
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/nl
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/nds/LC_MESSAGES
@@ -1566,12 +1583,16 @@ bin/deluged
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/nb
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/ms/LC_MESSAGES
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/ms
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/ml/LC_MESSAGES
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/ml
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/mk/LC_MESSAGES
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/mk
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/lv/LC_MESSAGES
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/lv
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/lt/LC_MESSAGES
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/lt
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/lb/LC_MESSAGES
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/lb
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/la/LC_MESSAGES
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/la
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/ku/LC_MESSAGES
@@ -1608,6 +1629,8 @@ bin/deluged
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/fy
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/fr/LC_MESSAGES
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/fr
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/fo/LC_MESSAGES
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/fo
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/fi/LC_MESSAGES
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/fi
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/deluge/i18n/fa/LC_MESSAGES