1 files changed, 68 insertions, 73 deletions

diff --git a/deskutils/ontv/pkg-plist b/deskutils/ontv/pkg-plist
index aa542e1c1362..0bbd78b388cf 100644
--- a/deskutils/ontv/pkg-plist
+++ b/deskutils/ontv/pkg-plist
@@ -1,80 +1,60 @@
-%%PYTHON_SITELIBDIR%%/ontv/AboutDialog.py
-%%PYTHON_SITELIBDIR%%/ontv/AboutDialog.pyc
-%%PYTHON_SITELIBDIR%%/ontv/AboutDialog.pyo
-%%PYTHON_SITELIBDIR%%/ontv/Channel.py
-%%PYTHON_SITELIBDIR%%/ontv/Channel.pyc
-%%PYTHON_SITELIBDIR%%/ontv/Channel.pyo
-%%PYTHON_SITELIBDIR%%/ontv/ChannelDialog.py
-%%PYTHON_SITELIBDIR%%/ontv/ChannelDialog.pyc
-%%PYTHON_SITELIBDIR%%/ontv/ChannelDialog.pyo
-%%PYTHON_SITELIBDIR%%/ontv/Configuration.py
-%%PYTHON_SITELIBDIR%%/ontv/Configuration.pyc
-%%PYTHON_SITELIBDIR%%/ontv/Configuration.pyo
-%%PYTHON_SITELIBDIR%%/ontv/GUI.py
-%%PYTHON_SITELIBDIR%%/ontv/GUI.pyc
-%%PYTHON_SITELIBDIR%%/ontv/GUI.pyo
-%%PYTHON_SITELIBDIR%%/ontv/KeyBinder.py
-%%PYTHON_SITELIBDIR%%/ontv/KeyBinder.pyc
-%%PYTHON_SITELIBDIR%%/ontv/KeyBinder.pyo
-%%PYTHON_SITELIBDIR%%/ontv/Listings.py
-%%PYTHON_SITELIBDIR%%/ontv/Listings.pyc
-%%PYTHON_SITELIBDIR%%/ontv/Listings.pyo
-%%PYTHON_SITELIBDIR%%/ontv/Main.py
-%%PYTHON_SITELIBDIR%%/ontv/Main.pyc
-%%PYTHON_SITELIBDIR%%/ontv/Main.pyo
-%%PYTHON_SITELIBDIR%%/ontv/Notification.py
-%%PYTHON_SITELIBDIR%%/ontv/Notification.pyc
-%%PYTHON_SITELIBDIR%%/ontv/Notification.pyo
-%%PYTHON_SITELIBDIR%%/ontv/OnTVApplet.py
-%%PYTHON_SITELIBDIR%%/ontv/OnTVApplet.pyc
-%%PYTHON_SITELIBDIR%%/ontv/OnTVApplet.pyo
-%%PYTHON_SITELIBDIR%%/ontv/PreferencesDialog.py
-%%PYTHON_SITELIBDIR%%/ontv/PreferencesDialog.pyc
-%%PYTHON_SITELIBDIR%%/ontv/PreferencesDialog.pyo
-%%PYTHON_SITELIBDIR%%/ontv/Program.py
-%%PYTHON_SITELIBDIR%%/ontv/Program.pyc
-%%PYTHON_SITELIBDIR%%/ontv/Program.pyo
-%%PYTHON_SITELIBDIR%%/ontv/ProgramDialog.py
-%%PYTHON_SITELIBDIR%%/ontv/ProgramDialog.pyc
-%%PYTHON_SITELIBDIR%%/ontv/ProgramDialog.pyo
-%%PYTHON_SITELIBDIR%%/ontv/ProgramWindow.py
-%%PYTHON_SITELIBDIR%%/ontv/ProgramWindow.pyc
-%%PYTHON_SITELIBDIR%%/ontv/ProgramWindow.pyo
-%%PYTHON_SITELIBDIR%%/ontv/Reminders.py
-%%PYTHON_SITELIBDIR%%/ontv/Reminders.pyc
-%%PYTHON_SITELIBDIR%%/ontv/Reminders.pyo
-%%PYTHON_SITELIBDIR%%/ontv/SearchDialog.py
-%%PYTHON_SITELIBDIR%%/ontv/SearchDialog.pyc
-%%PYTHON_SITELIBDIR%%/ontv/SearchDialog.pyo
-%%PYTHON_SITELIBDIR%%/ontv/TimeSpan.py
-%%PYTHON_SITELIBDIR%%/ontv/TimeSpan.pyc
-%%PYTHON_SITELIBDIR%%/ontv/TimeSpan.pyo
-%%PYTHON_SITELIBDIR%%/ontv/Utils.py
-%%PYTHON_SITELIBDIR%%/ontv/Utils.pyc
-%%PYTHON_SITELIBDIR%%/ontv/Utils.pyo
-%%PYTHON_SITELIBDIR%%/ontv/XMLTVAssistant.py
-%%PYTHON_SITELIBDIR%%/ontv/XMLTVAssistant.pyc
-%%PYTHON_SITELIBDIR%%/ontv/XMLTVAssistant.pyo
-%%PYTHON_SITELIBDIR%%/ontv/XMLTVFile.py
-%%PYTHON_SITELIBDIR%%/ontv/XMLTVFile.pyc
-%%PYTHON_SITELIBDIR%%/ontv/XMLTVFile.pyo
+bin/ontv
+bin/ontv-dbus
 %%PYTHON_SITELIBDIR%%/ontv/__init__.py
 %%PYTHON_SITELIBDIR%%/ontv/__init__.pyc
 %%PYTHON_SITELIBDIR%%/ontv/__init__.pyo
