Git commit c265a64cdd7bdc02f983fc162cc602e865028518 by Christian Ehrlicher. Committed on 03/01/2016 at 13:41. Pushed by chehrlic into branch 'master'.
Prepare for 1.7 release M +2 -1 AUTHORS M +5 -10 CMakeLists.txt M +19 -0 ChangeLog M +3 -27 INSTALL-cmake M +4 -7 doc/index.docbook M +2 -1 src/kdesvn_part.cpp M +3 -2 src/main.cpp http://commits.kde.org/kdesvn/c265a64cdd7bdc02f983fc162cc602e865028518 diff --git a/AUTHORS b/AUTHORS index 2f526f6..a641d74 100644 --- a/AUTHORS +++ b/AUTHORS @@ -2,9 +2,10 @@ Rajko Albrecht <[email protected]> (Maintainer, main author) Andreas Richter <[email protected]> (Svnqt, CMake-Scripts) Michael Biebl <[email protected]> (Lot of bugfixes, debian port, build system) Petr Vanek <[email protected]> (lot of the kde4 port) +Christian Ehrlicher <[email protected]> (1.7 release, bugfixes) C++ subversion API in src/svncpp based on C++-Api from the RapidSVN-project -http://rapidsvn.tigris.org, ported to QT by Rajko Albrecht <[email protected]> +http://rapidsvn.tigris.org, ported to Qt by Rajko Albrecht <[email protected]> diff --git a/CMakeLists.txt b/CMakeLists.txt index cc00f4f..d4ae46a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -34,7 +34,7 @@ include (MacroLibrary) # Set the version set(KDESVN_VERSION_MAJOR 1) set(KDESVN_VERSION_MINOR 6) -set(KDESVN_VERSION_PATCH 40) +set(KDESVN_VERSION_PATCH 99) set(KDESVN_VERSION_STRING ${KDESVN_VERSION_MAJOR}.${KDESVN_VERSION_MINOR}.${KDESVN_VERSION_PATCH}) # Append the git revision if available @@ -52,16 +52,11 @@ if(EXISTS "${kdesvn_SOURCE_DIR}/.git") endif() endif() -set(TESTINGBUILD OFF CACHE BOOL "Enable/Disable special testing flags") +option(TESTINGBUILD "Enable/Disable special testing flags" OFF) if(TESTINGBUILD) - if(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION EQUAL 4) - add_definitions("-DTESTING_RC=\"\\\"\${CMAKE_SOURCE_DIR}/src/kdesvnui.rc\\\"\" -DTESTING_PARTRC=\"\\\"\${CMAKE_SOURCE_DIR}/src/kdesvn_part.rc\\\"\"") - add_definitions("-DFORCE_ASKPASS=\"\\\"\${CMAKE_BINARY_DIR}/bin/kdesvnaskpass\\\"\"") - else() - add_definitions(-DTESTING_RC=\"\\\"${CMAKE_SOURCE_DIR}/src/kdesvnui.rc\\\"\" -DTESTING_PARTRC=\"\\\"${CMAKE_SOURCE_DIR}/src/kdesvn_part.rc\\\"\") - add_definitions(-DFORCE_ASKPASS=\"\\\"${CMAKE_BINARY_DIR}/bin/kdesvnaskpass\\\"\") - add_definitions(-DEXTRA_KDE_LIBPATH=\"\\\"${PROJECT_BINARY_DIR}/lib\\\"\") - endif() + add_definitions(-DTESTING_RC=\"\\\"${CMAKE_SOURCE_DIR}/src/kdesvnui.rc\\\"\" -DTESTING_PARTRC=\"\\\"${CMAKE_SOURCE_DIR}/src/kdesvn_part.rc\\\"\") + add_definitions(-DFORCE_ASKPASS=\"\\\"${CMAKE_BINARY_DIR}/bin/kdesvnaskpass\\\"\") + add_definitions(-DEXTRA_KDE_LIBPATH=\"\\\"${PROJECT_BINARY_DIR}/lib\\\"\") add_definitions(-DDEBUG_TIMER=1) endif() diff --git a/ChangeLog b/ChangeLog index 9cdb8cd..0ffc7c8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,22 @@ +version 1.7.0: + * Bug 322021 - Action and notification strings are not really translatable + * Bug 322182 - kdesvn mangles options passed to external conflict resolver + * Bug 323403 - Add "Revert" option to context menu for files + * Bug 323712 - Subversion 1.6.x support + * Bug 324158 - kdesvn crash when a directory name contains the at (@) symbol + * Bug 325074, 330624 - kdesvn crashed when getting logs. + * Bug 332863 - Wish: Please add an "Unselect all"-buttton to commit dialoge + * Bug 340772 - Committing two moves together leads to out-of-date errors + * Bug 357297 - kdesvn crash after entering password + * ubuntu bug: 619249 tcp ports specified in urls are being ignored when using svn:https + * speedup db insertions into log-cache + * various code cleanups (krazy, cppcheck, preparation for KF5) + * libsvnqt is now a private helper lib to be able to do a major cleanup + * remove last pieces from Qt3support + * don't show disabled actions in contextmenu + * highlight trailing spaces in diff output on modified lines + * fix filtering in commit dialog + version 1.6.0: * User may add (or remove) patterns to ignore recursive * greek translation diff --git a/INSTALL-cmake b/INSTALL-cmake index 561a12e..8f1b597 100644 --- a/INSTALL-cmake +++ b/INSTALL-cmake @@ -1,24 +1,6 @@ -Note for failed linking -======================= -Seems that on some systems linking fails due missing references. You may -solve it with - -. /etc/profile.d/qt.sh -export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include - -before running cmake. -On some systems cmake doesn't detect that it is a threaded qt-version. So you should -do - -export CXXFLAGS="-DQT_THREAD_SUPPORT" - -before running cmake. -(Or give it as parameter to cmake with -DCMAKE_CXX_FLAGS="-DQT_THREAD_SUPPORT") - - Prepare install =============== -You require at least cmake 2.4, kde 4.2 and subversion 1.4. In source-tree-build are mostly unwanted, so +You require at least cmake 2.8.12, kde 4.9 and subversion 1.4. In source-tree-build are mostly unwanted, so make a subdir called "kdesvn-build" and change to it. Basic installation @@ -33,21 +15,17 @@ Important parameters to cmake: -DCMAKE_BUILD_TYPE=<buildtype> <buildtype> may current one of "Debug", "Release", "ReleaseWithDebInfo" -or "MINSIZEREL" +or "MinSizeRel" -DCMAKE_INSTALL_PREFIX=<prefix> Default to "/usr/local" -DSUBVERSION_INSTALL_PATH=<subversionlib-install-prefix> -Where is subversion-lib installed. Default check in /usr and /usr/local +Where is subversion-lib installed if not in default path. Default check in /usr and /usr/local -DCMAKE_CXX_FLAGS=<some extra flags> Extra flags for the c++ compiler for your system required. --DLIB_SUFFIX=<suffix> -Mostly for 64bit systems, there suffix may be 64 so libs will installed -in /usr/lib64 and not /usr/lib for instance. - After calling cmake just type make and build begins. When more output is wanted call @@ -68,5 +46,3 @@ If you require extra flags for compiler and linker you may give them via environ "CXXFLAGS" (c++ compiler) "LDFLAGS" (for linker) "CFLAGS" (for c-compiler, not needed in kdesvn build) - -eg., it may usefull on 64bit systems "-m64" to CXXFLAGS and LDFLAGS. diff --git a/doc/index.docbook b/doc/index.docbook index c1373ac..546cd9e 100644 --- a/doc/index.docbook +++ b/doc/index.docbook @@ -2294,19 +2294,16 @@ Documentation copyright 2005-2006 &Rajko.Albrecht; &Rajko.Albrecht.mail; <sect1 id="getting-kdesvn"> <title>How to obtain &kdesvn;</title> -<!-- This first entity contains boiler plate for applications that are -part of KDE CVS. You should remove it if you are releasing your -application --> <para> &kdesvn; itself can be found -at <ulink url="http://kdesvn.alwins-world.de/trac.fcgi/downloads/";> +at <ulink url="https://projects.kde.org/kdesvn/downloads/";> the &kdesvn; download area</ulink>. </para> <para> -You may get <ulink url="https://projects.kde.org/projects/playground/devtools/kdesvn";>latest repository version</ulink> when looking whats going on. +You may get <ulink url="https://projects.kde.org/kdesvn/repository/";>latest repository version</ulink> when looking whats going on. </para> <para> -The homepage of that project is <ulink url="http://kdesvn.alwins-world.de/";>here</ulink> +The homepage of that project is <ulink url="https://projects.kde.org/kdesvn";>here</ulink> </para> </sect1> @@ -2336,7 +2333,7 @@ distributor should have packages for your system and/or distribution. or the ChangeLog file, or ... --> <para> You can find a list of changes at <ulink -url="https://projects.kde.org/projects/playground/devtools/kdesvn/activity";>this page</ulink>. +url="https://projects.kde.org/kdesvn/activity/";>this page</ulink>. </para> </sect1> diff --git a/src/kdesvn_part.cpp b/src/kdesvn_part.cpp index 8a3616d..d8b9dde 100644 --- a/src/kdesvn_part.cpp +++ b/src/kdesvn_part.cpp @@ -168,8 +168,9 @@ KAboutData *kdesvnpart::createAboutData() 0L); about.addAuthor(ki18n("Rajko Albrecht"), ki18n("Original author and maintainer"), "[email protected]"); + about.addAuthor(ki18n("Christian Ehrlicher"), ki18n("Developer"), "[email protected]"); + about.setHomepage("https://projects.kde.org/kdesvn";); about.setOtherText(m_Extratext); - about.setHomepage("https://projects.kde.org/projects/playground/devtools/kdesvn";); about.setProgramIconName("kdesvn"); return &about; } diff --git a/src/main.cpp b/src/main.cpp index 163ea3e..c25e539 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -36,8 +36,9 @@ int main(int argc, char **argv) { KAboutData about(QByteArray("kdesvn"), QByteArray("kdesvn"), ki18n("kdesvn"), QByteArray(version), ki18n(description), KAboutData::License_GPL, ki18n("(C) 2005-2009 Rajko Albrecht")); - about.addAuthor(ki18n("Rajko Albrecht"), ki18n("Developer"), QByteArray("[email protected]"), QByteArray()); - about.setHomepage("https://projects.kde.org/projects/playground/devtools/kdesvn";); + about.addAuthor(ki18n("Rajko Albrecht"), ki18n("Original author and maintainer"), "[email protected]"); + about.addAuthor(ki18n("Christian Ehrlicher"), ki18n("Developer"), "[email protected]"); + about.setHomepage("https://projects.kde.org/kdesvn";); KCmdLineArgs::init(argc, argv, &about); KCmdLineOptions options; _______________________________________________ kde-doc-english mailing list [email protected] https://mail.kde.org/mailman/listinfo/kde-doc-english
