[SCM] ktp-contact-applet packaging branch, upstream, updated. upstream/0.8.80-2-ga60683c

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-desktop-applets.git;a=commitdiff;h=a60683c

The following commit has been merged in the upstream branch:
commit a60683ce919243706d1ffc0eece42d4b601cc47f
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Jun 5 11:18:17 2015 +0200

    Imported Upstream version 15.04.2
---
 CMakeLists.txt                                     |  2 +-
 .../contents/ui/ExternalLabel.qml                  | 55 ----------------------
 2 files changed, 1 insertion(+), 56 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 64bd6bd..84aa659 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@ project(ktp-desktop-applets)
 
 cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
 
-set(KTP_DESKTOP_APPLETS_VERSION "15.04.1")
+set(KTP_DESKTOP_APPLETS_VERSION "15.04.2")
 
 find_package(ECM 0.0.11 REQUIRED NO_MODULE)
 set (CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
diff --git a/contactlist/org.kde.ktp-contactlist/contents/ui/ExternalLabel.qml b/contactlist/org.kde.ktp-contactlist/contents/ui/ExternalLabel.qml
deleted file mode 100644
index 3674211..0000000
--- a/contactlist/org.kde.ktp-contactlist/contents/ui/ExternalLabel.qml
+++ /dev/null
@@ -1,55 +0,0 @@
-/***************************************************************************
- *   Copyright (C) 2011 by Francesco Nwokeka <francesco.nwokeka at gmail.com> *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
- ***************************************************************************/
-
-import QtQuick 2.1
-import org.kde.plasma.core 2.0 as PlasmaCore
-import org.kde.plasma.graphicswidgets 0.1 as PlasmaWidgets
-
-Item {
-    id: label;
-
-    // this property holds which side the label is to be viewed. Default is left
-    // and changes when user changes screen edge from settings ui.
-    property string orientation: "left";
-    signal orientationChanged();
-    property QtObject theme: PlasmaCore.Theme {}
-
-    PlasmaWidgets.IconWidget {
-        id: labelIcon;
-        icon: QIcon("kde-telepathy");
-        drawBackground: false;
-        text: i18n("ContactList");
-        orientation: QtHorizontal;
-        textBackgroundColor: theme.backgroundColor;
-        anchors.fill: parent;
-    }
-
-    function setOrientation(newOrientation)
-    {
-        if (newOrientation == "left"
-                || newOrientation == "right"
-                || newOrientation == "bottom"
-                || newOrientation == "top") {
-            label.orientation = newOrientation;
-            label.orientationChanged();
-        } else {
-            console.log("CAN'T SET FAILED ORIENTATION!");
-        }
-    }
-}

-- 
ktp-contact-applet packaging