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

diff --git a/lib/python/Plugins/Extensions/CutListEditor/meta/Makefile.am b/lib/python/Plugins/Extensions/CutListEditor/meta/Makefile.am
old mode 100644 (file)
new mode 100755 (executable)
index 353c573..e583878
--- a/lib/python/Plugins/Extensions/CutListEditor/meta/Makefile.am
+++ b/lib/python/Plugins/Extensions/CutListEditor/meta/Makefile.am
@@ -1,3 +1,5 @@
 installdir = $(pkgdatadir)/meta/enigma2/
 
 dist_install_DATA = plugin_cutlisteditor.xml
+
+EXTRA_DIST = cutlisteditor.jpg
\ No newline at end of file

diff --git a/lib/python/Plugins/Extensions/DVDPlayer/meta/Makefile.am b/lib/python/Plugins/Extensions/DVDPlayer/meta/Makefile.am
old mode 100644 (file)
new mode 100755 (executable)
index 08b7dfc..a5b8047
--- a/lib/python/Plugins/Extensions/DVDPlayer/meta/Makefile.am
+++ b/lib/python/Plugins/Extensions/DVDPlayer/meta/Makefile.am
@@ -1,3 +1,5 @@
 installdir = $(pkgdatadir)/meta/enigma2/
 
 dist_install_DATA = plugin_dvdplayer.xml
+
+EXTRA_DIST = dvdplayer.jpg
\ No newline at end of file

diff --git a/lib/python/Plugins/Extensions/GraphMultiEPG/meta/Makefile.am b/lib/python/Plugins/Extensions/GraphMultiEPG/meta/Makefile.am
old mode 100644 (file)
new mode 100755 (executable)
index 0e7affa..b04ba5a
--- a/lib/python/Plugins/Extensions/GraphMultiEPG/meta/Makefile.am
+++ b/lib/python/Plugins/Extensions/GraphMultiEPG/meta/Makefile.am
@@ -1,3 +1,5 @@
 installdir = $(pkgdatadir)/meta/enigma2/
 
 dist_install_DATA = plugin_graphmultiepg.xml
+
+EXTRA_DIST = graphmultiepg_de.jpg graphmultiepg_en.jpg

diff --git a/lib/python/Plugins/Extensions/MediaPlayer/meta/Makefile.am b/lib/python/Plugins/Extensions/MediaPlayer/meta/Makefile.am
old mode 100644 (file)
new mode 100755 (executable)
index a51da7b..721d8fb
--- a/lib/python/Plugins/Extensions/MediaPlayer/meta/Makefile.am
+++ b/lib/python/Plugins/Extensions/MediaPlayer/meta/Makefile.am
@@ -1,3 +1,5 @@
 installdir = $(pkgdatadir)/meta/enigma2/
 
 dist_install_DATA = plugin_mediaplayer.xml
+
+EXTRA_DIST = mediaplayer_de.jpg mediaplayer_en.jpg

diff --git a/lib/python/Plugins/Extensions/PicturePlayer/meta/Makefile.am b/lib/python/Plugins/Extensions/PicturePlayer/meta/Makefile.am
old mode 100644 (file)
new mode 100755 (executable)
index 654998b..ba9c3bb
--- a/lib/python/Plugins/Extensions/PicturePlayer/meta/Makefile.am
+++ b/lib/python/Plugins/Extensions/PicturePlayer/meta/Makefile.am
@@ -1,3 +1,5 @@
 installdir = $(pkgdatadir)/meta/enigma2/
 
 dist_install_DATA = plugin_pictureplayer.xml
+
+EXTRA_DIST = pictureplayer.jpg
\ No newline at end of file

diff --git a/lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/meta/Makefile.am
old mode 100644 (file)
new mode 100755 (executable)
index ebb33f8..98e5b54
--- a/lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/meta/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/meta/Makefile.am
@@ -1,3 +1,5 @@
 installdir = $(pkgdatadir)/meta/enigma2/
 
 dist_install_DATA = plugin_commoninterfaceassignment.xml
+
+EXTRA_DIST = ciassignment.jpg

diff --git a/lib/python/Plugins/SystemPlugins/DefaultServicesScanner/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/DefaultServicesScanner/meta/Makefile.am
old mode 100644 (file)
new mode 100755 (executable)
index 49295eb..a506c66
--- a/lib/python/Plugins/SystemPlugins/DefaultServicesScanner/meta/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/DefaultServicesScanner/meta/Makefile.am
@@ -1,3 +1,5 @@
 installdir = $(pkgdatadir)/meta/enigma2/
 
 dist_install_DATA = plugin_defaultservicesscanner.xml
+
+EXTRA_DIST = defaultservicescanner.jpg

