From 1461610fb35bb0fcee490f274ea84b8ebfeb1566 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sat, 26 Nov 2011 13:33:58 -0600
Subject: [PATCH] Fix FTBFS

---
 ConfigureChecks.cmake | 11 -----------
 admin                 |  2 +-
 doc/en/CMakeLists.txt |  2 +-
 doc/es/CMakeLists.txt |  2 +-
 doc/ja/CMakeLists.txt |  2 +-
 doc/sv/CMakeLists.txt |  2 +-
 src/CMakeLists.txt    | 14 +++++++-------
 7 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index efe717d..447bce0 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -144,17 +144,6 @@ IF(WANT_LIRC)
     ENDIF(LIRC_FOUND)
 ENDIF(WANT_LIRC)
 
-FIND_PACKAGE(KDECONFIG)
-IF(KDECONFIG_EXECUTABLE)
-    MESSAGE(STATUS "Program kde-config found (${KDECONFIG_EXECUTABLE})")
-    #MESSAGE("KDE3PREFIX: ${KDE3PREFIX}")
-ENDIF(KDECONFIG_EXECUTABLE)
-
-FIND_PACKAGE(MEINPROC REQUIRED)
-IF(MEINPROC_FOUND)
-    MESSAGE(STATUS "Program meinproc found (${MEINPROC_EXECUTABLE})")
-ENDIF(MEINPROC_FOUND)
-
 # Check GCC for PCH support
 SET(USE_PCH FALSE)
 IF(WANT_PCH)
diff --git a/admin b/admin
index 26d642b..21cb4a9 160000
--- a/admin
+++ b/admin
@@ -1 +1 @@
-Subproject commit 26d642b2620397b76d5fbb64a9ef5ca8f2334f72
+Subproject commit 21cb4a9d2a0e083b10dee6d22958c4f58de6c5b2
diff --git a/doc/en/CMakeLists.txt b/doc/en/CMakeLists.txt
index eb6d853..1a8e7d7 100644
--- a/doc/en/CMakeLists.txt
+++ b/doc/en/CMakeLists.txt
@@ -9,4 +9,4 @@
 #
 #################################################
 
-tde_create_handbook( DESTINATION rosegarden )
+tde_create_handbook( LANG en DESTINATION rosegarden )
diff --git a/doc/es/CMakeLists.txt b/doc/es/CMakeLists.txt
index eb6d853..0c21fa7 100644
--- a/doc/es/CMakeLists.txt
+++ b/doc/es/CMakeLists.txt
@@ -9,4 +9,4 @@
 #
 #################################################
 
-tde_create_handbook( DESTINATION rosegarden )
+tde_create_handbook( LANG es DESTINATION rosegarden )
diff --git a/doc/ja/CMakeLists.txt b/doc/ja/CMakeLists.txt
index eb6d853..3dd163c 100644
--- a/doc/ja/CMakeLists.txt
+++ b/doc/ja/CMakeLists.txt
@@ -9,4 +9,4 @@
 #
 #################################################
 
-tde_create_handbook( DESTINATION rosegarden )
+tde_create_handbook( LANG ja DESTINATION rosegarden )
diff --git a/doc/sv/CMakeLists.txt b/doc/sv/CMakeLists.txt
index eb6d853..51bb818 100644
--- a/doc/sv/CMakeLists.txt
+++ b/doc/sv/CMakeLists.txt
@@ -9,4 +9,4 @@
 #
 #################################################
 
-tde_create_handbook( DESTINATION rosegarden )
+tde_create_handbook( LANG sv DESTINATION rosegarden )
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d3b652b..61e66cd 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -72,7 +72,7 @@ install( FILES ${RC_FILES} DESTINATION ${DATA_INSTALL_DIR}/rosegarden )
 ##### RosegardenCommon ##############################
 
 tde_add_library( RosegardenCommon STATIC AUTOMOC
-  SOURCES ${${misc_SRCS} ${base_SRCS} ${common_sound_SRCS}}
+  SOURCES ${misc_SRCS} ${base_SRCS} ${common_sound_SRCS}
   LINK dl
   DESTINATION ${LIB_INSTALL_DIR}
 )
