trunk

Friedrich W. H. Kossebau kossebau at kde.org
Tue Apr 15 19:14:24 CEST 2008


SVN commit 797377 by kossebau:

Moving Okteta from kdereview to kdeutils.

The two weeks in kdereview passed without any objection,
also the module coordinator is okay with it, (who's me, after all),
so Okteta is in. That is, kdeutils.

The code in kdeutils/okteta/{core,gui,parts} obsoletes the one
in kdeutils/khexedit/{core,gui,parts}, as it was branched
from the latter one before, so that one is removed now.
And such the khexedit directory is completely empty and is removed, too,
because the code for the program KHexEdit was removed as unmaintained before
the 4.0 release.

[memorial minute]You will stay in many people's memory, KHexEdit.[/memorial minute]

But hopefully Okteta will be better soon, so let's go on now :)

Please, could someone from the translation team move the translations, too?
Thanks a lot.

CCMAIL:release-team at kde.org
CCMAIL:kde-i18n-doc at kde.org



 M  +1 -1      KDE/kdeutils/CMakeLists.txt  
 M  +3 -3      KDE/kdeutils/README  
 M  +1 -0      KDE/kdeutils/doc/CMakeLists.txt  
 A             KDE/kdeutils/doc/okteta (directory)   kdereview/doc/okteta#797355
 A             KDE/kdeutils/doc/okteta/CMakeLists.txt   kdereview/doc/okteta/CMakeLists.txt#797370
 A             KDE/kdeutils/doc/okteta/basics.docbook   kdereview/doc/okteta/basics.docbook#797370
 A             KDE/kdeutils/doc/okteta/credits.docbook   kdereview/doc/okteta/credits.docbook#797370
 A             KDE/kdeutils/doc/okteta/index.docbook   kdereview/doc/okteta/index.docbook#797370
 A             KDE/kdeutils/doc/okteta/introduction.docbook   kdereview/doc/okteta/introduction.docbook#797370
 A             KDE/kdeutils/doc/okteta/menu.docbook   kdereview/doc/okteta/menu.docbook#797370
 A             KDE/kdeutils/doc/okteta/tools.docbook   kdereview/doc/okteta/tools.docbook#797370
 D             KDE/kdeutils/khexedit (directory)  
 A             KDE/kdeutils/okteta (directory)   kdereview/okteta#797350
 A             KDE/kdeutils/okteta/CMakeLists.txt   kdereview/okteta/CMakeLists.txt#797370
 A             KDE/kdeutils/okteta/README   kdereview/okteta/README#797370
 A             KDE/kdeutils/okteta/core (directory)   kdereview/okteta/core#797370
 M  +4 -6      KDE/kdeutils/okteta/core/CMakeLists.txt  
 M  +1 -1      KDE/kdeutils/okteta/core/oktetacore_export.h  
 A             KDE/kdeutils/okteta/gui (directory)   kdereview/okteta/gui#797370
 M  +6 -6      KDE/kdeutils/okteta/gui/CMakeLists.txt  
 M  +1 -1      KDE/kdeutils/okteta/gui/oktetagui_export.h  
 A             KDE/kdeutils/okteta/parts (directory)   kdereview/okteta/parts#797370
 M  +1 -1      KDE/kdeutils/okteta/parts/kbytesedit/CMakeLists.txt  
 M  +1 -1      KDE/kdeutils/okteta/parts/kpart/CMakeLists.txt  
 A             KDE/kdeutils/okteta/program (directory)   kdereview/okteta/program#797370
 M  +2 -2      KDE/kdeutils/okteta/program/CMakeLists.txt  
 M  +0 -1      kdereview/CMakeLists.txt  
 M  +0 -1      kdereview/doc/CMakeLists.txt  
 D             kdereview/doc/okteta (directory)  
 D             kdereview/okteta (directory)  


--- trunk/KDE/kdeutils/CMakeLists.txt #797376:797377
@@ -32,12 +32,12 @@
   # K3Process
   macro_optional_add_subdirectory(kfloppy)
 endif(NOT WIN32)
-macro_optional_add_subdirectory(khexedit)
 macro_optional_add_subdirectory(kjots)
 macro_optional_add_subdirectory(ktimer)
 macro_optional_add_subdirectory(kwallet)
 macro_optional_add_subdirectory(sweeper)
 macro_optional_add_subdirectory(ark)
+macro_optional_add_subdirectory(okteta)
 add_subdirectory( cmake )
 
 macro_optional_add_subdirectory(kgpg)
--- trunk/KDE/kdeutils/README #797376:797377
@@ -27,9 +27,9 @@
 Common Mistakes
 ---------------
 
-If configure claims Qt cannot be found, have a look at http://www.trolltech.com
-to get latest copy of Qt 4.3.x version.  If you have peeked there already,
-grab the CVS module qt-copy from anoncvs.kde.org, or a snapshot thereof.
+If configure claims Qt cannot be found, have a look at http://www.trolltech.com/
+to get latest copy of Qt 4.4.x version.  If you have peeked there already,
+grab the SVN module qt-copy from anonsvn.kde.org, or a snapshot thereof.
 
 Debugging
 ---------
--- trunk/KDE/kdeutils/doc/CMakeLists.txt #797376:797377
@@ -9,6 +9,7 @@
 #add_subdirectory(ksim)
 add_subdirectory(ktimer)
 add_subdirectory(kwallet)
+add_subdirectory(okteta)
 add_subdirectory(superkaramba)
 MESSAGE(STATUS "readd ksim/kdelirc/kcontrol/kinfocenter doc when/if they will ported")
 
--- trunk/KDE/kdeutils/okteta/core/CMakeLists.txt #797370:797377
@@ -50,16 +50,14 @@
   ksectionlist.cpp
 )
 
