Hello community, here is the log from the commit of package ktouch for openSUSE:Factory checked in at 2013-08-16 13:41:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ktouch (Old) and /work/SRC/openSUSE:Factory/.ktouch.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ktouch" Changes: -------- --- /work/SRC/openSUSE:Factory/ktouch/ktouch.changes 2013-07-30 16:04:55.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ktouch.new/ktouch.changes 2013-08-16 13:41:23.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Aug 8 15:07:31 UTC 2013 - [email protected] + +- Update to 4.11.0 + * KDE 4.11 Final release + * See http://www.kde.org/announcements/4.11/ + +------------------------------------------------------------------- Old: ---- ktouch-4.10.97.tar.xz New: ---- ktouch-4.11.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ktouch.spec ++++++ --- /var/tmp/diff_new_pack.4oZa9Q/_old 2013-08-16 13:41:24.000000000 +0200 +++ /var/tmp/diff_new_pack.4oZa9Q/_new 2013-08-16 13:41:24.000000000 +0200 @@ -17,7 +17,7 @@ Name: ktouch -Version: 4.10.97 +Version: 4.11.0 Release: 0 Summary: Touch Typing Tutor License: GPL-2.0+ ++++++ ktouch-4.10.97.tar.xz -> ktouch-4.11.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktouch-4.10.97/data/courses/CMakeLists.txt new/ktouch-4.11.0/data/courses/CMakeLists.txt --- old/ktouch-4.10.97/data/courses/CMakeLists.txt 2013-07-10 00:58:25.000000000 +0200 +++ new/ktouch-4.11.0/data/courses/CMakeLists.txt 2013-08-06 14:45:09.000000000 +0200 @@ -1,4 +1,3 @@ -FILE(GLOB coursesfiles *.xml) set (coursefiles ara.xml bg1.xml @@ -6,19 +5,19 @@ br.xml cat.xml cz.xml - de1.xml - de2.xml de.dvorak.xml de.neo.xml + de1.xml + de2.xml dk1.xml + es.dvorak.xml es1.xml es2.xml es3.xml - es.dvorak.xml fi.xml - fr.xml fr.bepo.xml fr.dvarok.xml + fr.xml gb.xml gr.xml it.xml @@ -27,9 +26,9 @@ nl2.xml no.xml pl.xml + ru.legacy.xml ru1.xml ru2.xml - ru.legacy.xml si.xml sk.xml tr.xml @@ -40,5 +39,11 @@ us.xml ) -install( FILES ${coursesfiles} DESTINATION ${DATA_INSTALL_DIR}/ktouch/courses ) +file(GLOB coursefiles_GLOB RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.xml) +list(SORT coursefiles_GLOB) +if(NOT "${coursefiles}" STREQUAL "${coursefiles_GLOB}") + message(AUTHOR_WARNING "List of .xml files in data/courses differs from the list of couses") +endif() + +install( FILES ${coursefiles} DESTINATION ${DATA_INSTALL_DIR}/ktouch/courses ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktouch-4.10.97/src/CMakeLists.txt new/ktouch-4.11.0/src/CMakeLists.txt --- old/ktouch-4.10.97/src/CMakeLists.txt 2013-07-10 00:58:25.000000000 +0200 +++ new/ktouch-4.11.0/src/CMakeLists.txt 2013-08-06 14:45:09.000000000 +0200 @@ -4,8 +4,9 @@ find_package(KDeclarative REQUIRED) -find_library(X11_Xkbfile_LIB OPTIONAL) -macro_log_feature(X11_Xkbfile_FOUND "libxkb" "X Keyboard Extension" "http://www.x.org/wiki/XKB"; FALSE "" "Support for keyboard layout auto-detection in KTouch") +# Currently it is called by FindQt4, but call it explicitly +find_package(X11) +macro_log_feature(X11_Xkbfile_FOUND "libxkbfile" "X Keyboard Extension" "http://www.x.org/wiki/XKB"; FALSE "" "Support for keyboard layout auto-detection in KTouch") add_subdirectory(qml) add_subdirectory(schemata) @@ -96,6 +97,7 @@ if (X11_Xkbfile_FOUND) add_definitions(-DKTOUCH_BUILD_WITH_X11) + include_directories(${X11_Xkbfile_INCLUDE_PATH}) set(ktouch_SRCS ${ktouch_SRCS} x11_helper.cpp) else (X11_Xkbfile_FOUND) set(ktouch_SRCS ${ktouch_SRCS} keyboardlayoutmenu.cpp) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
