From: acid-burn Date: Thu, 3 Sep 2009 07:19:11 +0000 (+0200) Subject: Enigma2-meta: install plugins-meta.xml in /usr/share/meta X-Git-Tag: 2.6.0~86 X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/67971f0a11414814f29415621f00af474808e7d3 Enigma2-meta: install plugins-meta.xml in /usr/share/meta genmetaindex.py: change index.xml layout a bit --- diff --git a/Makefile.am b/Makefile.am old mode 100644 new mode 100755 index 0ba310fa..c517d9c5 --- 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 e5838781..ee18898d 100755 --- 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 new mode 100755 index a6f0a439..1899cb71 --- 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 a5b8047e..12d13710 100755 --- 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 b04ba5a2..5766ff34 100755 --- 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 721d8fb0..84e01672 100755 --- 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 new mode 100755 index a83c4b48..e2aa0e3b --- 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 ba9c3bbd..87b59f43 100755 --- 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 new mode 100755 index d957e22b..34ccbeb7 --- 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 new mode 100755 index ab8e5169..ecdcac8a --- 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 125ce5cd..94be4747 100755 --- 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 98e5b546..60d1d461 100755 --- 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 new mode 100755 index 39d584d7..b619c8c6 --- 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 a506c667..07dc1378 100755 --- 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 3d36ab92..8405ed7a 100755 --- 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 new mode 100755 index dae05092..b1a93d3e --- 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 new mode 100755 index 3a9525d1..a757b538 --- 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 35f88a50..686bded0 100755 --- 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 21786251..3bc5cb24 100755 --- 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 f67a452d..b31fa653 100755 --- 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 43932b85..ba035e86 100755 --- 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 34a12f62..689d97ef 100755 --- 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 a383c2f7..341938c5 100755 --- 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 908f7e99..d0368ed9 100755 --- 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 8dcc0149..6c012e84 100755 --- 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/tools/genmetaindex.py b/tools/genmetaindex.py old mode 100644 new mode 100755 index 787a6f5c..9b62a7b1 --- 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):