-kde4_add_library( oktetacore_b SHARED ${oktetacore_LIB_SRCS} )
-target_link_libraries( oktetacore_b  ${KDE4_KDECORE_LIBS} )
-set_target_properties( oktetacore_b PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
+kde4_add_library( oktetacore SHARED ${oktetacore_LIB_SRCS} )
+target_link_libraries( oktetacore  ${KDE4_KDECORE_LIBS} )
+set_target_properties( oktetacore  PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
 
+install( TARGETS oktetacore  ${INSTALL_TARGETS_DEFAULT_ARGS} )
 
-install( TARGETS oktetacore_b  ${INSTALL_TARGETS_DEFAULT_ARGS} )
-
 add_subdirectory( piecetable/tests )
 add_subdirectory( tests )
 if(KDE4_BUILD_TESTS)
   kde4_add_library( testoktetacore STATIC ${oktetacore_LIB_SRCS} )
 endif(KDE4_BUILD_TESTS)
-
--- trunk/KDE/kdeutils/okteta/core/oktetacore_export.h #797370:797377
@@ -29,7 +29,7 @@
 
 #ifndef OKTETACORE_EXPORT
   // building the library?
-# if defined(MAKE_OKTETACORE_B_LIB)
+# if defined(MAKE_OKTETACORE_LIB)
 #  define OKTETACORE_EXPORT KDE_EXPORT
   // using the library
 # else
--- trunk/KDE/kdeutils/okteta/gui/CMakeLists.txt #797370:797377
@@ -39,15 +39,15 @@
   koffsetcoltextexport.cpp
   kdatacoltextexport.cpp
   kvaluecoltextexport.cpp
-  kcharcoltextexport.cpp )
+  kcharcoltextexport.cpp
+)
 
+kde4_add_library( oktetagui  SHARED ${oktetagui_LIB_SRCS} )
+target_link_libraries( oktetagui  oktetacore ${KDE4_KDEUI_LIBS} )
+set_target_properties( oktetagui  PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
 
-kde4_add_library( oktetagui_b  SHARED ${oktetagui_LIB_SRCS} )
-target_link_libraries( oktetagui_b  oktetacore_b ${KDE4_KDEUI_LIBS} )
-set_target_properties( oktetagui_b  PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
+install( TARGETS oktetagui  ${INSTALL_TARGETS_DEFAULT_ARGS} )
 
-install( TARGETS oktetagui_b  ${INSTALL_TARGETS_DEFAULT_ARGS} )
-
 add_subdirectory( test )
 #   kde4_add_library( testoktetacore STATIC ${oktetagui_LIB_SRCS} )
 
--- trunk/KDE/kdeutils/okteta/gui/oktetagui_export.h #797370:797377
@@ -29,7 +29,7 @@
 
 #ifndef OKTETAGUI_EXPORT
   // building the library?
-# if defined(MAKE_OKTETAGUI_B_LIB)
+# if defined(MAKE_OKTETAGUI_LIB)
 #  define OKTETAGUI_EXPORT KDE_EXPORT
   // using the library
 # else
--- trunk/KDE/kdeutils/okteta/parts/kbytesedit/CMakeLists.txt #797370:797377
@@ -14,7 +14,7 @@
 
 kde4_add_plugin( kbytearrayedit WITH_PREFIX ${kbytearrayedit_PART_SRCS} )
 
-target_link_libraries(kbytearrayedit  oktetacore_b oktetagui_b ${KDE4_KPARTS_LIBS} )
+target_link_libraries(kbytearrayedit  oktetacore oktetagui ${KDE4_KPARTS_LIBS} )
 
 install( TARGETS kbytearrayedit          DESTINATION ${PLUGIN_INSTALL_DIR} )
 install( FILES   kbytearrayedit.desktop  DESTINATION ${SERVICES_INSTALL_DIR} )
--- trunk/KDE/kdeutils/okteta/parts/kpart/CMakeLists.txt #797370:797377
@@ -11,7 +11,7 @@
 kde4_add_plugin( oktetapart WITH_PREFIX ${oktetapart_SRCS})
 
 
-target_link_libraries( oktetapart  oktetacore_b oktetagui_b ${KDE4_KPARTS_LIBS} )
+target_link_libraries( oktetapart  oktetacore oktetagui ${KDE4_KPARTS_LIBS} )
 
 install( TARGETS oktetapart  DESTINATION ${PLUGIN_INSTALL_DIR})
 install( FILES oktetapart.desktop  DESTINATION ${SERVICES_INSTALL_DIR} )
--- trunk/KDE/kdeutils/okteta/program/CMakeLists.txt #797370:797377
@@ -38,8 +38,8 @@
   kakaocontrollers
   kakaogui
   kakaocore
-  oktetagui_b
-  oktetacore_b
+  oktetagui
+  oktetacore
   ${KDE4_KIO_LIBS}
 )
 
--- trunk/kdereview/CMakeLists.txt #797376:797377
@@ -37,6 +37,5 @@
 
 macro_optional_add_subdirectory(doc)
 macro_optional_add_subdirectory(printer-applet)
-macro_optional_add_subdirectory(okteta)
 
 macro_display_feature_log()
--- trunk/kdereview/doc/CMakeLists.txt #797376:797377
@@ -1,2 +1 @@
-add_subdirectory(okteta)
 add_subdirectory(kblocks)


More information about the release-team mailing list