Merge branch 'master' of git.opendreambox.org:/git/enigma2

diff --git a/Makefile.am b/Makefile.am
old mode 100644 (file)
new mode 100755 (executable)
index 0ba310f..c517d9c
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,8 +11,8 @@ LANGS := $(shell cat $(srcdir)/po/LINGUAS)
 
 install-exec-hook:
        for lang in $(LANGS); do \
-               $(PYTHON) $(srcdir)/tools/genmetaindex.py $$lang $(DESTDIR)$(pkgdatadir)/meta/enigma2/plugin_*.xml > $(DESTDIR)$(pkgdatadir)/meta/enigma2/index_$$lang.xml; \
+               $(PYTHON) $(srcdir)/tools/genmetaindex.py $$lang $(DESTDIR)$(datadir)/meta/plugin_*.xml > $(DESTDIR)$(datadir)/meta/index-enigma2_$$lang.xml; \
        done
 
 uninstall-hook:
-       $(RM) $(DESTDIR)$(pkgdatadir)/meta/enigma2/index_*.xml
+       $(RM) $(DESTDIR)$(datadir)/meta/index-enigma2_*.xml

diff --git a/lib/python/Plugins/Extensions/CutListEditor/meta/Makefile.am b/lib/python/Plugins/Extensions/CutListEditor/meta/Makefile.am
index e5838781259d6e77213477fd2fc3b50f61686136..ee18898d96302530e98b2133aa868c074c21696f 100755 (executable)
--- a/lib/python/Plugins/Extensions/CutListEditor/meta/Makefile.am
+++ b/lib/python/Plugins/Extensions/CutListEditor/meta/Makefile.am
@@ -1,4 +1,4 @@
-installdir = $(pkgdatadir)/meta/enigma2/
+installdir = $(datadir)/meta/
 
 dist_install_DATA = plugin_cutlisteditor.xml
 

diff --git a/lib/python/Plugins/Extensions/DVDBurn/meta/Makefile.am b/lib/python/Plugins/Extensions/DVDBurn/meta/Makefile.am
old mode 100644 (file)
new mode 100755 (executable)
index a6f0a43..1899cb7
--- a/lib/python/Plugins/Extensions/DVDBurn/meta/Makefile.am
+++ b/lib/python/Plugins/Extensions/DVDBurn/meta/Makefile.am
@@ -1,3 +1,3 @@
-installdir = $(pkgdatadir)/meta/enigma2/
+installdir = $(datadir)/meta/
 
 dist_install_DATA = plugin_dvdburn.xml

diff --git a/lib/python/Plugins/Extensions/DVDPlayer/meta/Makefile.am b/lib/python/Plugins/Extensions/DVDPlayer/meta/Makefile.am
index a5b8047ea038c1bfc67254073265b32570c6209b..12d13710a4714a3eced21e7aee0cc9fe241df922 100755 (executable)
--- a/lib/python/Plugins/Extensions/DVDPlayer/meta/Makefile.am
+++ b/lib/python/Plugins/Extensions/DVDPlayer/meta/Makefile.am
@@ -1,4 +1,4 @@
-installdir = $(pkgdatadir)/meta/enigma2/
+installdir = $(datadir)/meta/
 
 dist_install_DATA = plugin_dvdplayer.xml
 

diff --git a/lib/python/Plugins/Extensions/GraphMultiEPG/meta/Makefile.am b/lib/python/Plugins/Extensions/GraphMultiEPG/meta/Makefile.am
index b04ba5a2e3d330094e1db0a70d581e045e6ba327..5766ff349e9c376a6c3c293191c897cd38bc6cad 100755 (executable)
--- a/lib/python/Plugins/Extensions/GraphMultiEPG/meta/Makefile.am
+++ b/lib/python/Plugins/Extensions/GraphMultiEPG/meta/Makefile.am
@@ -1,4 +1,4 @@
-installdir = $(pkgdatadir)/meta/enigma2/
+installdir = $(datadir)/meta/
 
 dist_install_DATA = plugin_graphmultiepg.xml
 

diff --git a/lib/python/Plugins/Extensions/MediaPlayer/meta/Makefile.am b/lib/python/Plugins/Extensions/MediaPlayer/meta/Makefile.am
index 721d8fb0d23a9019087773d711bda420a06fcf3c..84e01672c6ef3b38eb29bd00e69bdfa19016a8bd 100755 (executable)
--- a/lib/python/Plugins/Extensions/MediaPlayer/meta/Makefile.am
+++ b/lib/python/Plugins/Extensions/MediaPlayer/meta/Makefile.am
@@ -1,4 +1,4 @@
-installdir = $(pkgdatadir)/meta/enigma2/
+installdir = $(datadir)/meta/
 
 dist_install_DATA = plugin_mediaplayer.xml
 