diff --git a/lib/python/Plugins/SystemPlugins/DiseqcTester/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/DiseqcTester/meta/Makefile.am
old mode 100644 (file)
new mode 100755 (executable)
index 680e86f..3d36ab9
--- a/lib/python/Plugins/SystemPlugins/DiseqcTester/meta/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/DiseqcTester/meta/Makefile.am
@@ -1,3 +1,5 @@
 installdir = $(pkgdatadir)/meta/enigma2/
 
 dist_install_DATA = plugin_diseqctester.xml
+
+EXTRA_DIST = diseqctester.jpg

diff --git a/lib/python/Plugins/SystemPlugins/NFIFlash/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/NFIFlash/meta/Makefile.am
old mode 100644 (file)
new mode 100755 (executable)
index d7788c1..35f88a5
--- a/lib/python/Plugins/SystemPlugins/NFIFlash/meta/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/NFIFlash/meta/Makefile.am
@@ -1,3 +1,5 @@
 installdir = $(pkgdatadir)/meta/enigma2/
 
 dist_install_DATA = plugin_nfiflash.xml
+
+EXTRA_DIST = nfiflash.jpg

diff --git a/lib/python/Plugins/SystemPlugins/PositionerSetup/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/PositionerSetup/meta/Makefile.am
old mode 100644 (file)
new mode 100755 (executable)
index cba11d8..2178625
--- a/lib/python/Plugins/SystemPlugins/PositionerSetup/meta/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/PositionerSetup/meta/Makefile.am
@@ -1,3 +1,5 @@
 installdir = $(pkgdatadir)/meta/enigma2/
 
 dist_install_DATA = plugin_positionersetup.xml
+
+EXTRA_DIST = positionersetup.jpg

diff --git a/lib/python/Plugins/SystemPlugins/SatelliteEquipmentControl/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/SatelliteEquipmentControl/meta/Makefile.am
old mode 100644 (file)
new mode 100755 (executable)
index 27be8ab..f67a452
--- a/lib/python/Plugins/SystemPlugins/SatelliteEquipmentControl/meta/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/SatelliteEquipmentControl/meta/Makefile.am
@@ -1,3 +1,5 @@
 installdir = $(pkgdatadir)/meta/enigma2/
 
 dist_install_DATA = plugin_satelliteequipmentcontrol.xml
+
+EXTRA_DIST = satcontrol.jpg

diff --git a/lib/python/Plugins/SystemPlugins/Satfinder/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/Satfinder/meta/Makefile.am
old mode 100644 (file)
new mode 100755 (executable)
index b86450c..43932b8
--- a/lib/python/Plugins/SystemPlugins/Satfinder/meta/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/Satfinder/meta/Makefile.am
@@ -2,3 +2,4 @@ installdir = $(pkgdatadir)/meta/enigma2/
 
 dist_install_DATA = plugin_satfinder.xml
 
+EXTRA_DIST = satfinder.jpg

diff --git a/lib/python/Plugins/SystemPlugins/SkinSelector/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/SkinSelector/meta/Makefile.am
old mode 100644 (file)
new mode 100755 (executable)
index 0ddc11a..34a12f6
--- a/lib/python/Plugins/SystemPlugins/SkinSelector/meta/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/SkinSelector/meta/Makefile.am
@@ -1,3 +1,5 @@
 installdir = $(pkgdatadir)/meta/enigma2/
 
 dist_install_DATA = plugin_skinselector.xml
+
+EXTRA_DIST = skinselector.jpg

diff --git a/lib/python/Plugins/SystemPlugins/SoftwareManager/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/SoftwareManager/meta/Makefile.am
old mode 100644 (file)
new mode 100755 (executable)
index 7995023..a383c2f
--- a/lib/python/Plugins/SystemPlugins/SoftwareManager/meta/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/SoftwareManager/meta/Makefile.am
@@ -1,3 +1,5 @@
 installdir = $(pkgdatadir)/meta/enigma2/
 
 dist_install_DATA = plugin_softwaremanager.xml
+
+EXTRA_DIST = softmanager.jpg

diff --git a/lib/python/Plugins/SystemPlugins/VideoTune/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/VideoTune/meta/Makefile.am
old mode 100644 (file)
new mode 100755 (executable)
index e07d231..908f7e9
--- a/lib/python/Plugins/SystemPlugins/VideoTune/meta/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/VideoTune/meta/Makefile.am
@@ -1,3 +1,5 @@
 installdir = $(pkgdatadir)/meta/enigma2/
 
 dist_install_DATA = plugin_videotune.xml
+
+EXTRA_DIST = videotune.jpg
\ No newline at end of file

diff --git a/lib/python/Plugins/SystemPlugins/Videomode/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/Videomode/meta/Makefile.am
old mode 100644 (file)
new mode 100755 (executable)
index 96505a6..8dcc014
--- a/lib/python/Plugins/SystemPlugins/Videomode/meta/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/Videomode/meta/Makefile.am
@@ -1,3 +1,5 @@
 installdir = $(pkgdatadir)/meta/enigma2/
 
 dist_install_DATA = plugin_videomode.xml
+
+EXTRA_DIST = videomode.jpg