Kolab Groupware OBS

Changes of Revision 53

debian.changelog Changed

debian.tar.gz/.gitattributes Added

debian.tar.gz/copyright Changed

@@ -298,125 +298,3 @@
 
 The debian packaging is licensed under the gplv2 or later.
 Please see /usr/share/common-licenses/GPL-2 for details
-
-Files: knode/composer/attachment_view.cpp
-       knode/composer/attachment_view.h
-       knode/composer/followupto_combobox.cpp
-       knode/composer/followupto_combobox.h
-       knode/configuration/identity_combo_wrapper.h
-       knode/configuration/identity_edition_dialog.cpp
-       knode/configuration/identity_edition_dialog.h
-       knode/configuration/identity_widget.cpp
-       knode/configuration/identity_widget.h
-       knode/configuration/settings_container_interface.h
-       knode/tests/knodetest.cpp
-       knode/tests/knodetest.h
-       knode/utils/locale.cpp
-       knode/utils/locale.h
-       knode/utils/scoped_cursor_override.h
-       knode/utils/startup.cpp
-       knode/utils/startup.h
-Copyright: 2010, Olivier Trichet <nive@nivalis.org>
-License: MIT/Digital Equipment Corporation (1)
- Permission to use, copy, modify, and distribute this software and its
- documentation for any purpose and without fee is hereby granted, provided
- that the above copyright notice appear in all copies and that both that the
- copyright notice and this permission notice and warranty disclaimer appear in
- supporting documentation, and that the name of the author not be used in
- advertising or publicity pertaining to distribution of the software without
- specific, written prior permission.
- .
- The author disclaim all warranties with regard to this software, including
- all implied warranties of merchantability and fitness.  In no event shall the
- author be liable for any special, indirect or consequential damages or any
- damages whatsoever resulting from loss of use, data or profits, whether in an
- action of contract, negligence or other tortious action, arising out of or in
- connection with the use or performance of this software.
-
-Files: messageviewer/widgets/invitationsettings.cpp
-       messageviewer/widgets/invitationsettings.h
-Copyright: Laurent Montel <montel@kde.org>
-License: Boost Software License - Version 1.0 - August 17th, 2003
- Permission is hereby granted, free of charge, to any person or organization
- obtaining a copy of the software and accompanying documentation covered by
- this license (the "Software") to use, reproduce, display, distribute,
- execute, and transmit the Software, and to prepare derivative works of the
- Software, and to permit third-parties to whom the Software is furnished to
- do so, all subject to the following:
- .
- The copyright notices in the Software and this entire statement, including
- the above license grant, this restriction and the following disclaimer,
- must be included in all copies of the Software, in whole or in part, and
- all derivative works of the Software, unless such copies or derivative
- works are solely in the form of machine-executable object code generated by
- a source language processor.
- .
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
- SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
- FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
- ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- DEALINGS IN THE SOFTWARE.
-Comment: No copyright holders listed in the files, assigning the messageviewer
- maintainer.
-
-Files: akregator/src/articlematcher.cpp
-       akregator/src/articlematcher.h
-Copyright: 2004-2005, Frerich Raabe <raabe@kde.org>
-License: BSD-2-clause
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- .
- 1. Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
- .
- THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Files: messagecore/ontology/messagetag.trig
-Copyright: 2009, Sebastian Trueg <trueg@kde.org>
-License: CC-BY or BSD
- All rights reserved, licensed under either CC-BY or BSD.
- .
- You are free:
-  * to Share - to copy, distribute and transmit the work
-  * to Remix - to adapt the work
- Under the following conditions:
-  * Attribution - You must attribute the work in the manner specified by the
-    author or licensor (but not in any way that suggests that they endorse you
-    or your use of the work).
- .
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
-  * Redistributions of source code must retain the above copyright notice,
-    this list of conditions and the following disclaimer.
-  * Redistributions in binary form must reproduce the above copyright notice,
-    this list of conditions and the following disclaimer in the documentation
-    and/or other materials provided with the distribution.
-  * Neither the names of the authors nor the names of contributors may be
-    used to endorse or promote products derived from this ontology without
-    specific prior written permission.
- .
- THIS ONTOLOGY IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
- EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS ONTOLOGY, EVEN IF
- ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

debian.tar.gz/patches/upstream_fix334612_selecting_text_and_pressing_enter_doesnt_replace.patch Added