diff --git a/lib/python/Plugins/Extensions/MediaScanner/meta/Makefile.am b/lib/python/Plugins/Extensions/MediaScanner/meta/Makefile.am
old mode 100644 (file)
new mode 100755 (executable)
index a83c4b4..e2aa0e3
--- a/lib/python/Plugins/Extensions/MediaScanner/meta/Makefile.am
+++ b/lib/python/Plugins/Extensions/MediaScanner/meta/Makefile.am
@@ -1,3 +1,3 @@
-installdir = $(pkgdatadir)/meta/enigma2/
+installdir = $(datadir)/meta/
 
 dist_install_DATA = plugin_mediascanner.xml

diff --git a/lib/python/Plugins/Extensions/PicturePlayer/meta/Makefile.am b/lib/python/Plugins/Extensions/PicturePlayer/meta/Makefile.am
index ba9c3bbddcaa08cc7a42368a19e891616df58fa3..87b59f4371ac6fd3afc74e6d029b94fe4b8a3300 100755 (executable)
--- a/lib/python/Plugins/Extensions/PicturePlayer/meta/Makefile.am
+++ b/lib/python/Plugins/Extensions/PicturePlayer/meta/Makefile.am
@@ -1,4 +1,4 @@
-installdir = $(pkgdatadir)/meta/enigma2/
+installdir = $(datadir)/meta/
 
 dist_install_DATA = plugin_pictureplayer.xml
 

diff --git a/lib/python/Plugins/Extensions/SocketMMI/meta/Makefile.am b/lib/python/Plugins/Extensions/SocketMMI/meta/Makefile.am
old mode 100644 (file)
new mode 100755 (executable)
index d957e22..34ccbeb
--- a/lib/python/Plugins/Extensions/SocketMMI/meta/Makefile.am
+++ b/lib/python/Plugins/Extensions/SocketMMI/meta/Makefile.am
@@ -1,3 +1,3 @@
-installdir = $(pkgdatadir)/meta/enigma2/
+installdir = $(datadir)/meta/
 
 dist_install_DATA = plugin_socketmmi.xml

diff --git a/lib/python/Plugins/Extensions/TuxboxPlugins/meta/Makefile.am b/lib/python/Plugins/Extensions/TuxboxPlugins/meta/Makefile.am
old mode 100644 (file)
new mode 100755 (executable)
index ab8e516..ecdcac8
--- a/lib/python/Plugins/Extensions/TuxboxPlugins/meta/Makefile.am
+++ b/lib/python/Plugins/Extensions/TuxboxPlugins/meta/Makefile.am
@@ -1,3 +1,3 @@
-installdir = $(pkgdatadir)/meta/enigma2/
+installdir = $(datadir)/meta/
 
 dist_install_DATA = plugin_tuxboxplugins.xml

diff --git a/lib/python/Plugins/SystemPlugins/CleanupWizard/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/CleanupWizard/meta/Makefile.am
index 125ce5cde106bd756123831351ba0b7f0409b1fb..94be47471d7ec7750fdf09b68cd63a18ea46feb4 100755 (executable)
--- a/lib/python/Plugins/SystemPlugins/CleanupWizard/meta/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/CleanupWizard/meta/Makefile.am
@@ -1,3 +1,3 @@
-installdir = $(pkgdatadir)/meta/enigma2/
+installdir = $(datadir)/meta/
 
 dist_install_DATA = plugin_cleanupwizard.xml

diff --git a/lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/meta/Makefile.am
index 98e5b546f19b6397cf1ebda52ee1f94877234198..60d1d461229441279a6995c2de2ce07aabbb8590 100755 (executable)
--- a/lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/meta/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/meta/Makefile.am
@@ -1,4 +1,4 @@
-installdir = $(pkgdatadir)/meta/enigma2/
+installdir = $(datadir)/meta/
 
 dist_install_DATA = plugin_commoninterfaceassignment.xml
 

diff --git a/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/meta/Makefile.am
old mode 100644 (file)
new mode 100755 (executable)
index 39d584d..b619c8c
--- a/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/meta/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/meta/Makefile.am
@@ -1,3 +1,3 @@
-installdir = $(pkgdatadir)/meta/enigma2/
+installdir = $(datadir)/meta/
 
 dist_install_DATA = plugin_crashlogautosubmit.xml

