[SCM] konsole packaging branch, master, updated. debian/15.08.0-1-1-g5145383

[Felix Geyer]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/konsole.git;a=commitdiff;h=5145383

The following commit has been merged in the master branch:
commit 514538398504ee03ce937631869cfae89a648946
Author: Felix Geyer <fgeyer at debian.org>
Date:   Thu Sep 17 18:14:14 2015 +0200

    New upstream release.
    
    * New upstream release.
      - Drop restore_movable_tabs.diff, applied upstream.
---
 debian/changelog                         |   7 ++
 debian/patches/restore_movable_tabs.diff | 114 -------------------------------
 debian/patches/series                    |   1 -
 3 files changed, 7 insertions(+), 115 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 825799a..9990090 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+konsole (4:15.08.1-1) unstable; urgency=medium
+
+  * New upstream release.
+    - Drop restore_movable_tabs.diff, applied upstream.
+
+ -- Felix Geyer <fgeyer at debian.org>  Thu, 17 Sep 2015 18:09:26 +0200
+
 konsole (4:15.08.0-1) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/restore_movable_tabs.diff b/debian/patches/restore_movable_tabs.diff
deleted file mode 100644
index 31e2487..0000000
--- a/debian/patches/restore_movable_tabs.diff
+++ /dev/null
@@ -1,114 +0,0 @@
-From: Kurt Hindenburg <kurt.hindenburg at gmail.com>
-Date: Mon, 17 Aug 2015 13:13:29 +0000
-Subject: Restore movable tabs
-X-Git-Url: http://quickgit.kde.org/?p=konsole.git&a=commitdiff&h=17b0fb74cb8df7b87d47ded651d686045880387c
----
-Restore movable tabs
-
-Using the mouse, the tabs are movable again.  Also this allow for dnd
-outside of current window to create a new window.
-
-Thanks to David Edmundson david davidedmundson co uk for patch.
-
-BUG: 348057
-BUG: 347094
-REVIEW: 124739
-(cherry picked from commit a9bac171f77982c6c20a437bc94b43e8ef863a87)
----
-
-
---- a/src/ViewContainer.cpp
-+++ b/src/ViewContainer.cpp
-@@ -264,9 +264,7 @@
-     connect(_tabBar, &Konsole::ViewContainerTabBar::moveViewRequest, this, &Konsole::TabbedViewContainer::onMoveViewRequest);
-     connect(_tabBar, &Konsole::ViewContainerTabBar::customContextMenuRequested, this, &Konsole::TabbedViewContainer::openTabContextMenu);
- 
--    // The below need converted to work with Qt5 QTabBar
--    //connect(_tabBar, &Konsole::ViewContainerTabBar::wheelDelta, this, &Konsole::TabbedViewContainer::wheelScrolled);
--    //connect(_tabBar, &Konsole::ViewContainerTabBar::initiateDrag, this, &Konsole::TabbedViewContainer::startTabDrag);
-+    connect(_tabBar, &Konsole::ViewContainerTabBar::initiateDrag, this, &Konsole::TabbedViewContainer::startTabDrag);
- 
-     // The context menu of tab bar
-     _contextPopupMenu = new QMenu(_tabBar);
-
---- a/src/ViewContainerTabBar.cpp
-+++ b/src/ViewContainerTabBar.cpp
-@@ -30,6 +30,7 @@
- #include <QtGui/QDragMoveEvent>
- #include <QtGui/QIcon>
- #include <QTabBar>
-+#include <QApplication>
- 
- // KDE
- #include <KLocalizedString>
-@@ -50,10 +51,36 @@
-     setSelectionBehaviorOnRemove(QTabBar::SelectPreviousTab);
-     setElideMode(Qt::ElideLeft);
- 
-+    setAcceptDrops(true);
-+    setMouseTracking(true);
-+
-     setWhatsThis(xi18nc("@info:whatsthis",
-                        "<title>Tab Bar</title>"
-                        "<para>The tab bar allows you to switch and move tabs. You can double-click a tab to change its name.</para>"));
- }
-+
-+void ViewContainerTabBar::mousePressEvent(QMouseEvent* event)
-+{
-+    if (event->buttons() == Qt::LeftButton) {
-+        _dragStart = event->pos();
-+    }
-+    QTabBar::mousePressEvent(event);
-+}
-+
-+void ViewContainerTabBar::mouseMoveEvent(QMouseEvent* event)
-+{
-+    if (event->buttons() == Qt::LeftButton) {
-+        QPoint dragPos = _dragStart - event->pos();
-+        if (dragPos.manhattanLength() > QApplication::startDragDistance()) {
-+            int tab = tabAt(_dragStart);
-+            if (tab != -1) {
-+                emit initiateDrag(tab);
-+            }
-+        }
-+    }
-+    QTabBar::mouseMoveEvent(event);
-+}
-+
- 
- void ViewContainerTabBar::dragEnterEvent(QDragEnterEvent* event)
- {
-
---- a/src/ViewContainerTabBar.h
-+++ b/src/ViewContainerTabBar.h
-@@ -47,14 +47,17 @@
-     TabbedViewContainer* connectedTabbedViewContainer();
- 
- signals:
-+    void initiateDrag(int index);
-     void querySourceIndex(const QDropEvent* event, int& sourceIndex) const;
-     void moveViewRequest(int index, const QDropEvent* event, bool& success, TabbedViewContainer* sourceTabbedContainer);
- 
- protected:
--    virtual void dragEnterEvent(QDragEnterEvent* event);
--    virtual void dragLeaveEvent(QDragLeaveEvent* event);
--    virtual void dragMoveEvent(QDragMoveEvent* event);
--    virtual void dropEvent(QDropEvent* event);
-+    void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE;
-+    void mouseMoveEvent(QMouseEvent *event) Q_DECL_OVERRIDE;
-+    virtual void dragEnterEvent(QDragEnterEvent* event) Q_DECL_OVERRIDE;
-+    virtual void dragLeaveEvent(QDragLeaveEvent* event) Q_DECL_OVERRIDE;
-+    virtual void dragMoveEvent(QDragMoveEvent* event) Q_DECL_OVERRIDE;
-+    virtual void dropEvent(QDropEvent* event) Q_DECL_OVERRIDE;
- 
- private:
-     // show the indicator arrow which shows where a dropped tab will
-@@ -74,6 +77,8 @@
-     bool _drawIndicatorDisabled;
-     QString _supportedMimeType;
-     TabbedViewContainer* _connectedContainer;
-+    QPoint _dragStart;
-+
- };
- }
- 
diff --git a/debian/patches/series b/debian/patches/series
index d1875df..bccb940 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 debian-T-addition.diff
-restore_movable_tabs.diff

-- 
konsole packaging