-%%PYTHON_SITELIBDIR%%/ontv/keybinder/__init__.py
-%%PYTHON_SITELIBDIR%%/ontv/keybinder/__init__.pyc
-%%PYTHON_SITELIBDIR%%/ontv/keybinder/__init__.pyo
-%%PYTHON_SITELIBDIR%%/ontv/keybinder/_keybinder.a
-%%PYTHON_SITELIBDIR%%/ontv/keybinder/_keybinder.la
-%%PYTHON_SITELIBDIR%%/ontv/keybinder/_keybinder.so
+%%PYTHON_SITELIBDIR%%/ontv/applet.py
+%%PYTHON_SITELIBDIR%%/ontv/applet.pyc
+%%PYTHON_SITELIBDIR%%/ontv/applet.pyo
+%%PYTHON_SITELIBDIR%%/ontv/assistant.py
+%%PYTHON_SITELIBDIR%%/ontv/assistant.pyc
+%%PYTHON_SITELIBDIR%%/ontv/assistant.pyo
+%%PYTHON_SITELIBDIR%%/ontv/channel.py
+%%PYTHON_SITELIBDIR%%/ontv/channel.pyc
+%%PYTHON_SITELIBDIR%%/ontv/channel.pyo
+%%PYTHON_SITELIBDIR%%/ontv/config.py
+%%PYTHON_SITELIBDIR%%/ontv/config.pyc
+%%PYTHON_SITELIBDIR%%/ontv/config.pyo
+%%PYTHON_SITELIBDIR%%/ontv/dbus_service.py
+%%PYTHON_SITELIBDIR%%/ontv/dbus_service.pyc
+%%PYTHON_SITELIBDIR%%/ontv/dbus_service.pyo
+%%PYTHON_SITELIBDIR%%/ontv/dialogs.py
+%%PYTHON_SITELIBDIR%%/ontv/dialogs.pyc
+%%PYTHON_SITELIBDIR%%/ontv/dialogs.pyo
+%%PYTHON_SITELIBDIR%%/ontv/gui.py
+%%PYTHON_SITELIBDIR%%/ontv/gui.pyc
+%%PYTHON_SITELIBDIR%%/ontv/gui.pyo
+%%PYTHON_SITELIBDIR%%/ontv/listings.py
+%%PYTHON_SITELIBDIR%%/ontv/listings.pyc
+%%PYTHON_SITELIBDIR%%/ontv/listings.pyo
+%%PYTHON_SITELIBDIR%%/ontv/notify.py
+%%PYTHON_SITELIBDIR%%/ontv/notify.pyc
+%%PYTHON_SITELIBDIR%%/ontv/notify.pyo
+%%PYTHON_SITELIBDIR%%/ontv/ontv_core.py
+%%PYTHON_SITELIBDIR%%/ontv/ontv_core.pyc
+%%PYTHON_SITELIBDIR%%/ontv/ontv_core.pyo
+%%PYTHON_SITELIBDIR%%/ontv/program.py
+%%PYTHON_SITELIBDIR%%/ontv/program.pyc
+%%PYTHON_SITELIBDIR%%/ontv/program.pyo
+%%PYTHON_SITELIBDIR%%/ontv/reminders.py
+%%PYTHON_SITELIBDIR%%/ontv/reminders.pyc
+%%PYTHON_SITELIBDIR%%/ontv/reminders.pyo
+%%PYTHON_SITELIBDIR%%/ontv/utils.py
+%%PYTHON_SITELIBDIR%%/ontv/utils.pyc
+%%PYTHON_SITELIBDIR%%/ontv/utils.pyo
+%%PYTHON_SITELIBDIR%%/ontv/window.py
+%%PYTHON_SITELIBDIR%%/ontv/window.pyc
+%%PYTHON_SITELIBDIR%%/ontv/window.pyo
 %%PYTHON_SITELIBDIR%%/ontv/xmltv.py
 %%PYTHON_SITELIBDIR%%/ontv/xmltv.pyc
 %%PYTHON_SITELIBDIR%%/ontv/xmltv.pyo