diff --git a/lib/python/Plugins/SystemPlugins/DefaultServicesScanner/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/DefaultServicesScanner/meta/Makefile.am
index a506c667d7e4c66a5f7783805cd133462e5437c2..07dc13789fc427b10e274c2ec67c304c5bcdf2ab 100755 (executable)
--- a/lib/python/Plugins/SystemPlugins/DefaultServicesScanner/meta/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/DefaultServicesScanner/meta/Makefile.am
@@ -1,4 +1,4 @@
-installdir = $(pkgdatadir)/meta/enigma2/
+installdir = $(datadir)/meta/
 
 dist_install_DATA = plugin_defaultservicesscanner.xml
 

diff --git a/lib/python/Plugins/SystemPlugins/DiseqcTester/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/DiseqcTester/meta/Makefile.am
index 3d36ab9253eabe286a4c50cf26f692b7d3712171..8405ed7ace124d44b65f540b12d188b453575fb6 100755 (executable)
--- a/lib/python/Plugins/SystemPlugins/DiseqcTester/meta/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/DiseqcTester/meta/Makefile.am
@@ -1,4 +1,4 @@
-installdir = $(pkgdatadir)/meta/enigma2/
+installdir = $(datadir)/meta/
 
 dist_install_DATA = plugin_diseqctester.xml
 

diff --git a/lib/python/Plugins/SystemPlugins/FrontprocessorUpgrade/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/FrontprocessorUpgrade/meta/Makefile.am
old mode 100644 (file)
new mode 100755 (executable)
index dae0509..b1a93d3
--- a/lib/python/Plugins/SystemPlugins/FrontprocessorUpgrade/meta/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/FrontprocessorUpgrade/meta/Makefile.am
@@ -1,3 +1,3 @@
-installdir = $(pkgdatadir)/meta/enigma2/
+installdir = $(datadir)/meta/
 
 dist_install_DATA = plugin_frontprocessorupgrade.xml

diff --git a/lib/python/Plugins/SystemPlugins/Hotplug/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/Hotplug/meta/Makefile.am
old mode 100644 (file)
new mode 100755 (executable)
index 3a9525d..a757b53
--- a/lib/python/Plugins/SystemPlugins/Hotplug/meta/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/Hotplug/meta/Makefile.am
@@ -1,3 +1,3 @@
-installdir = $(pkgdatadir)/meta/enigma2/
+installdir = $(datadir)/meta/
 
 dist_install_DATA = plugin_hotplug.xml

diff --git a/lib/python/Plugins/SystemPlugins/NFIFlash/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/NFIFlash/meta/Makefile.am
index 35f88a5089872bcccb8fd168a8044a25a953a444..686bded02a431b461cf573111158a6673ba910a3 100755 (executable)
--- a/lib/python/Plugins/SystemPlugins/NFIFlash/meta/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/NFIFlash/meta/Makefile.am
@@ -1,4 +1,4 @@
-installdir = $(pkgdatadir)/meta/enigma2/
+installdir = $(datadir)/meta/
 
 dist_install_DATA = plugin_nfiflash.xml
 

diff --git a/lib/python/Plugins/SystemPlugins/PositionerSetup/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/PositionerSetup/meta/Makefile.am
index 21786251528dc92b0801aee98d1cc12dd9cce5b5..3bc5cb24e5a8e7fba357316d1b9a69a3c8c71df0 100755 (executable)
--- a/lib/python/Plugins/SystemPlugins/PositionerSetup/meta/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/PositionerSetup/meta/Makefile.am
@@ -1,4 +1,4 @@
-installdir = $(pkgdatadir)/meta/enigma2/
+installdir = $(datadir)/meta/
 
 dist_install_DATA = plugin_positionersetup.xml
 

diff --git a/lib/python/Plugins/SystemPlugins/SatelliteEquipmentControl/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/SatelliteEquipmentControl/meta/Makefile.am
index f67a452d13f3953bd8cff7728c8209275892812a..b31fa6531bb20a0f3c01dae035eb438762545003 100755 (executable)
--- a/lib/python/Plugins/SystemPlugins/SatelliteEquipmentControl/meta/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/SatelliteEquipmentControl/meta/Makefile.am
@@ -1,4 +1,4 @@
-installdir = $(pkgdatadir)/meta/enigma2/
+installdir = $(datadir)/meta/
 
 dist_install_DATA = plugin_satelliteequipmentcontrol.xml
 

