Update to 0.5.7.1.

10 files changed, 108 insertions, 124 deletions

diff --git a/net-p2p/deluge/Makefile b/net-p2p/deluge/Makefile
index 16f9691..e5d63f6 100644
--- a/net-p2p/deluge/Makefile
+++ b/net-p2p/deluge/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	deluge
-PORTVERSION=	0.5.6.2
+PORTVERSION=	0.5.7.1
 CATEGORIES=	net-p2p python
 MASTER_SITES=	http://download.deluge-torrent.org/tarball/${PORTVERSION}/
 
diff --git a/net-p2p/deluge/distinfo b/net-p2p/deluge/distinfo
index 8481ef0..7417d81 100644
--- a/net-p2p/deluge/distinfo
+++ b/net-p2p/deluge/distinfo
@@ -1,3 +1,3 @@
-MD5 (deluge-0.5.6.2.tar.gz) = 618d3ed32f74a58476d9f9c385aebe12
-SHA256 (deluge-0.5.6.2.tar.gz) = 8d33c229457138b82900e584f00d522c924359fdeaef024f8ef7ee286be2fb47
-SIZE (deluge-0.5.6.2.tar.gz) = 1931262
+MD5 (deluge-0.5.7.1.tar.gz) = 375d82f18953ddfd26229b76e63dc3cb
+SHA256 (deluge-0.5.7.1.tar.gz) = 8c0a220e1ecd5fc0a0806e4c2fefc39953a61200f575e7743b2ad98acf21597e
+SIZE (deluge-0.5.7.1.tar.gz) = 2070701
diff --git a/net-p2p/deluge/files/patch-setup.py b/net-p2p/deluge/files/patch-setup.py
index 77c5801..03432f1 100644
--- a/net-p2p/deluge/files/patch-setup.py
+++ b/net-p2p/deluge/files/patch-setup.py
@@ -1,5 +1,5 @@
---- setup.py.orig	2007-10-25 16:49:47.000000000 -0500
-+++ setup.py	2007-10-25 16:51:47.000000000 -0500
+--- setup.py.orig	2007-11-28 11:49:38.000000000 -0600
++++ setup.py	2007-11-28 11:53:44.000000000 -0600
 @@ -103,13 +103,13 @@
                  "-DHAVE_INCLUDE_LIBTORRENT_ASIO_SSL_STREAM_HPP=1", 
                  "-DHAVE_INCLUDE_LIBTORRENT_ASIO_IP_TCP_HPP=1", 
@@ -15,22 +15,17 @@
 +                     '%%LOCALBASE%%/include']
  
      if OS == "linux":
