Hello community,
here is the log from the commit of package kdesvn
checked in at Tue Sep 9 00:02:03 CEST 2008.
--------
--- KDE/kdesvn/kdesvn.changes 2008-08-18 14:03:20.000000000 +0200
+++ /mounts/work_src_done/STABLE/kdesvn/kdesvn.changes 2008-09-08 23:14:09.000000000 +0200
@@ -1,0 +2,9 @@
+Mon Sep 8 23:13:58 CEST 2008 - dmueller@suse.de
+
+- update to 1.0.1:
+ * fixed a crasher with svn 1.5
+ * some smaller fixes
+ * various bugfixes in buildsystem, build failure with svn 1.3
+ * improvement in handling of logcache errors
+
+-------------------------------------------------------------------
Old:
----
kdesvn-1.0.0.tar.bz2
New:
----
kdesvn-1.0.1.tar.bz2
remove-nl.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdesvn.spec ++++++
--- /var/tmp/diff_new_pack.I21552/_old 2008-09-09 00:01:18.000000000 +0200
+++ /var/tmp/diff_new_pack.I21552/_new 2008-09-09 00:01:18.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kdesvn (Version 1.0.0)
+# spec file for package kdesvn (Version 1.0.1)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -20,15 +20,16 @@
Name: kdesvn
BuildRequires: kdelibs3-devel libapr-util1-devel libapr1-devel
-BuildRequires: ImageMagick cmake openldap2-devel subversion-devel
+BuildRequires: ImageMagick cmake openldap2-devel sqlite3-devel subversion-devel
License: GPL v2 or later
Group: Development/Tools/Version Control
Summary: KDE Subversion Client
-Version: 1.0.0
+Version: 1.0.1
Release: 1
Source: %name-%version.tar.bz2
Patch: FIXME.diff
Patch1: remove-duplicated-group.diff
+Patch2: remove-nl.diff
Url: http://www.alwins-world.de/programs/kdesvn/index.html
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -74,12 +75,7 @@
%setup -q
%patch
%patch1
-cd doc/en
-for i in *png; do
- cp $i $i.tmp
- rm -f $i
- mv $i.tmp $i
-done
+%patch2
. /etc/opt/kde3/common_options
%build
@@ -149,6 +145,12 @@
/opt/kde3/%_lib/libsvnqt.so.*
%changelog
+* Tue Sep 09 2008 dmueller@suse.de
+- update to 1.0.1:
+ * fixed a crasher with svn 1.5
+ * some smaller fixes
+ * various bugfixes in buildsystem, build failure with svn 1.3
+ * improvement in handling of logcache errors
* Mon Aug 18 2008 stbinner@suse.de
- update to 1.0.0:
* implemented a sqlite-based logcache used by revision tree
++++++ FIXME.diff ++++++
--- /var/tmp/diff_new_pack.I21552/_old 2008-09-09 00:01:19.000000000 +0200
+++ /var/tmp/diff_new_pack.I21552/_new 2008-09-09 00:01:19.000000000 +0200
@@ -1,14 +1,3 @@
---- src/kdesvn.desktop 2007/06/21 08:46:18 1.1
-+++ src/kdesvn.desktop 2007/06/21 08:46:25
-@@ -13,7 +13,7 @@
- Comment[nl]=Een Subversion-client voor KDE
- Comment[es]=Un cliente de Subversion para KDE
- Terminal=false
--MimeType=inode/directory
-+MimeType=inode/directory;
- ServiceTypes=KParts/ReadOnlyPart,Browser/View
- X-KDE-BrowserView-Args=DetailedList
- X-KDE-Library=libkdesvnpart
--- ./src/kdesvnd/kdesvn_subversion.desktop.in 2007/06/21 08:54:56 1.1
+++ ./src/kdesvnd/kdesvn_subversion.desktop.in 2007/06/21 08:55:29
@@ -363,6 +363,6 @@
++++++ kdesvn-1.0.0.tar.bz2 -> kdesvn-1.0.1.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesvn-1.0.0/ChangeLog new/kdesvn-1.0.1/ChangeLog
--- old/kdesvn-1.0.0/ChangeLog 2008-07-29 23:33:30.000000000 +0200
+++ new/kdesvn-1.0.1/ChangeLog 2008-08-30 09:54:00.000000000 +0200
@@ -1,3 +1,9 @@
+version 1.0.1
+ * fixed a crasher with svn 1.5
+ * some smaller fixes
+ * various bugfixes in buildsystem, build failure with svn 1.3
+ * improvement in handling of logcache errors
+
version 1.0.0
* implemented a sqlite-based logcache used by revision tree
* removed support for subversion prior 1.3
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesvn-1.0.0/CMakeLists.txt new/kdesvn-1.0.1/CMakeLists.txt
--- old/kdesvn-1.0.0/CMakeLists.txt 2008-08-05 20:16:53.000000000 +0200
+++ new/kdesvn-1.0.1/CMakeLists.txt 2008-08-20 14:40:32.000000000 +0200
@@ -1,6 +1,6 @@
PROJECT(kdesvn)
CMAKE_MINIMUM_REQUIRED(VERSION 2.4)
-SET(BASE_VERSION 1.0.0)
+SET(BASE_VERSION 1.0.1)
OPTION(BUILD_TESTS "Building the tests yes or no (default off)")
OPTION(DAILY_BUILD "Generate version number for a daily build (default off)")
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesvn-1.0.0/doc/CMakeLists.txt new/kdesvn-1.0.1/doc/CMakeLists.txt
--- old/kdesvn-1.0.0/doc/CMakeLists.txt 2008-07-25 10:47:48.000000000 +0200
+++ new/kdesvn-1.0.1/doc/CMakeLists.txt 2008-08-06 16:53:14.000000000 +0200
@@ -1,7 +1,7 @@
#first straigth forward until we have a doc translation
MACRO (GENBOOK _language_code)
- FILE(GLOB docimages ${_language_code}/hi128-filesys-*.png)
+ FILE(GLOB docimages RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/${_language_code} ${_language_code}/hi128-filesys-*.png)
ADD_CUSTOM_COMMAND(
OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/${_language_code}_index.cache.bz2
COMMAND
@@ -10,7 +10,6 @@
${CMAKE_CURRENT_SOURCE_DIR}/${_language_code}/index.docbook
DEPENDS
${CMAKE_CURRENT_SOURCE_DIR}/${_language_code}/index.docbook
- ${docimages}
)
INSTALL(FILES
${CMAKE_CURRENT_SOURCE_DIR}/${_language_code}_index.cache.bz2
@@ -20,12 +19,21 @@
)
INSTALL(FILES
${CMAKE_CURRENT_SOURCE_DIR}/${_language_code}/index.docbook
- ${docimages}
DESTINATION ${HTML_INSTALL_DIR}/${_language_code}/kdesvn
)
+
+ FOREACH(_img ${docimages})
+ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${_language_code}/${_img}
+ ${CMAKE_CURRENT_BINARY_DIR}/${_language_code}/${_img}
+ COPYONLY
+ )
+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${_language_code}/${_img}
+ DESTINATION ${HTML_INSTALL_DIR}/${_language_code}/kdesvn
+ )
+ ENDFOREACH(_img)
+
ADD_CUSTOM_TARGET(${_language_code}_doc
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_language_code}_index.cache.bz2
-# COMMENT "Building doc language ${_language_code}"
)
ADD_DEPENDENCIES(doc ${_language_code}_doc)
Files old/kdesvn-1.0.0/doc/en/hi128-filesys-kdesvnadded.png and new/kdesvn-1.0.1/doc/en/hi128-filesys-kdesvnadded.png differ
Files old/kdesvn-1.0.0/doc/en/hi128-filesys-kdesvnconflicted.png and new/kdesvn-1.0.1/doc/en/hi128-filesys-kdesvnconflicted.png differ
Files old/kdesvn-1.0.0/doc/en/hi128-filesys-kdesvndeleted.png and new/kdesvn-1.0.1/doc/en/hi128-filesys-kdesvndeleted.png differ
Files old/kdesvn-1.0.0/doc/en/hi128-filesys-kdesvnlocked.png and new/kdesvn-1.0.1/doc/en/hi128-filesys-kdesvnlocked.png differ
Files old/kdesvn-1.0.0/doc/en/hi128-filesys-kdesvnmodified.png and new/kdesvn-1.0.1/doc/en/hi128-filesys-kdesvnmodified.png differ
Files old/kdesvn-1.0.0/doc/en/hi128-filesys-kdesvnneedlock.png and new/kdesvn-1.0.1/doc/en/hi128-filesys-kdesvnneedlock.png differ
Files old/kdesvn-1.0.0/doc/en/hi128-filesys-kdesvnupdates.png and new/kdesvn-1.0.1/doc/en/hi128-filesys-kdesvnupdates.png differ
Files old/kdesvn-1.0.0/doc/en_index.cache.bz2 and new/kdesvn-1.0.1/doc/en_index.cache.bz2 differ
Files old/kdesvn-1.0.0/doc/nl/hi128-filesys-kdesvnadded.png and new/kdesvn-1.0.1/doc/nl/hi128-filesys-kdesvnadded.png differ
Files old/kdesvn-1.0.0/doc/nl/hi128-filesys-kdesvnconflicted.png and new/kdesvn-1.0.1/doc/nl/hi128-filesys-kdesvnconflicted.png differ
Files old/kdesvn-1.0.0/doc/nl/hi128-filesys-kdesvndeleted.png and new/kdesvn-1.0.1/doc/nl/hi128-filesys-kdesvndeleted.png differ
Files old/kdesvn-1.0.0/doc/nl/hi128-filesys-kdesvnlocked.png and new/kdesvn-1.0.1/doc/nl/hi128-filesys-kdesvnlocked.png differ
Files old/kdesvn-1.0.0/doc/nl/hi128-filesys-kdesvnmodified.png and new/kdesvn-1.0.1/doc/nl/hi128-filesys-kdesvnmodified.png differ
Files old/kdesvn-1.0.0/doc/nl/hi128-filesys-kdesvnneedlock.png and new/kdesvn-1.0.1/doc/nl/hi128-filesys-kdesvnneedlock.png differ
Files old/kdesvn-1.0.0/doc/nl/hi128-filesys-kdesvnupdates.png and new/kdesvn-1.0.1/doc/nl/hi128-filesys-kdesvnupdates.png differ
Files old/kdesvn-1.0.0/doc/nl_index.cache.bz2 and new/kdesvn-1.0.1/doc/nl_index.cache.bz2 differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesvn-1.0.0/Helperstuff/BuildService/kdesvn.spec.in new/kdesvn-1.0.1/Helperstuff/BuildService/kdesvn.spec.in
--- old/kdesvn-1.0.0/Helperstuff/BuildService/kdesvn.spec.in 2008-07-25 10:47:48.000000000 +0200
+++ new/kdesvn-1.0.1/Helperstuff/BuildService/kdesvn.spec.in 2008-08-06 22:13:44.000000000 +0200
@@ -1,12 +1,11 @@
# norootforbuild
-Summary: A subversion client for the KDE with KIO integration.
+Summary: A subversion client for the KDE with KIO integration
Name: kdesvn
Version: @VERSION@
Release: 1
License: LGPL
Vendor: Rajko Albrecht
Url: http://kdesvn.alwins-world.de
-Packager: Rajko Albrecht
Group: Development/Tools
Source: kdesvn-%version.tar.bz2
BuildRoot: %{_tmppath}/%{name}-root
@@ -14,7 +13,7 @@
Requires: /usr/bin/dot
BuildRequires: cmake >= 2.4
BuildRequires: gcc-c++
-BuildPreReq: sqlite-devel
+BuildRequires: sqlite-devel
BuildRequires: subversion-devel
%if 0%{?fedora_version} > 0 || 0%{?rhel_version} > 0 || 0%{?centos_version} > 0
@@ -47,7 +46,7 @@
%description
Kdesvn is a subversion client for KDE.
It may used as standalone application or plugin (KPart). Base functions are provided
-via a KIO protocoll, too.
+via a KIO protocol, too.
%package kiosvn
Requires: kdesvn = %{version}
@@ -59,16 +58,15 @@
%package devel
Group: Development/Libraries
-Summary: Wrapper lib for subversion QT integration.
-Requires: subversion-devel >= 1.2.0
+Summary: Wrapper lib for subversion QT integration
+Requires: subversion-devel >= 1.3.0
Requires: kdesvn = %{version}
-Obsoletes: kdesvn-svnqt-devel
%description devel
-Development files for kdesvn.
+Development files for kdesvn. It is required when you plan use svnqt wrapper library in your own application.
%prep
-%setup
+%setup -q
mkdir build
cd build
cmake ../ -DCMAKE_INSTALL_PREFIX=`kde-config --prefix` -DCMAKE_BUILD_TYPE=Release -DLIB_SUFFIX=`kde-config --libsuffix`
@@ -82,14 +80,16 @@
%install
cd build
+rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
+gzip $RPM_BUILD_ROOT/%{_datadir}/man/man1/*
%clean
-rm -rf $RPM_BUILD_ROOT/*
-rm -rf $RPM_BUILD_DIR/kdesvn
+rm -rf $RPM_BUILD_ROOT
%files
+%defattr(-,root,root)
%{_bindir}/kdesvn
%{_bindir}/kdesvnaskpass
%{_libdir}/*/*part*
@@ -108,11 +108,15 @@
%{_datadir}/services/ksvn*.protocol
%{_datadir}/man/man1/*
%{_libdir}/libsvnqt*.so*
+%doc AUTHORS ChangeLog GPL.txt TODO COPYING COPYING.OpenSSL
%files kiosvn
+%defattr(-,root,root)
%{_datadir}/services/svn*.protocol
%files devel
+%defattr(-,root,root)
%dir %{_includedir}/svnqt
%{_includedir}/svnqt/*
+%changelog
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesvn-1.0.0/kdesvn.spec new/kdesvn-1.0.1/kdesvn.spec
--- old/kdesvn-1.0.0/kdesvn.spec 2008-08-05 20:24:26.000000000 +0200
+++ new/kdesvn-1.0.1/kdesvn.spec 2008-08-30 09:55:59.000000000 +0200
@@ -1,28 +1,25 @@
Summary: A subversion client for the KDE with KIO integration.
Name: kdesvn
-Version: 1.0.0
+Version: 1.0.1
Release: 1%{?dist}
License: LGPL
Vendor: Rajko Albrecht
Url: http://kdesvn.alwins-world.de
-Packager: Rajko Albrecht
Group: Development/Tools
Source: kdesvn-%version.tar.bz2
BuildRoot: %{_tmppath}/%{name}-root
-Obsoletes: kdesvn-kioksvn kdesvn-svnqt
-Requires: subversion >= 1.3.0
Requires: /usr/bin/dot
-BuildPreReq: apr-devel
-BuildPreReq: apr-util-devel
-BuildPreReq: subversion-devel >= 1.3.0
-BuildPreReq: cmake >= 2.4
-BuildPreReq: sqlite-devel
-BuildPreReq: kdelibs-devel >= 3.4
+BuildRequires: apr-devel
+BuildRequires: apr-util-devel
+BuildRequires: subversion-devel >= 1.3.0
+BuildRequires: cmake >= 2.4
+BuildRequires: sqlite-devel
+BuildRequires: kdelibs-devel >= 3.4
%description
Kdesvn is a subversion client for KDE.
It may used as standalone application or plugin (KPart). Base functions are provided
-via a KIO protocoll, too.
+via a KIO protocol, too.
%package kiosvn
Requires: kdesvn = %{version}
@@ -37,13 +34,12 @@
Summary: Wrapper lib for subversion QT integration.
Requires: subversion-devel >= 1.2.0
Requires: kdesvn = %{version}
-Obsoletes: kdesvn-svnqt-devel
%description devel
Development files for kdesvn.
%prep
-%setup
+%setup -q
mkdir build
cd build
cmake ../ -DCMAKE_INSTALL_PREFIX=`kde-config --prefix` -DCMAKE_BUILD_TYPE=Release -DLIB_SUFFIX=`kde-config --libsuffix`
@@ -60,7 +56,9 @@
%install
cd build
+rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
+gzip $RPM_BUILD_ROOT/%{_datadir}/man/man1/*
%clean
rm -rf $RPM_BUILD_ROOT/*
@@ -68,6 +66,7 @@
%files
+%defattr(-,root,root)
%{_bindir}/kdesvn
%{_bindir}/kdesvnaskpass
%{_libdir}/*/*part*
@@ -86,10 +85,14 @@
%{_datadir}/services/ksvn*.protocol
%{_datadir}/man/man1/*
%{_libdir}/libsvnqt*.so*
+%doc AUTHORS ChangeLog GPL.txt TODO COPYING COPYING.OpenSSL
%files kiosvn
+%defattr(-,root,root)
%{_datadir}/services/svn*.protocol
%files devel
+%defattr(-,root,root)
%{_includedir}/svnqt/*
+%changelog
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesvn-1.0.0/kdesvn.spec.in new/kdesvn-1.0.1/kdesvn.spec.in
--- old/kdesvn-1.0.0/kdesvn.spec.in 2008-07-25 10:47:48.000000000 +0200
+++ new/kdesvn-1.0.1/kdesvn.spec.in 2008-08-06 22:13:44.000000000 +0200
@@ -5,24 +5,21 @@
License: LGPL
Vendor: Rajko Albrecht
Url: http://kdesvn.alwins-world.de
-Packager: Rajko Albrecht
Group: Development/Tools
Source: kdesvn-%version.tar.bz2
BuildRoot: %{_tmppath}/%{name}-root
-Obsoletes: kdesvn-kioksvn kdesvn-svnqt
-Requires: subversion >= 1.3.0
Requires: /usr/bin/dot
-BuildPreReq: apr-devel
-BuildPreReq: apr-util-devel
-BuildPreReq: subversion-devel >= 1.3.0
-BuildPreReq: cmake >= 2.4
-BuildPreReq: sqlite-devel
-BuildPreReq: kdelibs-devel >= 3.4
+BuildRequires: apr-devel
+BuildRequires: apr-util-devel
+BuildRequires: subversion-devel >= 1.3.0
+BuildRequires: cmake >= 2.4
+BuildRequires: sqlite-devel
+BuildRequires: kdelibs-devel >= 3.4
%description
Kdesvn is a subversion client for KDE.
It may used as standalone application or plugin (KPart). Base functions are provided
-via a KIO protocoll, too.
+via a KIO protocol, too.
%package kiosvn
Requires: kdesvn = %{version}
@@ -37,13 +34,12 @@
Summary: Wrapper lib for subversion QT integration.
Requires: subversion-devel >= 1.2.0
Requires: kdesvn = %{version}
-Obsoletes: kdesvn-svnqt-devel
%description devel
Development files for kdesvn.
%prep
-%setup
+%setup -q
mkdir build
cd build
cmake ../ -DCMAKE_INSTALL_PREFIX=`kde-config --prefix` -DCMAKE_BUILD_TYPE=Release -DLIB_SUFFIX=`kde-config --libsuffix`
@@ -60,7 +56,9 @@
%install
cd build
+rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
+gzip $RPM_BUILD_ROOT/%{_datadir}/man/man1/*
%clean
rm -rf $RPM_BUILD_ROOT/*
@@ -68,6 +66,7 @@
%files
+%defattr(-,root,root)
%{_bindir}/kdesvn
%{_bindir}/kdesvnaskpass
%{_libdir}/*/*part*
@@ -86,10 +85,14 @@
%{_datadir}/services/ksvn*.protocol
%{_datadir}/man/man1/*
%{_libdir}/libsvnqt*.so*
+%doc AUTHORS ChangeLog GPL.txt TODO COPYING COPYING.OpenSSL
%files kiosvn
+%defattr(-,root,root)
%{_datadir}/services/svn*.protocol
%files devel
+%defattr(-,root,root)
%{_includedir}/svnqt/*
+%changelog
\ No newline at end of file
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesvn-1.0.0/po/es.po new/kdesvn-1.0.1/po/es.po
--- old/kdesvn-1.0.0/po/es.po 2008-07-29 23:33:30.000000000 +0200
+++ new/kdesvn-1.0.1/po/es.po 2008-08-06 11:24:50.000000000 +0200
@@ -8,7 +8,7 @@
"Project-Id-Version: es\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2008-07-29 23:32+0200\n"
-"PO-Revision-Date: 2008-06-18 17:43+0200\n"
+"PO-Revision-Date: 2008-08-06 01:12+0200\n"
"Last-Translator: Mario Palomo Torrero \n"
"Language-Team: es_ES \n"
"MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@
#: kdesvnview.cpp:473
msgid "Inserted %v not cached log entries of %m."
-msgstr ""
+msgstr "Insertadas %v entradas de registro no cacheadas de %m."
#: kdesvnd/main.cpp:32
msgid "Kdesvn DCOP service"
@@ -126,7 +126,7 @@
#: rc.cpp:21
#, no-c-format
msgid "Logcache"
-msgstr ""
+msgstr "Logcache"
#: rc.cpp:27 rc.cpp:30 rc.cpp:33 rc.cpp:36
#, no-c-format
@@ -165,8 +165,7 @@
#: rc.cpp:60
#, no-c-format
-msgid ""
-"The minimum a log output must contain before kdesvn shows a single logwindow"
+msgid "The minimum a log output must contain before kdesvn shows a single logwindow"
msgstr ""
"El mínimo que una salida de registro debe contener antes de que kdesvn "
"muestre una ventana con el registro"
@@ -273,14 +272,12 @@
#: rc.cpp:112
#, no-c-format
msgid "Automatic update of logcache"
-msgstr ""
+msgstr "Actualización automática de logcache"
#: rc.cpp:115
-#, fuzzy, no-c-format
-msgid ""
-"If set start filling the logcache when open a repository or working copy"
-msgstr ""
-"Iniciar comprobación de actualizaciones cuando se abre una copia de trabajo"
+#, no-c-format
+msgid "If set start filling the logcache when open a repository or working copy"
+msgstr "Si se establece, se inicia el relleno del logcache al abrir un repositorio o una copia de trabajo"
#: rc.cpp:118
#, no-c-format
@@ -290,6 +287,9 @@
"\n"
"If networking is disabled, then this flag is ignored."
msgstr ""
+"Establece si el logcache interno se debe actualizar después de abrir una copia de trabajo o un repositorio o después de una confirmación en una copia de trabajo.\n"
+"\n"
+"Si la red está deshabilitada, entonces esta etiqueta se ignora."
#: rc.cpp:123
#, no-c-format
@@ -338,8 +338,7 @@
#: rc.cpp:145
#, no-c-format
msgid "Start check for updates when open a working copy"
-msgstr ""
-"Iniciar comprobación de actualizaciones cuando se abre una copia de trabajo"
+msgstr "Iniciar comprobación de actualizaciones cuando se abre una copia de trabajo"
#: rc.cpp:149
#, no-c-format
@@ -349,27 +348,24 @@
"trabajo"
#: rc.cpp:152
-#, fuzzy, no-c-format
+#, no-c-format
msgid "Start fill log cache on open"
-msgstr "Rellenando cache de registros en segundo plano"
+msgstr "Inicio del relleno del logcache al abrir"
#: rc.cpp:155
-#, fuzzy, no-c-format
+#, no-c-format
msgid "Start refresh the logcache for repository when networking enabled"
-msgstr ""
-"Iniciar comprobación de actualizaciones cuando se abre una copia de trabajo"
+msgstr "Inicio del refresco del logcache para el repositorio cuando la red está habilitada"
#: rc.cpp:158
#, no-c-format
msgid "Check if items has \"svn:needs-lock\" property set"
-msgstr ""
-"Comprobar si los elementos tienen establecida la propiedad \"svn:needs-lock\""
+msgstr "Comprobar si los elementos tienen establecida la propiedad \"svn:needs-lock\""
#: rc.cpp:161
#, no-c-format
msgid "When listing on working copies kdesvn may check for this property"
-msgstr ""
-"Kdesvn puede comprobar esta propiedad mientras escucha en copias de trabajo"
+msgstr "Kdesvn puede comprobar esta propiedad mientras escucha en copias de trabajo"
#: rc.cpp:164
#, no-c-format
@@ -477,8 +473,7 @@
#: rc.cpp:208
#, no-c-format
-msgid ""
-"When saving passwords, do it into KDE wallet instead of subversions storage?"
+msgid "When saving passwords, do it into KDE wallet instead of subversions storage?"
msgstr ""
"Al guardar contraseñas, ¿hacerlo en la Cartera de KDE en vez de en almacenes "
"de Subversion?"
@@ -509,14 +504,14 @@
"de kde, o bien no guardar las contraseñas en ningún sitio.</p>"
#: rc.cpp:216
-#, fuzzy, no-c-format
+#, no-c-format
msgid "Use internal password cache"
-msgstr "Por favor, introduzca su contraseña abajo."
+msgstr "Utilizar clave de cache interna"
#: rc.cpp:219
#, no-c-format
msgid "Use an internal password cache"
-msgstr ""
+msgstr "Utilizar una clave de cache interna"
#: rc.cpp:222
#, no-c-format
@@ -562,14 +557,12 @@
#: rc.cpp:247
#, no-c-format
msgid "Should unversioned items displayed in commit dialog or not."
-msgstr ""
-"Si elementos no versionados se mostrarán o no en el dialogo de confirmación."
+msgstr "Si elementos no versionados se mostrarán o no en el dialogo de confirmación."
#: rc.cpp:250
#, no-c-format
msgid "Maximum displayed logs when full log (0 for no limit)"
-msgstr ""
-"Máximo número de registros mostrados cuando está lleno (0 para ningún límite)"
+msgstr "Máximo número de registros mostrados cuando está lleno (0 para ningún límite)"
#: rc.cpp:253
#, no-c-format
@@ -672,8 +665,7 @@
#: rc.cpp:321
#, no-c-format
-msgid ""
-"Set if merge with external program is prefered and not subversions merge"
+msgid "Set if merge with external program is prefered and not subversions merge"
msgstr ""
"Establece si se prefiere un programa de fusionado externo y no el fusionado "
"de subversion"
@@ -1003,8 +995,7 @@
#: rc.cpp:528
#, no-c-format
msgid "Select the storage type of repository (FSFS or Berkely DB)"
-msgstr ""
-"Seleccione el tipo de almacenamiento del repositorio (FSFS o DB Berkeley)"
+msgstr "Seleccione el tipo de almacenamiento del repositorio (FSFS o DB Berkeley)"
#: rc.cpp:531
#, no-c-format
@@ -1019,8 +1010,7 @@
#: rc.cpp:538
#, no-c-format
msgid "Disable automatic log file removal (BDB only)"
-msgstr ""
-"Deshabilitar eliminación automática del fichero de registro (sólo para BDB)"
+msgstr "Deshabilitar eliminación automática del fichero de registro (sólo para BDB)"
#: rc.cpp:542
#, no-c-format
@@ -1401,8 +1391,7 @@
#: rc.cpp:797
#, no-c-format
msgid "Select in first column revisions for diff"
-msgstr ""
-"Seleccione en la primera columna las revisiones para mostrar diferencias"
+msgstr "Seleccione en la primera columna las revisiones para mostrar diferencias"
#: rc.cpp:800 rc.cpp:850 ksvnwidgets/logmsg_impl.cpp:89
#: ksvnwidgets/logmsg_impl.cpp:116
@@ -1531,7 +1520,7 @@
#: rc.cpp:884
#, no-c-format
msgid "Insert Textfile"
-msgstr ""
+msgstr "Insertar Fichero de Texto"
#: rc.cpp:887
#, no-c-format
@@ -1836,9 +1825,8 @@
msgstr "Ocultar ficheros sin cambios"
#: kdesvn_part.cpp:203
-#, fuzzy
msgid "Work online"
-msgstr "Mostrar línea"
+msgstr "Trabajar conectado"
#: kdesvn_part.cpp:211
msgid "&Configure %1..."
@@ -2132,9 +2120,8 @@
msgstr "Propiedad modificada"
#: svnfrontend/fillcachethread.cpp:96
-#, fuzzy
msgid "Filling cache canceled."
-msgstr "Rellenando cache de registros en segundo plano"
+msgstr "Relleno de cache cancelado."
#: svnfrontend/fillcachethread.cpp:113
msgid "Cache filled up to revision %1"
@@ -2417,8 +2404,7 @@
#: svnfrontend/editproperty_impl.cpp:43 svnfrontend/editproperty_impl.cpp:79
msgid "One of <b>'native'</b>, <b>'LF'</b>, <b>'CR'</b>, <b>'CRLF'</b></b>."
-msgstr ""
-"Uno de los <b>'nativos'</b>, <b>'LF'</b>, <b>'CR'</b>, <b>'CRLF'</b></b>."
+msgstr "Uno de los <b>'nativos'</b>, <b>'LF'</b>, <b>'CR'</b>, <b>'CRLF'</b></b>."
#: svnfrontend/editproperty_impl.cpp:44 svnfrontend/editproperty_impl.cpp:80
msgid ""
@@ -2496,8 +2482,7 @@
"ignorar."
#: svnfrontend/editproperty_impl.cpp:96
-msgid ""
-"Label text to show for the edit box where the user enters the issue number."
+msgid "Label text to show for the edit box where the user enters the issue number."
msgstr ""
"Etiqueta de texto para mostrar la caja de edición donde el usuario introduce "
"el número de emisión."
@@ -2733,7 +2718,7 @@
#: svnfrontend/svnactions.cpp:922
msgid "Not commiting because networking is disabled"
-msgstr ""
+msgstr "No se confirma porque la red está deshabilitada"
#: svnfrontend/svnactions.cpp:942 svnfrontend/svnactions.cpp:2259
msgid "Status / List"
@@ -2768,9 +2753,8 @@
msgstr "Descargando - pulse cancelar para abortar"
#: svnfrontend/svnactions.cpp:1090
-#, fuzzy
msgid "Can not do this diff because networking is disabled."
-msgstr "Terminada la comprobación de actualizaciones"
+msgstr "No se puede hacer el diff porque la red está deshabilitada"
#: svnfrontend/svnactions.cpp:1133
msgid "Both entries seems to be the same, can not diff."
@@ -2851,8 +2835,7 @@
#: svnfrontend/svnactions.cpp:1699
msgid "<center>The entry<br>%1<br>is not versioned - break.</center>"
-msgstr ""
-"<center>La entrada<br>%1<br>no está versionada - interrumpido.</center>"
+msgstr "<center>La entrada<br>%1<br>no está versionada - interrumpido.</center>"
#: svnfrontend/svnactions.cpp:1722
msgid "Revert entries"
@@ -2984,21 +2967,19 @@
#: svnfrontend/svnactions.cpp:2505
msgid "Not filling logcache because networking is disabled"
-msgstr ""
+msgstr "No se rellena el logcache porque la red está deshabilitada"
#: svnfrontend/svnactions.cpp:2513
msgid "Filling log cache in background"
msgstr "Rellenando cache de registros en segundo plano"
#: svnfrontend/svnactions.cpp:2540
-#, fuzzy
msgid "Filling log cache in background finished."
-msgstr "Rellenando cache de registros en segundo plano"
+msgstr "Finalizado el relleno de logcache en segundo plano."
#: svnfrontend/svnactions.cpp:2559
-#, fuzzy
msgid "Not checking for updates because networking is disabled"
-msgstr "Terminada la comprobación de actualizaciones"
+msgstr "No se chequean actualizaciones porque la red está deshabilitada."
#: svnfrontend/svnactions.cpp:2566
msgid "Checking for updates started in background"
@@ -3094,8 +3075,7 @@
#: svnfrontend/kdesvnfilelist.cpp:275
msgid "Display last changes as difference to previous commit."
-msgstr ""
-"Muestra los últimos cambios como diferencias con la confirmación previa."
+msgstr "Muestra los últimos cambios como diferencias con la confirmación previa."
#: svnfrontend/kdesvnfilelist.cpp:277
msgid "Details"
@@ -3106,8 +3086,7 @@
msgstr "Comprobar actualizaciones"
#: svnfrontend/kdesvnfilelist.cpp:284
-msgid ""
-"Check if current working copy has items with newer version in repository"
+msgid "Check if current working copy has items with newer version in repository"
msgstr ""
"Comprueba si la copia de trabajo tiene elementos con versiones más nuevas en "
"el repositorio"
@@ -3142,8 +3121,7 @@
#: svnfrontend/kdesvnfilelist.cpp:298
msgid "Output the content of specified files or URLs at specific revision."
-msgstr ""
-"Muestra el contenido de ficheros o URLs concretos con versión indicada."
+msgstr "Muestra el contenido de ficheros o URLs concretos con versión indicada."
#: svnfrontend/kdesvnfilelist.cpp:300
msgid "Lock current items"
@@ -3175,8 +3153,7 @@
#: svnfrontend/kdesvnfilelist.cpp:316
msgid "Browse folder for unversioned items and add them if wanted."
-msgstr ""
-"Busca en la carpeta elementos no versionados y los añade si se requiere."
+msgstr "Busca en la carpeta elementos no versionados y los añade si se requiere."
#: svnfrontend/kdesvnfilelist.cpp:318
msgid "Open repository of working copy"
@@ -3336,23 +3313,20 @@
#: svnfrontend/kdesvnfilelist.cpp:405 svnfrontend/kdesvnfilelist.cpp:1013
#: svnfrontend/kdesvnfilelist.cpp:3149
-#, fuzzy
msgid "Update log cache"
-msgstr "Actualizar a HEAD"
+msgstr "Actualizar logcache"
#: svnfrontend/kdesvnfilelist.cpp:406
-#, fuzzy
msgid "Update the log cache for current repository"
-msgstr "Obtener lugar del repositorio actual"
+msgstr "Actualiza el logcache para el repositorio actual"
#: svnfrontend/kdesvnfilelist.cpp:562
msgid "Networked URL to open but networking is disabled!"
-msgstr ""
+msgstr "Solicitada URL de red para abrir, pero la red está deshabilitada!"
#: svnfrontend/kdesvnfilelist.cpp:1015 svnfrontend/kdesvnfilelist.cpp:3144
-#, fuzzy
msgid "Stop updating the logcache"
-msgstr "Actualizar a HEAD"
+msgstr "Deteniendo actualización de logcache"
#: svnfrontend/kdesvnfilelist.cpp:1070
msgid "Could not retrieve repository of working copy."
@@ -3588,8 +3562,9 @@
#: ksvnwidgets/logmsg_impl.cpp:626
msgid "Select textfile for insert"
-msgstr ""
+msgstr "Seleccione fichero de texto para insertar"
#: urldlg.cpp:52
msgid "Open repository or working copy"
msgstr "Abrir repositorio o copia de trabajo"
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesvn-1.0.0/src/kdesvn.desktop new/kdesvn-1.0.1/src/kdesvn.desktop
--- old/kdesvn-1.0.0/src/kdesvn.desktop 2008-01-15 20:58:56.000000000 +0100
+++ new/kdesvn-1.0.1/src/kdesvn.desktop 2008-08-06 22:13:44.000000000 +0200
@@ -15,7 +15,7 @@
Comment[es]=Un cliente de Subversion para KDE
Comment[lt]=Subversion klientas skirtas KDE
Terminal=false
-MimeType=inode/directory
+MimeType=inode/directory;
ServiceTypes=KParts/ReadOnlyPart,Browser/View
X-KDE-BrowserView-Args=DetailedList
X-KDE-Library=libkdesvnpart
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesvn-1.0.0/src/kiosvn/kiosvn.cpp new/kdesvn-1.0.1/src/kiosvn/kiosvn.cpp
--- old/kdesvn-1.0.0/src/kiosvn/kiosvn.cpp 2008-07-30 00:16:49.000000000 +0200
+++ new/kdesvn-1.0.1/src/kiosvn/kiosvn.cpp 2008-08-20 14:40:32.000000000 +0200
@@ -232,10 +232,9 @@
}
svn::Revision peg = rev;
bool dummy = false;
- QString s = makeSvnUrl(url);
svn::InfoEntries e;
try {
- e = m_pData->m_Svnclient->info(s,svn::DepthEmpty,rev,peg);
+ e = m_pData->m_Svnclient->info(makeSvnUrl(url),svn::DepthEmpty,rev,peg);
} catch (const svn::ClientException&e) {
QString ex = e.msg();
kdDebug()<m_Svnclient->mkdir(p,getDefaultLog());
}catch (const svn::ClientException&e) {
error( KIO::ERR_SLAVE_DEFINED,e.msg());
@@ -367,9 +366,9 @@
if (rev == svn::Revision::UNDEFINED) {
rev = svn::Revision::HEAD;
}
- svn::Targets target(makeSvnUrl(src));
m_pData->m_CurrentContext->setLogMessage(getDefaultLog());
try {
+ svn::Targets target(makeSvnUrl(src));
m_pData->m_Svnclient->remove(target,false);
} catch (const svn::ClientException&e) {
QString ex = e.msg();
@@ -425,6 +424,9 @@
} else {
res = proto+"://"+(user.isEmpty()?"":user+"@")+host+base;
}
+ if (base.isEmpty()) {
+ throw svn::ClientException(QString("'")+res+QString("' is not a valid subversion url"));
+ }
return res;
}
@@ -742,9 +744,9 @@
{
svn::Revision where(rev,revstring);
svn::Revision peg = svn::Revision::UNDEFINED;
- KURL _src = makeSvnUrl(src);
svn::Path _target(target.path());
try {
+ KURL _src = makeSvnUrl(src);
m_pData->m_Svnclient->checkout(_src.url(),_target,where,peg,svn::DepthInfinity,false,false);
} catch (const svn::ClientException&e) {
error(KIO::ERR_SLAVE_DEFINED,e.msg());
@@ -826,21 +828,21 @@
void kio_svnProtocol::diff(const KURL&uri1,const KURL&uri2,int rnum1,const QString&rstring1,int rnum2, const QString&rstring2,bool rec)
{
- svn::Revision r1(rnum1,rstring1);
- svn::Revision r2(rnum2,rstring2);
- QString u1 = makeSvnUrl(uri1,true);
- QString u2 = makeSvnUrl(uri2,true);
QByteArray ex;
- KTempDir tdir;
- kdDebug() << "kio_ksvn::diff : " << u1 << " at revision " << r1.toString() << " with "
- << u2 << " at revision " << r2.toString()
- << endl ;
-
- tdir.setAutoDelete(true);
/// @todo read settings for diff (ignore contentype)
try {
- ex = m_pData->m_Svnclient->diff(svn::Path(tdir.name()),
- u1,u2,svn::Path(),r1, r2,rec?svn::DepthInfinity:svn::DepthEmpty,false,false,false);
+ svn::Revision r1(rnum1,rstring1);
+ svn::Revision r2(rnum2,rstring2);
+ QString u1 = makeSvnUrl(uri1,true);
+ QString u2 = makeSvnUrl(uri2,true);
+ KTempDir tdir;
+ kdDebug() << "kio_ksvn::diff : " << u1 << " at revision " << r1.toString() << " with "
+ << u2 << " at revision " << r2.toString()
+ << endl ;
+
+ tdir.setAutoDelete(true);
+ ex = m_pData->m_Svnclient->diff(svn::Path(tdir.name()),
+ u1,u2,svn::Path(),r1, r2,rec?svn::DepthInfinity:svn::DepthEmpty,false,false,false);
} catch (const svn::ClientException&e) {
error(KIO::ERR_SLAVE_DEFINED,e.msg());
return;
@@ -855,9 +857,9 @@
void kio_svnProtocol::import(const KURL& repos, const KURL& wc)
{
- QString target = makeSvnUrl(repos);
- QString path = wc.path();
try {
+ QString target = makeSvnUrl(repos);
+ QString path = wc.path();
m_pData->m_Svnclient->import(svn::Path(path),target,QString::null,svn::DepthInfinity,false,false);
} catch (const svn::ClientException&e) {
error(KIO::ERR_SLAVE_DEFINED,e.msg());
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesvn-1.0.0/src/svnfrontend/commandexec.cpp new/kdesvn-1.0.1/src/svnfrontend/commandexec.cpp
--- old/kdesvn-1.0.0/src/svnfrontend/commandexec.cpp 2008-05-28 11:05:43.000000000 +0200
+++ new/kdesvn-1.0.1/src/svnfrontend/commandexec.cpp 2008-08-20 14:40:32.000000000 +0200
@@ -347,14 +347,20 @@
*/
void CommandExec::slotCmd_log()
{
+ int limit = m_pCPart->log_limit;
if (m_pCPart->end == svn::Revision::UNDEFINED) {
m_pCPart->end = svn::Revision::HEAD;
+ limit = 0;
}
if (m_pCPart->start == svn::Revision::UNDEFINED) {
m_pCPart->start = 1;
+ limit = 0;
}
bool list = Kdesvnsettings::self()->log_always_list_changed_files();
- m_pCPart->m_SvnWrapper->makeLog(m_pCPart->start,m_pCPart->end,m_pCPart->extraRevisions[0],m_pCPart->url[0],list,m_pCPart->log_limit);
+ if (m_pCPart->extraRevisions[0]==svn::Revision::WORKING) {
+ m_pCPart->extraRevisions[0]=svn::Revision::UNDEFINED;
+ }
+ m_pCPart->m_SvnWrapper->makeLog(m_pCPart->start,m_pCPart->end,m_pCPart->extraRevisions[0],m_pCPart->url[0],list,limit);
}
/*!
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesvn-1.0.0/src/svnfrontend/graphtree/revisiontree.cpp new/kdesvn-1.0.1/src/svnfrontend/graphtree/revisiontree.cpp
--- old/kdesvn-1.0.0/src/svnfrontend/graphtree/revisiontree.cpp 2008-08-03 19:28:19.000000000 +0200
+++ new/kdesvn-1.0.1/src/svnfrontend/graphtree/revisiontree.cpp 2008-08-30 09:54:00.000000000 +0200
@@ -95,11 +95,18 @@
CursorStack a(Qt::BusyCursor);
StopDlg sdlg(m_Listener,dlgParent,
0,"Logs",i18n("Getting logs - hit cancel for abort"));
- if (svn::Url::isLocal(reposRoot)) {
+ if (svn::Url::isLocal(reposRoot) ) {
m_Client->log(reposRoot,endr,startr,m_OldHistory,startr,true,false,0);
} else {
svn::cache::ReposLog rl(m_Client,reposRoot);
- rl.simpleLog(m_OldHistory,startr,endr,!Kdesvnsettings::network_on());
+ if (rl.isValid()) {
+ rl.simpleLog(m_OldHistory,startr,endr,!Kdesvnsettings::network_on());
+ } else if (Kdesvnsettings::network_on()) {
+ m_Client->log(reposRoot,endr,startr,m_OldHistory,startr,true,false,0);
+ } else {
+ KMessageBox::error(0,i18n("Could not retrieve logs, reason:\n%1").arg(i18n("No logcache possible due broken database and networking not allowed.")));
+ return false;
+ }
}
} catch (const svn::Exception&ce) {
kdDebug()<m_Svnclient ,root);
- if (rl.simpleLog(_m,r,r,true) && _m.find(r.revnum())!=_m.end() ) {
+ if (rl.isValid() && rl.simpleLog(_m,r,r,true) && _m.find(r.revnum())!=_m.end() ) {
t = _m[r.revnum()];
res = true;
}
@@ -924,6 +924,9 @@
));
}
}
+ if (m_Data->m_ParentList->baseUri().length()>0) {
+ chdir(m_Data->m_ParentList->baseUri().local8Bit());
+ }
if (makeCommit(targets) && Kdesvnsettings::log_cache_on_open()) {
startFillCache(m_Data->m_ParentList->baseUri());
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesvn-1.0.0/src/svnfrontend/svnlogdlgimp.cpp new/kdesvn-1.0.1/src/svnfrontend/svnlogdlgimp.cpp
--- old/kdesvn-1.0.0/src/svnfrontend/svnlogdlgimp.cpp 2008-04-02 15:39:42.000000000 +0200
+++ new/kdesvn-1.0.1/src/svnfrontend/svnlogdlgimp.cpp 2008-08-23 23:55:17.000000000 +0200
@@ -123,10 +123,10 @@
{
LogListViewItem* k = static_cast( item );
if (col==COL_REV) {
- return k->_revision-_revision;
+ return _revision-k->_revision;
}
if (col==COL_DATE) {
- return fullDate.secsTo(k->fullDate);
+ return k->fullDate.secsTo(fullDate);
}
return text(col).localeAwareCompare(k->text(col));
}
@@ -194,6 +194,7 @@
:SvnLogDialogData(parent, name,modal),_name("")
{
m_LogView->setSorting(LogListViewItem::COL_REV);
+ m_LogView->setSortOrder(Qt::Descending);
resize(dialogSize());
m_ControlKeyDown = false;
m_first = 0;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesvn-1.0.0/src/svnqt/cache/LogCache.cpp new/kdesvn-1.0.1/src/svnqt/cache/LogCache.cpp
--- old/kdesvn-1.0.0/src/svnqt/cache/LogCache.cpp 2008-07-27 11:02:27.000000000 +0200
+++ new/kdesvn-1.0.1/src/svnqt/cache/LogCache.cpp 2008-08-30 09:54:00.000000000 +0200
@@ -453,3 +453,16 @@
return _res;
}
+
+bool svn::cache::LogCache::valid()const
+{
+ QDataBase mainDB = m_CacheData->getMainDB();
+#if QT_VERSION < 0x040000
+ if (!mainDB || !mainDB->open()) {
+#else
+ if (!mainDB.isValid()) {
+#endif
+ return false;
+ }
+ return true;
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesvn-1.0.0/src/svnqt/cache/LogCache.hpp new/kdesvn-1.0.1/src/svnqt/cache/LogCache.hpp
--- old/kdesvn-1.0.0/src/svnqt/cache/LogCache.hpp 2008-06-08 20:36:58.000000000 +0200
+++ new/kdesvn-1.0.1/src/svnqt/cache/LogCache.hpp 2008-08-30 09:54:00.000000000 +0200
@@ -31,7 +31,9 @@
virtual ~LogCache();
static LogCache* self();
QDataBase reposDb(const QString&aRepository);
- QStringList cachedRepositories()const;
+ QStringList cachedRepositories()const;
+
+ bool valid()const;
};
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesvn-1.0.0/src/svnqt/cache/ReposLog.cpp new/kdesvn-1.0.1/src/svnqt/cache/ReposLog.cpp
--- old/kdesvn-1.0.0/src/svnqt/cache/ReposLog.cpp 2008-08-05 19:59:08.000000000 +0200
+++ new/kdesvn-1.0.1/src/svnqt/cache/ReposLog.cpp 2008-08-30 09:54:00.000000000 +0200
@@ -514,3 +514,22 @@
#endif
return true;
}
+
+bool svn::cache::ReposLog::isValid()const
+{
+#if QT_VERSION < 0x040000
+ if (!m_Database) {
+#else
+ if (!m_Database.isValid()) {
+#endif
+ m_Database = LogCache::self()->reposDb(m_ReposRoot);
+#if QT_VERSION < 0x040000
+ if (!m_Database) {
+#else
+ if (!m_Database.isValid()) {
+#endif
+ return false;
+ }
+ }
+ return true;
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesvn-1.0.0/src/svnqt/cache/ReposLog.hpp new/kdesvn-1.0.1/src/svnqt/cache/ReposLog.hpp
--- old/kdesvn-1.0.0/src/svnqt/cache/ReposLog.hpp 2008-08-05 19:59:08.000000000 +0200
+++ new/kdesvn-1.0.1/src/svnqt/cache/ReposLog.hpp 2008-08-30 09:54:00.000000000 +0200
@@ -20,7 +20,7 @@
{
protected:
svn::Client*m_Client;
- QDataBase m_Database;
+ mutable QDataBase m_Database;
QString m_ReposRoot;
svn::Revision m_latestHead;
//! internal insert.
@@ -60,6 +60,8 @@
bool insertLogEntry(const svn::LogEntry&);
bool log(const svn::Path&,const svn::Revision&start, const svn::Revision&end,const svn::Revision&peg,svn::LogEntriesMap&target, bool strictNodeHistory,int limit);
bool itemExists(const svn::Revision&,const svn::Path&);
+
+ bool isValid()const;
};
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesvn-1.0.0/src/svnqt/client_merge.cpp new/kdesvn-1.0.1/src/svnqt/client_merge.cpp
--- old/kdesvn-1.0.0/src/svnqt/client_merge.cpp 2008-06-06 16:48:44.000000000 +0200
+++ new/kdesvn-1.0.1/src/svnqt/client_merge.cpp 2008-08-05 23:57:49.000000000 +0200
@@ -140,6 +140,7 @@
bool recurse=depth==DepthInfinity;
svn_error_t*error;
+#if ((SVN_VER_MAJOR == 1) && (SVN_VER_MINOR >= 4)) || (SVN_VER_MAJOR > 1)
error = svn_client_merge_peg2(
src.cstr(),
range.first,
@@ -154,6 +155,22 @@
*m_context,
pool
);
+#else
+ Q_UNUSED(merge_options);
+ error = svn_client_merge_peg(
+ src.cstr(),
+ range.first,
+ range.second,
+ peg.revision(),
+ targetWc.cstr(),
+ recurse,
+ !notice_ancestry,
+ force,
+ dry_run,
+ *m_context,
+ pool
+ );
+#endif
if(error != 0) {
throw ClientException (error);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesvn-1.0.0/src/svnqt/client_status.cpp new/kdesvn-1.0.1/src/svnqt/client_status.cpp
--- old/kdesvn-1.0.0/src/svnqt/client_status.cpp 2008-06-03 14:21:41.000000000 +0200
+++ new/kdesvn-1.0.1/src/svnqt/client_status.cpp 2008-08-05 23:57:49.000000000 +0200
@@ -527,7 +527,7 @@
&l_baton,
*m_context, // client ctx
pool);
-#else
+#elif ((SVN_VER_MAJOR == 1) && (SVN_VER_MINOR >= 4)) || (SVN_VER_MAJOR > 1)
Q_UNUSED(include_merged_revisions);
Q_UNUSED(revprops);
@@ -543,6 +543,22 @@
&l_baton,
*m_context, // client ctx
pool);
+#else
+ Q_UNUSED(include_merged_revisions);
+ Q_UNUSED(revprops);
+ Q_UNUSED(revisionPeg);
+
+ error = svn_client_log2 (
+ target.array (pool),
+ revisionStart.revision (),
+ revisionEnd.revision (),
+ limit,
+ discoverChangedPaths ? 1 : 0,
+ strictNodeHistory ? 1 : 0,
+ logMapReceiver,
+ &l_baton,
+ *m_context, // client ctx
+ pool);
#endif
if (error != NULL)
{
@@ -585,7 +601,7 @@
&l_baton,
*m_context, // client ctx
pool);
-#else
+#elif ((SVN_VER_MAJOR == 1) && (SVN_VER_MINOR >= 4)) || (SVN_VER_MAJOR > 1)
Q_UNUSED(include_merged_revisions);
Q_UNUSED(revprops);
@@ -601,6 +617,22 @@
&l_baton,
*m_context, // client ctx
pool);
+#else
+ Q_UNUSED(include_merged_revisions);
+ Q_UNUSED(revprops);
+ Q_UNUSED(revisionPeg);
+
+ error = svn_client_log2 (
+ target.array (pool),
+ revisionStart.revision (),
+ revisionEnd.revision (),
+ limit,
+ discoverChangedPaths ? 1 : 0,
+ strictNodeHistory ? 1 : 0,
+ logReceiver,
+ &l_baton,
+ *m_context, // client ctx
+ pool);
#endif
if (error != NULL)
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesvn-1.0.0/src/svnqt/CMakeLists.txt new/kdesvn-1.0.1/src/svnqt/CMakeLists.txt
--- old/kdesvn-1.0.0/src/svnqt/CMakeLists.txt 2008-06-06 16:48:44.000000000 +0200
+++ new/kdesvn-1.0.1/src/svnqt/CMakeLists.txt 2008-08-30 09:23:41.000000000 +0200
@@ -45,22 +45,23 @@
cache/DatabaseException.cpp
)
-MESSAGE(STATUS "QT4 found? ${QT4_FOUND}")
-
-IF (SQLITE_FOUND AND NOT QT4_FOUND)
- MESSAGE(STATUS "use own sqlite3")
- SET(SOURCES
- ${SOURCES}
- cache/sqlite3/qsqlcachedresult.cpp
- cache/sqlite3/qsql_sqlite3.cpp
- cache/sqlite3/qsqlcachedresult.h
- cache/sqlite3/qsql_sqlite3.h
- )
-ENDIF (SQLITE_FOUND AND NOT QT4_FOUND)
-
-IF (QT4_FOUND)
+IF (NOT QT4_FOUND)
+ IF (SQLITE_FOUND)
+ MESSAGE(STATUS "Build own sqlite3 database modul")
+ SET(SOURCES
+ ${SOURCES}
+ cache/sqlite3/qsqlcachedresult.cpp
+ cache/sqlite3/qsql_sqlite3.cpp
+ cache/sqlite3/qsqlcachedresult.h
+ cache/sqlite3/qsql_sqlite3.h
+ )
+ ELSE (SQLITE_FOUND)
+ MESSAGE(SEND_ERROR "The QT3 version requires sqlite3 but could not found")
+ ENDIF (SQLITE_FOUND)
+ELSE (NOT QT4_FOUND)
+ MESSAGE(STATUS "Build with QT4.")
ADD_DEFINITIONS(-DNO_SQLITE3)
-ENDIF (QT4_FOUND)
+ENDIF (NOT QT4_FOUND)
SET(CACHEINST_HEADERS
cache/LogCache.hpp
@@ -116,7 +117,7 @@
SET(TOASCII "toAscii")
SET(HOMEDIR "homePath")
SET(svnqt-name svnqt-qt4)
- SET(QDATABASE "QSqlDatabase")
+ SET(QDATABASE "QSqlDatabase")
SET(QLONG "qlonglong")
ELSE(QT4_FOUND)
IF(QT_FOUND)
@@ -158,15 +159,6 @@
COMPILE_FLAGS ${CMAKE_SHARED_LIBRARY_CXX_FLAGS})
ENDIF(WIN32)
-#for a libtool like .la file
-#SET(LIBLA_CURRENT 4)
-#SET(LIBLA_REVISION 0)
-#SET(LIBLA_AGE 0)
-
-#MATH(EXPR LIB_MAJOR '${LIBLA_CURRENT}-${LIBLA_AGE}')
-#SET(LIB_MINOR ${LIBLA_AGE})
-#SET(LIB_RELEASE ${LIBLA_REVISION})
-
SET(LIB_MAJOR 4)
SET(LIB_MINOR 2)
SET(LIB_RELEASE 0)
@@ -205,31 +197,6 @@
INSTALL(TARGETS ${svnqt-name} DESTINATION ${LIB_INSTALL_DIR})
INSTALL(FILES ${INST_HEADERS} DESTINATION include/${svnqt-name})
INSTALL(FILES ${CACHEINST_HEADERS} DESTINATION include/${svnqt-name}/cache)
-
- # and a libtool file
-# GET_TARGET_PROPERTY(_target_location ${svnqt-name} LOCATION)
-
-# GET_FILENAME_COMPONENT(_laname ${_target_location} NAME_WE)
-# GET_FILENAME_COMPONENT(_soname ${_target_location} NAME)
-# SET(_laname ${LIBRARY_OUTPUT_PATH}/${_laname}.la)
-#
-# FILE(WRITE ${_laname} "# libsvnqt.la - a libtool library file, generated by cmake \n")
-# FILE(APPEND ${_laname} "# The name that we can dlopen(3).\n")
-# FILE(APPEND ${_laname} "dlname='${_soname}.${LIB_MAJOR}'\n")
-# FILE(APPEND ${_laname} "# Names of this library\n")
-# FILE(APPEND ${_laname} "library_names='${_soname}.${LIB_MAJOR}.${LIB_MINOR}.${LIB_RELEASE} ${_soname}.${LIB_MAJOR} ${_soname}'\n")
-# FILE(APPEND ${_laname} "# The name of the static archive\n")
-# FILE(APPEND ${_laname} "old_library=''\n")
-# FILE(APPEND ${_laname} "# Libraries that this one depends upon.\n")
-# FILE(APPEND ${_laname} "dependency_libs=''\n")
-# FILE(APPEND ${_laname} "# Version information for ${_soname}\n")
-# FILE(APPEND ${_laname} "current=${LIBLA_CURRENT}\nage=${LIBLA_AGE}\nrevision=${LIBLA_REVISION}\n")
-# FILE(APPEND ${_laname} "# Is this an already installed library?\ninstalled=yes\n")
-# FILE(APPEND ${_laname} "# Should we warn about portability when linking against -modules?\nshouldnotlink=no\n")
-# FILE(APPEND ${_laname} "# Files to dlopen/dlpreopen\ndlopen=''\ndlpreopen=''\n")
-# FILE(APPEND ${_laname} "# Directory that this library needs to be installed in:\n")
-# FILE(APPEND ${_laname} "libdir='${LIB_INSTALL_DIR}'\n")
-# INSTALL(FILES ${_laname} DESTINATION ${LIB_INSTALL_DIR})
ENDIF(NOT WIN32)
IF (BUILD_TESTS)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesvn-1.0.0/src/svnqt/cmakemodules/FindSqlite.cmake new/kdesvn-1.0.1/src/svnqt/cmakemodules/FindSqlite.cmake
--- old/kdesvn-1.0.0/src/svnqt/cmakemodules/FindSqlite.cmake 2008-03-02 01:24:07.000000000 +0100
+++ new/kdesvn-1.0.1/src/svnqt/cmakemodules/FindSqlite.cmake 2008-08-30 09:23:41.000000000 +0200
@@ -1,9 +1,3 @@
-# try find sqlite
-# found defines
-# SQLITE_INCLUDE_DIR
-# SQLITE_LIBRARIES
-# SQLITE_FOUND
-
IF (SQLITE_INCLUDE_DIR AND SQLITE_LIBRARIES)
SET(SQLITE_FOUND TRUE)
ELSE (SQLITE_INCLUDE_DIR AND SQLITE_LIBRARIES)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesvn-1.0.0/src/svnqt/exception.cpp new/kdesvn-1.0.1/src/svnqt/exception.cpp
--- old/kdesvn-1.0.0/src/svnqt/exception.cpp 2008-06-10 22:21:09.000000000 +0200
+++ new/kdesvn-1.0.1/src/svnqt/exception.cpp 2008-08-20 14:40:32.000000000 +0200
@@ -140,6 +140,11 @@
{
}
+ ClientException::ClientException (const QString&msg) throw ()
+ : Exception (msg)
+ {
+ }
+
ClientException::ClientException (svn_error_t * error) throw ()
: Exception ("")
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesvn-1.0.0/src/svnqt/exception.hpp new/kdesvn-1.0.1/src/svnqt/exception.hpp
--- old/kdesvn-1.0.0/src/svnqt/exception.hpp 2008-06-10 22:21:09.000000000 +0200
+++ new/kdesvn-1.0.1/src/svnqt/exception.hpp 2008-08-20 14:40:32.000000000 +0200
@@ -104,6 +104,11 @@
*/
ClientException (const char*msg) throw ();
+ /**
+ * Constructor
+ */
+ ClientException (const QString&message) throw();
+
/**
* Copy constructor
*/
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesvn-1.0.0/src/svnqt/log_entry.cpp new/kdesvn-1.0.1/src/svnqt/log_entry.cpp
--- old/kdesvn-1.0.0/src/svnqt/log_entry.cpp 2008-06-01 23:27:37.000000000 +0200
+++ new/kdesvn-1.0.1/src/svnqt/log_entry.cpp 2008-08-10 12:20:14.000000000 +0200
@@ -100,16 +100,18 @@
message = message_ == 0 ? QString::fromLatin1("") : QString::FROMUTF8(message_);
setDate(date_);
revision = log_entry->revision;
- for (apr_hash_index_t *hi = apr_hash_first (pool, log_entry->changed_paths);
- hi != NULL;
- hi = apr_hash_next (hi))
- {
- const void *pv;
- void *val;
- apr_hash_this (hi, &pv, NULL, &val);
- svn_log_changed_path_t *log_item = reinterpret_cast (val);
- const char* path = reinterpret_cast(pv);
- changedPaths.push_back (LogChangePathEntry (path,log_item->action,log_item->copyfrom_path,log_item->copyfrom_rev) );
+ if (log_entry->changed_paths) {
+ for (apr_hash_index_t *hi = apr_hash_first (pool, log_entry->changed_paths);
+ hi != NULL;
+ hi = apr_hash_next (hi))
+ {
+ const void *pv;
+ void *val;
+ apr_hash_this (hi, &pv, NULL, &val);
+ svn_log_changed_path_t *log_item = reinterpret_cast (val);
+ const char* path = reinterpret_cast(pv);
+ changedPaths.push_back (LogChangePathEntry (path,log_item->action,log_item->copyfrom_path,log_item->copyfrom_rev) );
+ }
}
}
#endif
++++++ remove-nl.diff ++++++
--- doc/CMakeLists.txt
+++ doc/CMakeLists.txt
@@ -42,7 +42,5 @@ ENDMACRO (GENBOOK)
IF (KDE3_MEINPROC_EXECUTABLE)
ADD_CUSTOM_TARGET(doc ALL)
- GENBOOK(en)
- GENBOOK(nl)
# creates the link to the common-section during install
INSTALL(SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/makelink.cmake)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org