+%%PYTHON_SITELIBDIR%%/ontv/xmltv_file.py
+%%PYTHON_SITELIBDIR%%/ontv/xmltv_file.pyc
+%%PYTHON_SITELIBDIR%%/ontv/xmltv_file.pyo
 libdata/bonobo/servers/GNOME_OnTVApplet.server
-libexec/ontv
+libexec/ontv-applet
+share/applications/ontv.desktop
 share/gnome-2.0/ui/GNOME_OnTVApplet.xml
-share/ontv/images/ontv-logo-downloading.png
-share/ontv/ontv.glade
 share/icons/hicolor/16x16/apps/ontv.png
 share/icons/hicolor/22x22/apps/ontv.png
 share/icons/hicolor/24x24/apps/ontv.png
@@ -87,25 +67,40 @@ share/locale/ca/LC_MESSAGES/ontv.mo
 share/locale/cs/LC_MESSAGES/ontv.mo
 share/locale/de/LC_MESSAGES/ontv.mo
 share/locale/dz/LC_MESSAGES/ontv.mo
+share/locale/el/LC_MESSAGES/ontv.mo
 share/locale/en_CA/LC_MESSAGES/ontv.mo
 share/locale/en_GB/LC_MESSAGES/ontv.mo
 share/locale/es/LC_MESSAGES/ontv.mo
 share/locale/fi/LC_MESSAGES/ontv.mo
 share/locale/fr/LC_MESSAGES/ontv.mo
+share/locale/gl/LC_MESSAGES/ontv.mo
+share/locale/hu/LC_MESSAGES/ontv.mo
+share/locale/id/LC_MESSAGES/ontv.mo
 share/locale/lv/LC_MESSAGES/ontv.mo
 share/locale/nb/LC_MESSAGES/ontv.mo
 share/locale/nl/LC_MESSAGES/ontv.mo
+share/locale/oc/LC_MESSAGES/ontv.mo
 share/locale/pa/LC_MESSAGES/ontv.mo
 share/locale/pl/LC_MESSAGES/ontv.mo
+share/locale/pt/LC_MESSAGES/ontv.mo
 share/locale/pt_BR/LC_MESSAGES/ontv.mo
 share/locale/sk/LC_MESSAGES/ontv.mo
+share/locale/sl/LC_MESSAGES/ontv.mo
 share/locale/sv/LC_MESSAGES/ontv.mo
 share/locale/uk/LC_MESSAGES/ontv.mo
 share/locale/vi/LC_MESSAGES/ontv.mo
 share/locale/zh_CN/LC_MESSAGES/ontv.mo
-@dirrm share/ontv/images
-@dirrm share/ontv
-@dirrm %%PYTHON_SITELIBDIR%%/ontv/keybinder
-@dirrm %%PYTHON_SITELIBDIR%%/ontv
+%%DATADIR%%/about_dialog.ui
+%%DATADIR%%/channel_dialog.ui
+%%DATADIR%%/images/ontv-logo-downloading.png
+%%DATADIR%%/preferences_dialog.ui
+%%DATADIR%%/program_dialog.ui
+%%DATADIR%%/search_dialog.ui
+%%DATADIR%%/status_icon.ui
+@dirrm %%DATADIR%%/images
+@dirrm %%DATADIR%%
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
+@dirrm %%PYTHON_SITELIBDIR%%/ontv