diff --git a/lib/python/Plugins/SystemPlugins/Satfinder/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/Satfinder/meta/Makefile.am
index 43932b853f103fdcd42e1a3f3ffd1b6a9ca29c05..ba035e8691501ea3c5076c99cd6f98759915b237 100755 (executable)
--- a/lib/python/Plugins/SystemPlugins/Satfinder/meta/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/Satfinder/meta/Makefile.am
@@ -1,4 +1,4 @@
-installdir = $(pkgdatadir)/meta/enigma2/
+installdir = $(datadir)/meta/
 
 dist_install_DATA = plugin_satfinder.xml
 

diff --git a/lib/python/Plugins/SystemPlugins/SkinSelector/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/SkinSelector/meta/Makefile.am
index 34a12f620220a7e4c69679f0787b230af857b9eb..689d97ef7c569706a35ddf7847136367eea8c6cc 100755 (executable)
--- a/lib/python/Plugins/SystemPlugins/SkinSelector/meta/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/SkinSelector/meta/Makefile.am
@@ -1,4 +1,4 @@
-installdir = $(pkgdatadir)/meta/enigma2/
+installdir = $(datadir)/meta/
 
 dist_install_DATA = plugin_skinselector.xml
 

diff --git a/lib/python/Plugins/SystemPlugins/SoftwareManager/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/SoftwareManager/meta/Makefile.am
index a383c2f7b089bcc1dcc71971fbba2dcb2fe6590e..341938c5e454d6c8cfc56bf8354afce2b25bdc8f 100755 (executable)
--- a/lib/python/Plugins/SystemPlugins/SoftwareManager/meta/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/SoftwareManager/meta/Makefile.am
@@ -1,4 +1,4 @@
-installdir = $(pkgdatadir)/meta/enigma2/
+installdir = $(datadir)/meta/
 
 dist_install_DATA = plugin_softwaremanager.xml
 

diff --git a/lib/python/Plugins/SystemPlugins/VideoTune/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/VideoTune/meta/Makefile.am
index 908f7e991fe73fd6167dd1b2f6cfacb176920498..d0368ed9d64ba605bbd42ad855eb696d7c910042 100755 (executable)
--- a/lib/python/Plugins/SystemPlugins/VideoTune/meta/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/VideoTune/meta/Makefile.am
@@ -1,4 +1,4 @@
-installdir = $(pkgdatadir)/meta/enigma2/
+installdir = $(datadir)/meta/
 
 dist_install_DATA = plugin_videotune.xml
 

diff --git a/lib/python/Plugins/SystemPlugins/Videomode/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/Videomode/meta/Makefile.am
index 8dcc0149165bb88ed1af81c4e267a51ac600bd88..6c012e841c7e6f64f410de5ea10667df0d41bb22 100755 (executable)
--- a/lib/python/Plugins/SystemPlugins/Videomode/meta/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/Videomode/meta/Makefile.am
@@ -1,4 +1,4 @@
-installdir = $(pkgdatadir)/meta/enigma2/
+installdir = $(datadir)/meta/
 
 dist_install_DATA = plugin_videomode.xml
 

diff --git a/skin.py b/skin.py
index 1c22d3d8ea821e026ea3e3e66b8cb4027250b52d..5b8ce650f18e2c63c7fce121c2e0a90734e4d211 100644 (file)
--- a/skin.py
+++ b/skin.py
@@ -119,7 +119,7 @@ def collectAttributes(skinAttributes, node, skin_path_prefix=None, ignore=[]):
                        value = resolveFilename(SCOPE_SKIN_IMAGE, value, path_prefix=skin_path_prefix)
 
                if attrib not in ignore:
-                       skinAttributes.append((attrib, value))
+                       skinAttributes.append((attrib, value.encode("utf-8")))
 
 def loadPixmap(path, desktop):
        cached = False

diff --git a/tools/genmetaindex.py b/tools/genmetaindex.py
old mode 100644 (file)
new mode 100755 (executable)
index 787a6f5..9b62a7b
--- a/tools/genmetaindex.py
+++ b/tools/genmetaindex.py
@@ -14,7 +14,6 @@ for file in sys.argv[2:]:
        package = Element("package")
        package.set("details", os.path.basename(file))
        
-       
        # we need all prerequisuited
        package.append(p.find("prerequisites"))
        
@@ -25,12 +24,13 @@ for file in sys.argv[2:]:
                        info = i
        assert info
        
-       
        for i in info[:]:
                if i.tag not in ["name", "packagename", "shortdescription"]:
                        info.remove(i)
 
-       package.append(info)
+       for i in info[:]:
+               package.set(str(i.tag), str(i.text))
+
        root.append(package)
 
 def indent(elem, level=0):