@@ -0,0 +1,88 @@
+commit dc110d65dcc38af6989ceb3d503271302539c937
+Author: Montel Laurent <montel@kde.org>
+Date:   Mon May 12 07:46:03 2014 +0200
+
+    Fix Bug 334612 - Selecting text and pressing enter doesn't replace the text but only adds a newline
+    
+    FIXED-IN: 4.13.1
+    BUG: 334612
+
+diff --git a/messagecomposer/composer/kmeditor.cpp b/messagecomposer/composer/kmeditor.cpp
+index ac38ce9..9f5ad4c 100644
+--- a/messagecomposer/composer/kmeditor.cpp
++++ b/messagecomposer/composer/kmeditor.cpp
+@@ -249,7 +249,7 @@ void KMeditor::keyPressEvent ( QKeyEvent *e )
+         emit focusUp();
+     } else {
+         if((e->key() == Qt::Key_Space) || (e->key() == Qt::Key_Enter) || (e->key() == Qt::Key_Return)) {
+-            if(d->mAutoCorrection && !isLineQuoted(textCursor().block().text())) {
++            if(d->mAutoCorrection && !isLineQuoted(textCursor().block().text()) && !textCursor().hasSelection()) {
+                 const QTextCharFormat initialTextFormat = textCursor().charFormat();
+                 const bool richText = (textMode() == KRichTextEdit::Rich);
+                 int position = textCursor().position();
+diff --git a/pimcommon/autocorrection/widgets/lineeditwithautocorrection.cpp b/pimcommon/autocorrection/widgets/lineeditwithautocorrection.cpp
+index 1b6f26d..f01ef9d 100644
+--- a/pimcommon/autocorrection/widgets/lineeditwithautocorrection.cpp
++++ b/pimcommon/autocorrection/widgets/lineeditwithautocorrection.cpp
+@@ -56,7 +56,7 @@ void LineEditWithAutoCorrection::setAutocorrectionLanguage(const QString &langua
+ void LineEditWithAutoCorrection::keyPressEvent ( QKeyEvent *e )
+ {
+     if ((e->key() == Qt::Key_Space) || (e->key() == Qt::Key_Enter) || (e->key() == Qt::Key_Return)) {
+-        if (mAutoCorrection) {
++        if (mAutoCorrection && !textCursor().hasSelection()) {
+             // no Html format in subject.
+             int position = textCursor().position();
+             mAutoCorrection->autocorrect(false, *document(), position);
+diff --git a/pimcommon/autocorrection/widgets/richtexteditwithautocorrection.cpp b/pimcommon/autocorrection/widgets/richtexteditwithautocorrection.cpp
+index a1774b4..4318ea4 100644
+--- a/pimcommon/autocorrection/widgets/richtexteditwithautocorrection.cpp
++++ b/pimcommon/autocorrection/widgets/richtexteditwithautocorrection.cpp
+@@ -62,26 +62,28 @@ static bool isSpecial( const QTextCharFormat &charFormat )
+ void RichTextEditWithAutoCorrection::keyPressEvent ( QKeyEvent *e )
+ {
+     if ((e->key() == Qt::Key_Space) || (e->key() == Qt::Key_Enter) || (e->key() == Qt::Key_Return)) {
+-        const QTextCharFormat initialTextFormat = textCursor().charFormat();
+-        const bool richText = acceptRichText();
+-        int position = textCursor().position();
+-        mAutoCorrection->autocorrect(richText, *document(), position);
+-        QTextCursor cur = textCursor();
+-        cur.setPosition(position);
+-        if (e->key() == Qt::Key_Space) {
+-            if (richText && !isSpecial(initialTextFormat))
+-                cur.insertText(QLatin1String(" "), initialTextFormat);
+-            else
+-                cur.insertText(QLatin1String(" "));
+-            setTextCursor(cur);
+-          return;
+-        } else {
+-            if (richText && !isSpecial(initialTextFormat))
+-                cur.insertText(QLatin1String("\n"), initialTextFormat);
+-            else
+-                cur.insertText(QLatin1String("\n"));
+-            setTextCursor(cur);
+-          return;
++        if (!textCursor().hasSelection()) {
++            const QTextCharFormat initialTextFormat = textCursor().charFormat();
++            const bool richText = acceptRichText();
++            int position = textCursor().position();
++            mAutoCorrection->autocorrect(richText, *document(), position);
++            QTextCursor cur = textCursor();
++            cur.setPosition(position);
++            if (e->key() == Qt::Key_Space) {
++                if (richText && !isSpecial(initialTextFormat))
++                    cur.insertText(QLatin1String(" "), initialTextFormat);
++                else
++                    cur.insertText(QLatin1String(" "));
++                setTextCursor(cur);
++                return;
++            } else {
++                if (richText && !isSpecial(initialTextFormat))
++                    cur.insertText(QLatin1String("\n"), initialTextFormat);
++                else
++                    cur.insertText(QLatin1String("\n"));
++                setTextCursor(cur);
++                return;
++            }
+         }
+     }
+     PimCommon::RichTextEditor::keyPressEvent( e );

debian.tar.gz/patches/upstream_fix334730_kontact_crash_on_logout.patch Added

@@ -0,0 +1,22 @@
+commit 990d6c87eb243d03f7c067d661278cf3aff22fed
+Author: Montel Laurent <montel@kde.org>
+Date:   Wed May 14 21:31:10 2014 +0200
+
+    Fix Bug 334730 - Kontact crash on logout
+    
+    BUG: 334730
+    FIXED-IN: 4.13.2
+
+diff --git a/kmail/kmmainwidget.cpp b/kmail/kmmainwidget.cpp
+index 7d24201..5d3a66a 100644
+--- a/kmail/kmmainwidget.cpp
++++ b/kmail/kmmainwidget.cpp
+@@ -1157,7 +1157,7 @@ void KMMainWidget::updateMoveAction( bool hasUnreadMails, bool hasMails )
+     actionCollection()->action( QLatin1String("go_next_unread_message") )->setEnabled( enable_goto_unread );
+     actionCollection()->action( QLatin1String("go_prev_message") )->setEnabled( hasMails );
+     actionCollection()->action( QLatin1String("go_prev_unread_message") )->setEnabled( enable_goto_unread );
+-    if ( mAkonadiStandardActionManager->action( Akonadi::StandardMailActionManager::MarkAllMailAsRead ) ) {
++    if ( mAkonadiStandardActionManager && mAkonadiStandardActionManager->action( Akonadi::StandardMailActionManager::MarkAllMailAsRead ) ) {
+         mAkonadiStandardActionManager->action( Akonadi::StandardMailActionManager::MarkAllMailAsRead )->setEnabled(hasUnreadMails);
+     }
+ }

debian.tar.gz/patches/upstream_fix334937_kmail_crashes_when_attaching_file.patch Added

debian.tar.gz/watch Changed

kdepim.dsc Changed

@@ -1,8 +1,8 @@
 Format: 1.0
 Source: kdepim
-Binary: kdepim, kdepim-mobile, akregator, kaddressbook, kaddressbook-mobile, kalarm, kdepim-kresources, storageservicemanager, kleopatra, kmail, kmail-mobile, knode, knotes, notes-mobile, konsolekalendar, kontact, tasks-mobile, korganizer, korganizer-mobile, ktimetracker, libcalendarsupport4, libcomposereditorng4, libeventviews4, libincidenceeditorsng4, libpimcommon4, libkdepim4, libkdepimdbusinterfaces4, libkdgantt2-0, libkleo4, libkpgp4, libksieve4, libkmanagesieve4, libksieveui4, libmailcommon4, libmailimporter4, libmessagecomposer4, libmessagecore4, libmessagelist4, libmessageviewer4, libsendlater4, libfollowupreminder4, libtemplateparser4, libkdepimmobileui4, kdepim-mobileui-data, kjots, blogilo, akonadiconsole, libnoteshared4, kdepim-dbg
+Binary: kolab-desktop-client, kdepim, kaddressbook, kdepim-kresources, kmail, kontact, korganizer, libcalendarsupport4, libcomposereditorng4, libeventviews4, libgrammar4, libincidenceeditorsng4, libpimcommon4, libkdepim4, libkdepimdbusinterfaces4, libkdgantt2-0, libkleo4, libkpgp4, libksieve4, libkmanagesieve4, libksieveui4, libmailcommon4, libmailimporter4, libmessagecomposer4, libmessagecore4, libmessagelist4, libmessageviewer4, libsendlater4, libtemplateparser4, akonadiconsole, libnoteshared4, kdepim-dbg
 Architecture: any all
-Version: 4:4.13.0.0-0~kolab1
+Version: 4:4.13.0.1-0~kolab1
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Sune Vuorela <sune@debian.org>, Fathi Boudra <fabo@debian.org>, Modestas Vainius <modax@debian.org>, Michael Meskes <meskes@debian.org>, George Kiagiadakis <kiagiadakis.george@gmail.com>, Eshat Cakar <info@eshat.de>, Maximiliano Curia <maxy@debian.org>
 Homepage: http://pim.kde.org/
@@ -10,39 +10,25 @@
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-sc/kdepim.git
 Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-sc/kdepim.git
 Testsuite: autopkgtest
-Build-Depends: akonadi-server (>= 1.12.42), akonadi-server (<< 1.13), baloo-dev (>= 4:4.13), baloo-dev (<< 4:4.14.4), cmake, debhelper (>= 8), kdepimlibs5-dev (>= 4:4.13), kdepimlibs5-dev (<< 4:4.14), libakonadi-dev (>= 1.12.42), libassuan-dev, libboost-dev (>= 1.40.0-2), libboost-graph-dev (>= 1.40.0-2), libgpgme11-dev, libgrantlee-dev (>= 0.3.0), liblink-grammar4-dev, libphonon-dev (>= 4:4.6.0really4.3.80), libprison-dev, libqca2-dev (>= 2.0.0), libqjson-dev, libqt4-opengl-dev, libqtwebkit-dev, libsasl2-dev, libsearchclient-dev (>= 0.6.3), libxss-dev, pkg-config, pkg-kde-tools (>= 0.12), shared-mime-info (>= 0.30), xsltproc, zlib1g-dev
+Build-Depends: akonadi-server (>= 1.12.42), akonadi-server (<< 1.13), baloo-dev (>= 4:4.13), baloo-dev (<< 4:4.14.4), cmake, debhelper (>= 8), kdepimlibs5-dev (>= 4:4.13), kdepimlibs5-dev (<< 4:4.14.4), libakonadi-dev (>= 1.12.42), libakonadi-dev (<< 1.13), libassuan-dev, libboost-dev (>= 1.40.0-2), libboost-graph-dev (>= 1.40.0-2), libgpgme11-dev, libgrantlee-dev (>= 0.3.0), liblink-grammar4-dev, libphonon-dev (>= 4:4.6.0really4.3.80), libprison-dev, libqca2-dev (>= 2.0.0), libqjson-dev, libqt4-opengl-dev, libqtwebkit-dev, libsasl2-dev, libsearchclient-dev (>= 0.6.3), libxss-dev, pkg-config, pkg-kde-tools (>= 0.12), shared-mime-info (>= 0.30), xsltproc, zlib1g-dev
 Build-Depends-Indep: dblatex
 Package-List:
  akonadiconsole deb utils optional arch=any
- akregator deb web optional arch=any
- blogilo deb web optional arch=any
  kaddressbook deb utils optional arch=any
- kaddressbook-mobile deb utils optional arch=any
- kalarm deb kde optional arch=any
  kdepim deb metapackages optional arch=all
  kdepim-dbg deb debug extra arch=any
  kdepim-kresources deb kde optional arch=any
- kdepim-mobile deb metapackages optional arch=all
- kdepim-mobileui-data deb libs optional arch=all
- kjots deb utils optional arch=any
- kleopatra deb net optional arch=any
  kmail deb mail optional arch=any
- kmail-mobile deb mail optional arch=any
- knode deb news optional arch=any
- knotes deb kde optional arch=any
- konsolekalendar deb kde optional arch=any
+ kolab-desktop-client deb metapackages optional arch=all
  kontact deb kde optional arch=any
  korganizer deb kde optional arch=any
- korganizer-mobile deb kde optional arch=any
- ktimetracker deb utils optional arch=any
  libcalendarsupport4 deb libs optional arch=any
  libcomposereditorng4 deb libs optional arch=any
  libeventviews4 deb libs optional arch=any
- libfollowupreminder4 deb libs optional arch=any
+ libgrammar4 deb libs optional arch=any
  libincidenceeditorsng4 deb libs optional arch=any
  libkdepim4 deb libs optional arch=any
  libkdepimdbusinterfaces4 deb libs optional arch=any
- libkdepimmobileui4 deb libs optional arch=any
  libkdgantt2-0 deb libs optional arch=any
  libkleo4 deb libs optional arch=any
  libkmanagesieve4 deb libs optional arch=any
@@ -59,9 +45,6 @@
  libpimcommon4 deb libs optional arch=any
  libsendlater4 deb libs optional arch=any
  libtemplateparser4 deb libs optional arch=any
- notes-mobile deb kde optional arch=any
- storageservicemanager deb kde optional arch=any
- tasks-mobile deb utils optional arch=any
 Files:
- 00000000000000000000000000000000 0 kdepim-4.13.git.tar.gz
+ 00000000000000000000000000000000 0 kdepim-4.13.0.1.orig.tar.gz
  00000000000000000000000000000000 0 debian.tar.gz