@@ -87,7 +87,7 @@ else( WANT_SOUND )
 endif( WANT_SOUND )
 
 tde_add_executable( rosegardensequencer AUTOMOC
-  SOURCES ${${seq_dcop_SRCS} ${snd_SRCS} ${sequencer_SRCS}}
+  SOURCES ${seq_dcop_SRCS} ${snd_SRCS} ${sequencer_SRCS}
   LINK dl tdecore-shared ${ALSA_LIBS} ${JACK_LIBS} ${LIBLO_LIBS} ${LRDF_LIBS} ${FFTW3F_LIBS} tdeui-shared RosegardenCommon
   DESTINATION ${BIN_INSTALL_DIR}
 )
@@ -96,7 +96,7 @@ tde_add_executable( rosegardensequencer AUTOMOC
 ##### RosegardenExtended ############################
 
 tde_add_library( RosegardenExtended STATIC AUTOMOC
-  SOURCES ${${document_SRCS} ${gui_SRCS} ${gui_dcop_SRCS} ${ui_SRCS}}
+  SOURCES ${document_SRCS} ${gui_SRCS} ${gui_dcop_SRCS} ${ui_SRCS}
   LINK dl lo
   DESTINATION ${LIB_INSTALL_DIR}
 )
@@ -105,7 +105,7 @@ tde_add_library( RosegardenExtended STATIC AUTOMOC
 ##### RosegardenCommands ############################
 
 tde_add_library( RosegardenCommands STATIC AUTOMOC
-  SOURCES ${${commands_SRCS}}
+  SOURCES ${commands_SRCS}
 #  LINK dl
   DESTINATION ${LIB_INSTALL_DIR}
 )
@@ -114,7 +114,7 @@ tde_add_library( RosegardenCommands STATIC AUTOMOC
 ##### RosegardenSegmentCanvas #######################
 
 tde_add_library( RosegardenSegmentCanvas STATIC AUTOMOC
-  SOURCES ${${segmentcanvas_SRCS}}
+  SOURCES ${segmentcanvas_SRCS}
 #  LINK dl
   DESTINATION ${LIB_INSTALL_DIR}
 )
@@ -123,7 +123,7 @@ tde_add_library( RosegardenSegmentCanvas STATIC AUTOMOC
 ##### rosegarden ####################################
 
 tde_add_executable( rosegarden AUTOMOC
-  SOURCES ${gui/application/main.cpp}
+  SOURCES gui/application/main.cpp
   LINK dl lo tdecore-shared ${LIBLO_LIBS} ${LRDF_LIBS} ${FFTW3F_LIBS} ${XFT_LIBS} ${LIRC_LIBS} ${JACK_LIBS} kio-shared tdeui-shared tdeprint-shared RosegardenExtended RosegardenSegmentCanvas RosegardenCommands RosegardenCommon
   DESTINATION ${BIN_INSTALL_DIR}
 )
@@ -139,7 +139,7 @@ if( WANT_TEST )
   )
 
   tde_add_executable( RosegardenTestDriver AUTOMOC
-    SOURCES ${RosegardenTestDriver.cpp ${tests_SRCS}}
+    SOURCES RosegardenTestDriver.cpp ${tests_SRCS}
     LINK dl lo tdecore-shared ${LIBLO_LIBS} ${LRDF_LIBS} ${FFTW3F_LIBS} ${XFT_LIBS} ${LIRC_LIBS} ${JACK_LIBS} kio-shared tdeui-shared tdeprint-shared RosegardenExtended RosegardenSegmentCanvas RosegardenCommands RosegardenCommon
     DESTINATION ${BIN_INSTALL_DIR}
 )