Use new service type and cmake macro for wallpapers

qmlpackages/wallpapers/CMakeLists.txt

@@ -1,3 +1,3 @@
 
-add_subdirectory(autumn)
-add_subdirectory(color)
+installPackage(color org.kde.color plasma/wallpapers wallpaper)
+installPackage(autumn org.kde.autumn plasma/wallpapers wallpaper)

qmlpackages/wallpapers/autumn/CMakeLists.txt

@@ -1,4 +0,0 @@
-
-install(DIRECTORY . DESTINATION ${DATA_INSTALL_DIR}/plasma/wallpapers/org.kde.autumn PATTERN .svn EXCLUDE PATTERN CMakeLists.txt EXCLUDE PATTERN Messages.sh EXCLUDE)
-
-

qmlpackages/wallpapers/autumn/metadata.desktop

@@ -17,6 +17,7 @@ Name[x-test]=xxAutumnxx
 Type=Service
 Icon=java
 
+X-KDE-ServiceType=Plasma/Wallpaper
 X-KDE-ParentApp=
 X-KDE-PluginInfo-Author=Sebastian Kügler
 X-KDE-PluginInfo-Category=

qmlpackages/wallpapers/color/CMakeLists.txt

@@ -1,4 +0,0 @@
-
-install(DIRECTORY . DESTINATION ${DATA_INSTALL_DIR}/plasma/wallpapers/org.kde.image PATTERN .svn EXCLUDE PATTERN CMakeLists.txt EXCLUDE PATTERN Messages.sh EXCLUDE)
-
-

qmlpackages/wallpapers/color/metadata.desktop

@@ -1,7 +1,8 @@
 [Desktop Entry]
 Encoding=UTF-8
 Keywords=
-Name=Color wallpaper
+Icon=preferences-desktop-color
+Name=Plain Color
 Name[cs]=Barva na pozadí
 Name[nl]=Kleur van achtergrondafbeelding
 Name[pt]=Papel de parede por cores
@@ -11,7 +12,7 @@ Name[uk]=Кольорове тло стільниці
 Name[x-test]=xxColor wallpaperxx
 Type=Service
 
-X-KDE-ServiceTypes=Plasma/Shell
+X-KDE-ServiceTypes=Plasma/Wallpaper
 X-KDE-ParentApp=
 X-KDE-PluginInfo-Author=Marco Martin
 X-KDE-PluginInfo-Category=