[SCM] oxygen-gtk3 packaging branch, master, updated. debian/1.2.0-1-4-g91beaed

[Dmitry Smirnov]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/oxygen-gtk3.git;a=commitdiff;h=91beaed

The following commit has been merged in the master branch:
commit 91beaed28e7970708c34a113e76d61ab9cc97744
Author: Dmitry Smirnov <onlyjob at member.fsf.org>
Date:   Sun Mar 16 12:43:17 2014 +1100

    New upstream release [1.3.4] + changelog summary
---
 debian/changelog                            |  7 ++++---
 debian/patches/oxygen-gtk3-scroll-fix.patch | 21 ---------------------
 debian/patches/series                       |  1 -
 3 files changed, 4 insertions(+), 25 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bd56a6b..69df823 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,11 @@
-oxygen-gtk3 (1.3.3-1) UNRELEASED; urgency=low
+oxygen-gtk3 (1.3.4-1) unstable; urgency=low
 
-  * New upstream release [January 2014].
+  * New upstream release [March 2014].
     + Build-Depends: libgtk-3-dev (>= 3.10)
   * Bump Standards to 3.9.5.
+  * Dropped obsolete "oxygen-gtk3-scroll-fix.patch".
 
- -- Dmitry Smirnov <onlyjob at debian.org>  Mon, 10 Feb 2014 23:43:10 +1100
+ -- Dmitry Smirnov <onlyjob at debian.org>  Sun, 16 Mar 2014 12:41:11 +1100
 
 oxygen-gtk3 (1.2.0-1) unstable; urgency=low
 
diff --git a/debian/patches/oxygen-gtk3-scroll-fix.patch b/debian/patches/oxygen-gtk3-scroll-fix.patch
deleted file mode 100644
index 9188346..0000000
--- a/debian/patches/oxygen-gtk3-scroll-fix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Last-Update: 2013-10-12
-Forwarded: not-needed
-Author: Dmitry Smirnov <onlyjob at member.fsf.org>
-Origin: https://bugs.kde.org/attachment.cgi?id=80588&action=edit
-Bug-KDE: https://bugs.kde.org/show_bug.cgi?id=321284
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=714205
-Description: fix mouse wheel scrolling
-
---- a/src/animations/oxygenscrolledwindowdata.cpp
-+++ b/src/animations/oxygenscrolledwindowdata.cpp
-@@ -139,9 +139,9 @@
-                 << std::endl;
-             #endif
- 
-             // adjust event mask
--            gtk_widget_add_events( widget, GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK|GDK_FOCUS_CHANGE_MASK );
-+            gtk_widget_add_events( widget, GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK|GDK_FOCUS_CHANGE_MASK|GDK_SCROLL_MASK|GDK_SMOOTH_SCROLL_MASK );
- 
-             // allocate new Hover data
-             ChildData data;
-             data._destroyId.connect( G_OBJECT(widget), "destroy", G_CALLBACK( childDestroyNotifyEvent ), this );
diff --git a/debian/patches/series b/debian/patches/series
index 47c017a..625ddbd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 dont-build-demos.patch
-oxygen-gtk3-scroll-fix.patch

-- 
oxygen-gtk3 packaging