From kde-commits  Wed Dec 24 01:02:18 2008
From: Thomas Zander <zander () kde ! org>
Date: Wed, 24 Dec 2008 01:02:18 +0000
To: kde-commits
Subject: koffice/kword
Message-Id: <1230080538.757712.4638.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=123008054710447

SVN commit 900923 by zander:

Lots of old stuff that we can still access in svn, but lets not release it as 2.0

 M  +0 -5      CMakeLists.txt  
 D             data/CMakeLists.txt  
 D             data/framestyles.xml  
 D             data/tablestyles.xml  
 D             data/tabletemplates.xml  
 D             dtd/CMakeLists.txt  
 D             dtd/DEBUG  
 D             dtd/framestyles.dtd  
 D             dtd/kword.dtd  
 D             dtd/tablestyles.dtd  
 D             dtd/tabletemplates.dtd  
 D             expression/CMakeLists.txt  
 D             expression/expression.xml  
 D             kwmailmerge.desktop  
 D             mailmerge/CMakeLists.txt  
 D             mailmerge/KWClassicSerialDataSource.cpp  
 D             mailmerge/KWClassicSerialDataSource.h  
 D             mailmerge/kabc/CMakeLists.txt  
 D             mailmerge/kabc/KWMailMergeKABC.cpp  
 D             mailmerge/kabc/KWMailMergeKABC.h  
 D             mailmerge/kabc/KWMailMergeKABCConfig.cpp  
 D             mailmerge/kabc/KWMailMergeKABCConfig.h  
 D             mailmerge/kabc/addresspicker.ui  
 D             mailmerge/kabc/kwmailmerge_kabc.desktop  
 D             mailmerge/kspread/CMakeLists.txt  
 D             mailmerge/kspread/kwmailmerge_kspread.cpp  
 D             mailmerge/kspread/kwmailmerge_kspread.desktop  
 D             mailmerge/kspread/kwmailmerge_kspread.h  
 D             mailmerge/kspread/kwmailmerge_kspread_config.cpp  
 D             mailmerge/kspread/kwmailmerge_kspread_config.h  
 D             mailmerge/kwserialletter_classic.desktop   [TRAILING SPACE]
 D             mailmerge/sql/CMakeLists.txt  
 D             mailmerge/sql/KWMySqlCursor.h  
 D             mailmerge/sql/KWQtSqlEasyFilter.cpp  
 D             mailmerge/sql/KWQtSqlEasyFilter.h  
 D             mailmerge/sql/KWQtSqlMailMergeOpen.cpp  
 D             mailmerge/sql/KWQtSqlMailMergeOpen.h  
 D             mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp  
 D             mailmerge/sql/KWQtSqlPowerSerialDataSource.h  
 D             mailmerge/sql/KWQtSqlSerialDataSource.cpp  
 D             mailmerge/sql/KWQtSqlSerialDataSource.h  
 D             mailmerge/sql/KWQtSqlSerialDataSourceBase.cpp  
 D             mailmerge/sql/KWQtSqlSerialDataSourceBase.h  
 D             mailmerge/sql/kwqtsqlpower.ui  
 D             mailmerge/sql/kwserialletter_qtsqldb.desktop   [TRAILING SPACE]
 D             mailmerge/sql/kwserialletter_qtsqldb_power.desktop   [TRAILING SPACE]
 D             mailmerge/sql/qtsqldatasourceeditor.ui  
 D             mailmerge/sql/qtsqlopenwidget.ui  
 D             tests/CMakeLists.txt  
 D             tests/FrameViewTester.cpp  
 D             tests/FrameViewTester.h  
 D             tests/KWPageManagerTester.cpp  
 D             tests/KWPageManagerTester.h  
 D             tests/README  
 D             tests/checkFilter.pl  
 D             tests/oasis-kword.sh  


--- trunk/koffice/kword/CMakeLists.txt #900922:900923
@@ -1,16 +1,11 @@
 project(kword)
 
-#add_subdirectory( mailmerge )
 add_subdirectory( templates )
 add_subdirectory( pics )
-#add_subdirectory( expression )
-#add_subdirectory( data )
-#add_subdirectory( tests )
 add_subdirectory( part )
 add_subdirectory( plugins )
 
 # ########### install files ###############
 #
-install( FILES  kwmailmerge.desktop  DESTINATION ${SERVICETYPES_INSTALL_DIR})
 install( FILES  kwordpart.desktop  DESTINATION ${SERVICES_INSTALL_DIR})
 install( FILES  kword.desktop  DESTINATION ${XDG_APPS_INSTALL_DIR})