-         if os.WEXITSTATUS(os.system('grep -iq "Debian GNU/Linux 4.0\|Ubuntu 7.04\|Ubuntu 6.06\|Ubuntu 6.10\|Fedora Core release 6\|openSUSE 10.2\|Mandriva Linux release 2007.1\|Fedora release 7\|BLAG release 60001\|Yellow Dog Linux release 5.0 (Phoenix)\|CentOS release 5 (Final)" /etc/issue')) == 0:
-@@ -164,11 +164,11 @@
- if not OS == "win":
-     if boosttype == "nomt":
-         librariestype = ['boost_filesystem', 'boost_date_time',
--            'boost_thread', 'z', 'pthread', 'ssl']
-+            'boost_thread', 'z', 'ssl']
-         print 'Libraries nomt' 
-     elif boosttype == "mt":
-         librariestype = ['boost_filesystem-mt', 'boost_date_time-mt',
--            'boost_thread-mt', 'z', 'pthread', 'ssl']
-+            'boost_thread-mt', 'z', 'ssl']
-         print 'Libraries mt'
- else:
-         librariestype = ['boost_filesystem-mt', 'boost_date_time-mt',
-@@ -189,8 +189,10 @@
+         if os.path.exists(os.path.join(sysconfig.get_config_vars()['LIBDIR'], \
+@@ -148,7 +148,7 @@
+         boost_thread = "boost_thread-mt"
+ 
+     librariestype = [boost_filesystem, boost_date_time,
+-            boost_thread, 'z', 'pthread', 'ssl']
++            boost_thread, 'z', 'ssl']
+     
+     removals = ['-g', '-Wstrict-prototypes']
+ 
+@@ -198,8 +198,10 @@
      sources.remove('libtorrent/src/file_win.cpp')
      deluge_core = Extension('deluge_core',
                      include_dirs = includedirs,
diff --git a/net-p2p/deluge/files/patch-src___init__.py b/net-p2p/deluge/files/patch-src___init__.py
deleted file mode 100644
index 0929c71..0000000
--- a/net-p2p/deluge/files/patch-src___init__.py
+++ /dev/null
@@ -1,27 +0,0 @@
---- src/__init__.py.orig	2007-10-30 00:15:34.000000000 -0500
-+++ src/__init__.py	2007-10-30 00:16:07.000000000 -0500
-@@ -37,15 +37,15 @@
- 
- APP = 'deluge'
- DIR = os.path.join(common.INSTALL_PREFIX, 'share', 'locale')
--if not common.windows_check(): 
--    locale.setlocale(locale.LC_MESSAGES, '')
--    locale.bindtextdomain(APP, DIR)
--    locale.textdomain(APP)
--else:
--    import gtk.glade
--    locale.setlocale(locale.LC_ALL, '')
--    gtk.glade.bindtextdomain(APP,DIR)
--    gtk.glade.textdomain(APP)
-+#if not common.windows_check(): 
-+#    locale.setlocale(locale.LC_MESSAGES, '')
-+#    locale.bindtextdomain(APP, DIR)
-+#    locale.textdomain(APP)
-+#else:
-+#    import gtk.glade
-+#    locale.setlocale(locale.LC_ALL, '')
-+#    gtk.glade.bindtextdomain(APP,DIR)
-+#    gtk.glade.textdomain(APP)
- gettext.bindtextdomain(APP, DIR)
- gettext.textdomain(APP)
- gettext.install(APP, DIR)
diff --git a/net-p2p/deluge/pkg-plist b/net-p2p/deluge/pkg-plist
index b6fe40e..d2a3b7b 100644
--- a/net-p2p/deluge/pkg-plist
+++ b/net-p2p/deluge/pkg-plist
@@ -571,8 +571,13 @@ share/applications/deluge.desktop
 %%DATADIR%%/plugins/EventLogging/tab_log.py
 %%DATADIR%%/plugins/ExtraStats/__init__.py
 %%DATADIR%%/plugins/ExtraStats/stats_preferences.glade
-%%DATADIR%%/plugins/Locations/__init__.py
-%%DATADIR%%/plugins/Locations/plugin.py
+%%DATADIR%%/plugins/FlexRSS/CalendarButton.py
+%%DATADIR%%/plugins/FlexRSS/FlexRSS.glade
+%%DATADIR%%/plugins/FlexRSS/FlexRSS.png
+%%DATADIR%%/plugins/FlexRSS/FlexRSS.svg
+%%DATADIR%%/plugins/FlexRSS/__init__.py
+%%DATADIR%%/plugins/FlexRSS/feedparser.py
+%%DATADIR%%/plugins/FlexRSS/plugin.py
 %%DATADIR%%/plugins/MoveTorrent/__init__.py
 %%DATADIR%%/plugins/MoveTorrent/movetorrent.glade
 %%DATADIR%%/plugins/NetworkGraph/__init__.py
@@ -582,11 +587,6 @@ share/applications/deluge.desktop
 %%DATADIR%%/plugins/NetworkHealth/plugin.py
 %%DATADIR%%/plugins/Scheduler/__init__.py
 %%DATADIR%%/plugins/Scheduler/plugin.py
-%%DATADIR%%/plugins/SimpleRSS/__init__.py
-%%DATADIR%%/plugins/SimpleRSS/feedparser.py
-%%DATADIR%%/plugins/SimpleRSS/plugin.py
-%%DATADIR%%/plugins/SimpleRSS/rss.glade
-%%DATADIR%%/plugins/SimpleRSS/rss.png
 %%DATADIR%%/plugins/SpeedLimiter/__init__.py
 %%DATADIR%%/plugins/TorrentCreator/__init__.py
 %%DATADIR%%/plugins/TorrentCreator/torrentcreator.glade
@@ -604,6 +604,7 @@ share/applications/deluge.desktop
 %%DATADIR%%/plugins/WebSeed/__init__.py
 %%DATADIR%%/plugins/WebSeed/webseed.glade
 %%DATADIR%%/plugins/WebUi/LICENSE
+%%DATADIR%%/plugins/WebUi/TODO
 %%DATADIR%%/plugins/WebUi/__init__.py
 %%DATADIR%%/plugins/WebUi/dbus_interface.py
 %%DATADIR%%/plugins/WebUi/dbus_pythonize.py
@@ -618,6 +619,8 @@ share/applications/deluge.desktop
 %%DATADIR%%/plugins/WebUi/scripts/curl-example
 %%DATADIR%%/plugins/WebUi/scripts/extract_template_strings.py
 %%DATADIR%%/plugins/WebUi/scripts/template_strings.py
+%%DATADIR%%/plugins/WebUi/ssl/deluge.key
+%%DATADIR%%/plugins/WebUi/ssl/deluge.pem
 %%DATADIR%%/plugins/WebUi/static/images/deluge_icon.gif
 %%DATADIR%%/plugins/WebUi/static/images/downloading16.png
 %%DATADIR%%/plugins/WebUi/static/images/inactive16.png
@@ -625,19 +628,34 @@ share/applications/deluge.desktop
 %%DATADIR%%/plugins/WebUi/static/images/simple_bg.jpg
 %%DATADIR%%/plugins/WebUi/static/images/simple_line.jpg
 %%DATADIR%%/plugins/WebUi/static/images/simple_logo.jpg
+%%DATADIR%%/plugins/WebUi/static/images/tango/details.png
 %%DATADIR%%/plugins/WebUi/static/images/tango/down.png
 %%DATADIR%%/plugins/WebUi/static/images/tango/list-add.png
 %%DATADIR%%/plugins/WebUi/static/images/tango/list-remove.png
 %%DATADIR%%/plugins/WebUi/static/images/tango/media-playback-pause.png
 %%DATADIR%%/plugins/WebUi/static/images/tango/media-playback-start.png
+%%DATADIR%%/plugins/WebUi/static/images/tango/pause.png
 %%DATADIR%%/plugins/WebUi/static/images/tango/preferences-system.png
 %%DATADIR%%/plugins/WebUi/static/images/tango/process-stop.png
+%%DATADIR%%/plugins/WebUi/static/images/tango/queue-down.png
+%%DATADIR%%/plugins/WebUi/static/images/tango/queue-up.png
+%%DATADIR%%/plugins/WebUi/static/images/tango/start.png
+%%DATADIR%%/plugins/WebUi/static/images/tango/stop.png
 %%DATADIR%%/plugins/WebUi/static/images/tango/system-log-out.png
 %%DATADIR%%/plugins/WebUi/static/images/tango/up.png
 %%DATADIR%%/plugins/WebUi/static/images/tango/user-trash.png
 %%DATADIR%%/plugins/WebUi/static/images/tango/view-refresh.png
 %%DATADIR%%/plugins/WebUi/static/simple_site_style.css
 %%DATADIR%%/plugins/WebUi/static_handler.py
+%%DATADIR%%/plugins/WebUi/templates/advanced/header.html
+%%DATADIR%%/plugins/WebUi/templates/advanced/index.html
+%%DATADIR%%/plugins/WebUi/templates/advanced/part_categories.html
+%%DATADIR%%/plugins/WebUi/templates/advanced/part_stats.html
+%%DATADIR%%/plugins/WebUi/templates/advanced/part_tb_button.html
+%%DATADIR%%/plugins/WebUi/templates/advanced/static/advanced.css
+%%DATADIR%%/plugins/WebUi/templates/advanced/static/deluge.js
+%%DATADIR%%/plugins/WebUi/templates/advanced/static/scrolling_table.css
+%%DATADIR%%/plugins/WebUi/templates/advanced/torrent_info_inner.html
 %%DATADIR%%/plugins/WebUi/templates/deluge/about.html
 %%DATADIR%%/plugins/WebUi/templates/deluge/authors.txt
 %%DATADIR%%/plugins/WebUi/templates/deluge/config.html
@@ -651,13 +669,12 @@ share/applications/deluge.desktop
 %%DATADIR%%/plugins/WebUi/templates/deluge/part_stats.html
 %%DATADIR%%/plugins/WebUi/templates/deluge/refresh_form.html
 %%DATADIR%%/plugins/WebUi/templates/deluge/sort_column_head.html
+%%DATADIR%%/plugins/WebUi/templates/deluge/tab_meta.html
 %%DATADIR%%/plugins/WebUi/templates/deluge/torrent_add.html
 %%DATADIR%%/plugins/WebUi/templates/deluge/torrent_delete.html
 %%DATADIR%%/plugins/WebUi/templates/deluge/torrent_info.html
-%%DATADIR%%/plugins/WebUi/templates/example/footer.html
-%%DATADIR%%/plugins/WebUi/templates/example/header.html
-%%DATADIR%%/plugins/WebUi/templates/example/index.html
 %%DATADIR%%/plugins/WebUi/templates/hacking-templates.txt
+%%DATADIR%%/plugins/WebUi/tests/test_all.py
 %%DATADIR%%/plugins/WebUi/version
 %%DATADIR%%/plugins/WebUi/webpy022/Dependency-not-really part of webui.txt
 %%DATADIR%%/plugins/WebUi/webpy022/__init__.py
@@ -694,6 +711,7 @@ share/icons/hicolor/96x96/apps/deluge.png
 share/locale/ar/LC_MESSAGES/deluge.mo
 share/locale/ast/LC_MESSAGES/deluge.mo
 share/locale/bg/LC_MESSAGES/deluge.mo
+share/locale/bs/LC_MESSAGES/deluge.mo
 share/locale/ca/LC_MESSAGES/deluge.mo
 share/locale/cs/LC_MESSAGES/deluge.mo
 share/locale/da/LC_MESSAGES/deluge.mo
@@ -710,6 +728,7 @@ share/locale/fi/LC_MESSAGES/deluge.mo
 share/locale/fr/LC_MESSAGES/deluge.mo
 share/locale/gl/LC_MESSAGES/deluge.mo
 share/locale/he/LC_MESSAGES/deluge.mo
+share/locale/hi/LC_MESSAGES/deluge.mo
 share/locale/hr/LC_MESSAGES/deluge.mo
 share/locale/hu/LC_MESSAGES/deluge.mo
 share/locale/id/LC_MESSAGES/deluge.mo
@@ -725,6 +744,7 @@ share/locale/lv/LC_MESSAGES/deluge.mo
 share/locale/mk/LC_MESSAGES/deluge.mo
 share/locale/ms/LC_MESSAGES/deluge.mo
 share/locale/nb/LC_MESSAGES/deluge.mo
+share/locale/nds/LC_MESSAGES/deluge.mo
 share/locale/nl/LC_MESSAGES/deluge.mo
 share/locale/pl/LC_MESSAGES/deluge.mo
 share/locale/pt/LC_MESSAGES/deluge.mo
@@ -748,6 +768,8 @@ share/pixmaps/deluge.png
 @dirrmtry share/locale/tlh
 @dirrmtry share/locale/si/LC_MESSAGES
 @dirrmtry share/locale/si
+@dirrmtry share/locale/nds/LC_MESSAGES
+@dirrmtry share/locale/nds
 @dirrmtry share/locale/la/LC_MESSAGES
 @dirrmtry share/locale/la
 @dirrmtry share/locale/ku/LC_MESSAGES
@@ -759,13 +781,16 @@ share/pixmaps/deluge.png
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%DATADIR%%/plugins/WebUi/webpy022/wsgiserver
 @dirrm %%DATADIR%%/plugins/WebUi/webpy022
-@dirrm %%DATADIR%%/plugins/WebUi/templates/example
+@dirrm %%DATADIR%%/plugins/WebUi/tests
 @dirrm %%DATADIR%%/plugins/WebUi/templates/deluge
+@dirrm %%DATADIR%%/plugins/WebUi/templates/advanced/static
+@dirrm %%DATADIR%%/plugins/WebUi/templates/advanced
 @dirrm %%DATADIR%%/plugins/WebUi/templates
 @dirrm %%DATADIR%%/plugins/WebUi/static/xul
 @dirrm %%DATADIR%%/plugins/WebUi/static/images/tango
 @dirrm %%DATADIR%%/plugins/WebUi/static/images
 @dirrm %%DATADIR%%/plugins/WebUi/static
+@dirrm %%DATADIR%%/plugins/WebUi/ssl
 @dirrm %%DATADIR%%/plugins/WebUi/scripts
 @dirrm %%DATADIR%%/plugins/WebUi
 @dirrm %%DATADIR%%/plugins/WebSeed
@@ -775,12 +800,11 @@ share/pixmaps/deluge.png
 @dirrm %%DATADIR%%/plugins/TorrentFiles
 @dirrm %%DATADIR%%/plugins/TorrentCreator
 @dirrm %%DATADIR%%/plugins/SpeedLimiter
-@dirrm %%DATADIR%%/plugins/SimpleRSS
 @dirrm %%DATADIR%%/plugins/Scheduler
 @dirrm %%DATADIR%%/plugins/NetworkHealth
 @dirrm %%DATADIR%%/plugins/NetworkGraph
 @dirrm %%DATADIR%%/plugins/MoveTorrent
-@dirrm %%DATADIR%%/plugins/Locations
+@dirrm %%DATADIR%%/plugins/FlexRSS
 @dirrm %%DATADIR%%/plugins/ExtraStats
 @dirrm %%DATADIR%%/plugins/EventLogging
 @dirrm %%DATADIR%%/plugins/DesiredRatio
diff --git a/net-p2p/deluge05/Makefile b/net-p2p/deluge05/Makefile
index 16f9691..e5d63f6 100644
--- a/net-p2p/deluge05/Makefile
+++ b/net-p2p/deluge05/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	deluge
-PORTVERSION=	0.5.6.2
+PORTVERSION=	0.5.7.1
 CATEGORIES=	net-p2p python
 MASTER_SITES=	http://download.deluge-torrent.org/tarball/${PORTVERSION}/
 
diff --git a/net-p2p/deluge05/distinfo b/net-p2p/deluge05/distinfo
index 8481ef0..7417d81 100644
--- a/net-p2p/deluge05/distinfo
+++ b/net-p2p/deluge05/distinfo
@@ -1,3 +1,3 @@
-MD5 (deluge-0.5.6.2.tar.gz) = 618d3ed32f74a58476d9f9c385aebe12
-SHA256 (deluge-0.5.6.2.tar.gz) = 8d33c229457138b82900e584f00d522c924359fdeaef024f8ef7ee286be2fb47
-SIZE (deluge-0.5.6.2.tar.gz) = 1931262
+MD5 (deluge-0.5.7.1.tar.gz) = 375d82f18953ddfd26229b76e63dc3cb
+SHA256 (deluge-0.5.7.1.tar.gz) = 8c0a220e1ecd5fc0a0806e4c2fefc39953a61200f575e7743b2ad98acf21597e
+SIZE (deluge-0.5.7.1.tar.gz) = 2070701
diff --git a/net-p2p/deluge05/files/patch-setup.py b/net-p2p/deluge05/files/patch-setup.py
index 77c5801..03432f1 100644
--- a/net-p2p/deluge05/files/patch-setup.py
+++ b/net-p2p/deluge05/files/patch-setup.py
@@ -1,5 +1,5 @@
---- setup.py.orig	2007-10-25 16:49:47.000000000 -0500
-+++ setup.py	2007-10-25 16:51:47.000000000 -0500
+--- setup.py.orig	2007-11-28 11:49:38.000000000 -0600
++++ setup.py	2007-11-28 11:53:44.000000000 -0600
 @@ -103,13 +103,13 @@
                  "-DHAVE_INCLUDE_LIBTORRENT_ASIO_SSL_STREAM_HPP=1", 
                  "-DHAVE_INCLUDE_LIBTORRENT_ASIO_IP_TCP_HPP=1", 
@@ -15,22 +15,17 @@
 +                     '%%LOCALBASE%%/include']
  
      if OS == "linux":
-         if os.WEXITSTATUS(os.system('grep -iq "Debian GNU/Linux 4.0\|Ubuntu 7.04\|Ubuntu 6.06\|Ubuntu 6.10\|Fedora Core release 6\|openSUSE 10.2\|Mandriva Linux release 2007.1\|Fedora release 7\|BLAG release 60001\|Yellow Dog Linux release 5.0 (Phoenix)\|CentOS release 5 (Final)" /etc/issue')) == 0:
-@@ -164,11 +164,11 @@
- if not OS == "win":
-     if boosttype == "nomt":
-         librariestype = ['boost_filesystem', 'boost_date_time',
--            'boost_thread', 'z', 'pthread', 'ssl']
-+            'boost_thread', 'z', 'ssl']
-         print 'Libraries nomt' 
-     elif boosttype == "mt":
-         librariestype = ['boost_filesystem-mt', 'boost_date_time-mt',
--            'boost_thread-mt', 'z', 'pthread', 'ssl']
-+            'boost_thread-mt', 'z', 'ssl']
-         print 'Libraries mt'
- else:
-         librariestype = ['boost_filesystem-mt', 'boost_date_time-mt',
-@@ -189,8 +189,10 @@
+         if os.path.exists(os.path.join(sysconfig.get_config_vars()['LIBDIR'], \
+@@ -148,7 +148,7 @@
+         boost_thread = "boost_thread-mt"
+ 
+     librariestype = [boost_filesystem, boost_date_time,
+-            boost_thread, 'z', 'pthread', 'ssl']
++            boost_thread, 'z', 'ssl']
+     
+     removals = ['-g', '-Wstrict-prototypes']
+ 
+@@ -198,8 +198,10 @@
      sources.remove('libtorrent/src/file_win.cpp')
      deluge_core = Extension('deluge_core',
                      include_dirs = includedirs,
diff --git a/net-p2p/deluge05/files/patch-src___init__.py b/net-p2p/deluge05/files/patch-src___init__.py
deleted file mode 100644
index 0929c71..0000000
--- a/net-p2p/deluge05/files/patch-src___init__.py
+++ /dev/null
@@ -1,27 +0,0 @@
---- src/__init__.py.orig	2007-10-30 00:15:34.000000000 -0500
-+++ src/__init__.py	2007-10-30 00:16:07.000000000 -0500
-@@ -37,15 +37,15 @@
- 
- APP = 'deluge'
- DIR = os.path.join(common.INSTALL_PREFIX, 'share', 'locale')
--if not common.windows_check(): 
--    locale.setlocale(locale.LC_MESSAGES, '')
--    locale.bindtextdomain(APP, DIR)
--    locale.textdomain(APP)
--else:
--    import gtk.glade
--    locale.setlocale(locale.LC_ALL, '')
--    gtk.glade.bindtextdomain(APP,DIR)
--    gtk.glade.textdomain(APP)
-+#if not common.windows_check(): 
-+#    locale.setlocale(locale.LC_MESSAGES, '')
-+#    locale.bindtextdomain(APP, DIR)
-+#    locale.textdomain(APP)
-+#else:
-+#    import gtk.glade
-+#    locale.setlocale(locale.LC_ALL, '')
-+#    gtk.glade.bindtextdomain(APP,DIR)
-+#    gtk.glade.textdomain(APP)
- gettext.bindtextdomain(APP, DIR)
- gettext.textdomain(APP)
- gettext.install(APP, DIR)
diff --git a/net-p2p/deluge05/pkg-plist b/net-p2p/deluge05/pkg-plist
index b6fe40e..d2a3b7b 100644
--- a/net-p2p/deluge05/pkg-plist
+++ b/net-p2p/deluge05/pkg-plist
@@ -571,8 +571,13 @@ share/applications/deluge.desktop
 %%DATADIR%%/plugins/EventLogging/tab_log.py
 %%DATADIR%%/plugins/ExtraStats/__init__.py
 %%DATADIR%%/plugins/ExtraStats/stats_preferences.glade
-%%DATADIR%%/plugins/Locations/__init__.py
-%%DATADIR%%/plugins/Locations/plugin.py
+%%DATADIR%%/plugins/FlexRSS/CalendarButton.py
+%%DATADIR%%/plugins/FlexRSS/FlexRSS.glade
+%%DATADIR%%/plugins/FlexRSS/FlexRSS.png
+%%DATADIR%%/plugins/FlexRSS/FlexRSS.svg
+%%DATADIR%%/plugins/FlexRSS/__init__.py
+%%DATADIR%%/plugins/FlexRSS/feedparser.py
+%%DATADIR%%/plugins/FlexRSS/plugin.py
 %%DATADIR%%/plugins/MoveTorrent/__init__.py
 %%DATADIR%%/plugins/MoveTorrent/movetorrent.glade
 %%DATADIR%%/plugins/NetworkGraph/__init__.py
@@ -582,11 +587,6 @@ share/applications/deluge.desktop
 %%DATADIR%%/plugins/NetworkHealth/plugin.py
 %%DATADIR%%/plugins/Scheduler/__init__.py
 %%DATADIR%%/plugins/Scheduler/plugin.py
-%%DATADIR%%/plugins/SimpleRSS/__init__.py
-%%DATADIR%%/plugins/SimpleRSS/feedparser.py
-%%DATADIR%%/plugins/SimpleRSS/plugin.py
-%%DATADIR%%/plugins/SimpleRSS/rss.glade
-%%DATADIR%%/plugins/SimpleRSS/rss.png
 %%DATADIR%%/plugins/SpeedLimiter/__init__.py
 %%DATADIR%%/plugins/TorrentCreator/__init__.py
 %%DATADIR%%/plugins/TorrentCreator/torrentcreator.glade
@@ -604,6 +604,7 @@ share/applications/deluge.desktop
 %%DATADIR%%/plugins/WebSeed/__init__.py
 %%DATADIR%%/plugins/WebSeed/webseed.glade
 %%DATADIR%%/plugins/WebUi/LICENSE
+%%DATADIR%%/plugins/WebUi/TODO
 %%DATADIR%%/plugins/WebUi/__init__.py
 %%DATADIR%%/plugins/WebUi/dbus_interface.py
 %%DATADIR%%/plugins/WebUi/dbus_pythonize.py
@@ -618,6 +619,8 @@ share/applications/deluge.desktop
 %%DATADIR%%/plugins/WebUi/scripts/curl-example
 %%DATADIR%%/plugins/WebUi/scripts/extract_template_strings.py
 %%DATADIR%%/plugins/WebUi/scripts/template_strings.py
+%%DATADIR%%/plugins/WebUi/ssl/deluge.key
+%%DATADIR%%/plugins/WebUi/ssl/deluge.pem
 %%DATADIR%%/plugins/WebUi/static/images/deluge_icon.gif
 %%DATADIR%%/plugins/WebUi/static/images/downloading16.png
 %%DATADIR%%/plugins/WebUi/static/images/inactive16.png
@@ -625,19 +628,34 @@ share/applications/deluge.desktop
 %%DATADIR%%/plugins/WebUi/static/images/simple_bg.jpg
 %%DATADIR%%/plugins/WebUi/static/images/simple_line.jpg
 %%DATADIR%%/plugins/WebUi/static/images/simple_logo.jpg
+%%DATADIR%%/plugins/WebUi/static/images/tango/details.png
 %%DATADIR%%/plugins/WebUi/static/images/tango/down.png
 %%DATADIR%%/plugins/WebUi/static/images/tango/list-add.png
 %%DATADIR%%/plugins/WebUi/static/images/tango/list-remove.png
 %%DATADIR%%/plugins/WebUi/static/images/tango/media-playback-pause.png
 %%DATADIR%%/plugins/WebUi/static/images/tango/media-playback-start.png
+%%DATADIR%%/plugins/WebUi/static/images/tango/pause.png
 %%DATADIR%%/plugins/WebUi/static/images/tango/preferences-system.png
 %%DATADIR%%/plugins/WebUi/static/images/tango/process-stop.png
+%%DATADIR%%/plugins/WebUi/static/images/tango/queue-down.png
+%%DATADIR%%/plugins/WebUi/static/images/tango/queue-up.png
+%%DATADIR%%/plugins/WebUi/static/images/tango/start.png
+%%DATADIR%%/plugins/WebUi/static/images/tango/stop.png
 %%DATADIR%%/plugins/WebUi/static/images/tango/system-log-out.png
 %%DATADIR%%/plugins/WebUi/static/images/tango/up.png
 %%DATADIR%%/plugins/WebUi/static/images/tango/user-trash.png
 %%DATADIR%%/plugins/WebUi/static/images/tango/view-refresh.png
 %%DATADIR%%/plugins/WebUi/static/simple_site_style.css
 %%DATADIR%%/plugins/WebUi/static_handler.py
+%%DATADIR%%/plugins/WebUi/templates/advanced/header.html
+%%DATADIR%%/plugins/WebUi/templates/advanced/index.html
+%%DATADIR%%/plugins/WebUi/templates/advanced/part_categories.html
+%%DATADIR%%/plugins/WebUi/templates/advanced/part_stats.html
+%%DATADIR%%/plugins/WebUi/templates/advanced/part_tb_button.html
+%%DATADIR%%/plugins/WebUi/templates/advanced/static/advanced.css
+%%DATADIR%%/plugins/WebUi/templates/advanced/static/deluge.js
+%%DATADIR%%/plugins/WebUi/templates/advanced/static/scrolling_table.css
+%%DATADIR%%/plugins/WebUi/templates/advanced/torrent_info_inner.html
 %%DATADIR%%/plugins/WebUi/templates/deluge/about.html
 %%DATADIR%%/plugins/WebUi/templates/deluge/authors.txt
 %%DATADIR%%/plugins/WebUi/templates/deluge/config.html
@@ -651,13 +669,12 @@ share/applications/deluge.desktop
 %%DATADIR%%/plugins/WebUi/templates/deluge/part_stats.html
 %%DATADIR%%/plugins/WebUi/templates/deluge/refresh_form.html
 %%DATADIR%%/plugins/WebUi/templates/deluge/sort_column_head.html
+%%DATADIR%%/plugins/WebUi/templates/deluge/tab_meta.html
 %%DATADIR%%/plugins/WebUi/templates/deluge/torrent_add.html
 %%DATADIR%%/plugins/WebUi/templates/deluge/torrent_delete.html
 %%DATADIR%%/plugins/WebUi/templates/deluge/torrent_info.html
-%%DATADIR%%/plugins/WebUi/templates/example/footer.html
-%%DATADIR%%/plugins/WebUi/templates/example/header.html
-%%DATADIR%%/plugins/WebUi/templates/example/index.html
 %%DATADIR%%/plugins/WebUi/templates/hacking-templates.txt
+%%DATADIR%%/plugins/WebUi/tests/test_all.py
 %%DATADIR%%/plugins/WebUi/version
 %%DATADIR%%/plugins/WebUi/webpy022/Dependency-not-really part of webui.txt
 %%DATADIR%%/plugins/WebUi/webpy022/__init__.py
@@ -694,6 +711,7 @@ share/icons/hicolor/96x96/apps/deluge.png
 share/locale/ar/LC_MESSAGES/deluge.mo
 share/locale/ast/LC_MESSAGES/deluge.mo
 share/locale/bg/LC_MESSAGES/deluge.mo
+share/locale/bs/LC_MESSAGES/deluge.mo
 share/locale/ca/LC_MESSAGES/deluge.mo
 share/locale/cs/LC_MESSAGES/deluge.mo
 share/locale/da/LC_MESSAGES/deluge.mo
@@ -710,6 +728,7 @@ share/locale/fi/LC_MESSAGES/deluge.mo
 share/locale/fr/LC_MESSAGES/deluge.mo
 share/locale/gl/LC_MESSAGES/deluge.mo
 share/locale/he/LC_MESSAGES/deluge.mo
+share/locale/hi/LC_MESSAGES/deluge.mo
 share/locale/hr/LC_MESSAGES/deluge.mo
 share/locale/hu/LC_MESSAGES/deluge.mo
 share/locale/id/LC_MESSAGES/deluge.mo
@@ -725,6 +744,7 @@ share/locale/lv/LC_MESSAGES/deluge.mo
 share/locale/mk/LC_MESSAGES/deluge.mo
 share/locale/ms/LC_MESSAGES/deluge.mo
 share/locale/nb/LC_MESSAGES/deluge.mo
+share/locale/nds/LC_MESSAGES/deluge.mo
 share/locale/nl/LC_MESSAGES/deluge.mo
 share/locale/pl/LC_MESSAGES/deluge.mo
 share/locale/pt/LC_MESSAGES/deluge.mo
@@ -748,6 +768,8 @@ share/pixmaps/deluge.png
 @dirrmtry share/locale/tlh
 @dirrmtry share/locale/si/LC_MESSAGES
 @dirrmtry share/locale/si
+@dirrmtry share/locale/nds/LC_MESSAGES
+@dirrmtry share/locale/nds
 @dirrmtry share/locale/la/LC_MESSAGES
 @dirrmtry share/locale/la
 @dirrmtry share/locale/ku/LC_MESSAGES
@@ -759,13 +781,16 @@ share/pixmaps/deluge.png
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%DATADIR%%/plugins/WebUi/webpy022/wsgiserver
 @dirrm %%DATADIR%%/plugins/WebUi/webpy022
-@dirrm %%DATADIR%%/plugins/WebUi/templates/example
+@dirrm %%DATADIR%%/plugins/WebUi/tests
 @dirrm %%DATADIR%%/plugins/WebUi/templates/deluge
+@dirrm %%DATADIR%%/plugins/WebUi/templates/advanced/static
+@dirrm %%DATADIR%%/plugins/WebUi/templates/advanced
 @dirrm %%DATADIR%%/plugins/WebUi/templates
 @dirrm %%DATADIR%%/plugins/WebUi/static/xul
 @dirrm %%DATADIR%%/plugins/WebUi/static/images/tango
 @dirrm %%DATADIR%%/plugins/WebUi/static/images
 @dirrm %%DATADIR%%/plugins/WebUi/static
+@dirrm %%DATADIR%%/plugins/WebUi/ssl
 @dirrm %%DATADIR%%/plugins/WebUi/scripts
 @dirrm %%DATADIR%%/plugins/WebUi
 @dirrm %%DATADIR%%/plugins/WebSeed
@@ -775,12 +800,11 @@ share/pixmaps/deluge.png
 @dirrm %%DATADIR%%/plugins/TorrentFiles
 @dirrm %%DATADIR%%/plugins/TorrentCreator
 @dirrm %%DATADIR%%/plugins/SpeedLimiter
-@dirrm %%DATADIR%%/plugins/SimpleRSS
 @dirrm %%DATADIR%%/plugins/Scheduler
 @dirrm %%DATADIR%%/plugins/NetworkHealth
 @dirrm %%DATADIR%%/plugins/NetworkGraph
 @dirrm %%DATADIR%%/plugins/MoveTorrent
-@dirrm %%DATADIR%%/plugins/Locations
+@dirrm %%DATADIR%%/plugins/FlexRSS
 @dirrm %%DATADIR%%/plugins/ExtraStats
 @dirrm %%DATADIR%%/plugins/EventLogging
 @dirrm %%DATADIR%%/plugins/DesiredRatio