Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdeartwork

kscreensaver/CMakeLists.txt

@@ -11,6 +11,7 @@
 
 add_subdirectory( kdesavers )
 add_subdirectory( kpartsaver)
+add_subdirectory( krootbacking )
 if( WITH_XSCREENSAVER )
   add_subdirectory( kxsconfig )
   add_subdirectory( xsavers )

kscreensaver/krootbacking/CMakeLists.txt

@@ -0,0 +1,17 @@
+#################################################
+#
+#  (C) 2012 Slavek Banko
+#  slavek (DOT) banko (AT) axis.cz
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+install(
+  FILES
+    xscreensaver-getimage
+    xscreensaver-getimage-file
+  DESTINATION ${BIN_INSTALL_DIR}
+)

kscreensaver/krootbacking/Makefile.am

@@ -1,6 +1,6 @@
 INCLUDES = $(all_includes)
 
-hackdir = /usr/local/bin/
+hackdir = $(kde_bindir)
 hack_DATA = xscreensaver-getimage xscreensaver-getimage-file
 
 install-data-hook:

wallpapers/Makefile.am

@@ -1,9 +1,13 @@
 
 papers_DATA = \
      alien-night.jpg \
+	alien-night.jpg.desktop \
      kraftwurm.jpg \
+	kraftwurm.jpg.desktop \
      kubical.png \
+	kubical.png.desktop \
      mystical_rightturn.jpg \
+	mystical_rightturn.jpg.desktop \
      Appropriately-Left-Handed-2.jpg \
      Superfluous-Organ-1.jpg \
      The-Good-Times-1.jpg \