[SCM] gammaray packaging branch, master, updated. debian/2.1.0-5-19-gb6c2128

[Jakub Adam]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/gammaray.git;a=commitdiff;h=a100b49

The following commit has been merged in the master branch:
commit a100b49c14fa178d6542b85ceadc6ffe671cc4b1
Merge: dade711efe86d8f28ccb3dbcbdc371eac1a61a77 273b3c53a50e1bbd7bf6515dc4e3aa6ecb422de2
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Wed Jul 1 20:51:19 2015 +0200

    Merge remote-tracking branch 'origin/master'
    
    Conflicts:
    	debian/changelog
    	debian/patches/series

 debian/changelog              | 11 ++++++++++-
 debian/patches/gldouble.patch | 33 +++++++++++++++++++++++++++++++++
 debian/patches/qsglayer.patch | 22 ++++++++++++++++++++++
 debian/patches/series         |  2 ++
 debian/watch                  |  2 +-
 5 files changed, 68 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index 9449d57,470c35a..67ab4ff
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,18 -1,11 +1,26 @@@
 +gammaray (2.2.1-1) UNRELEASED; urgency=medium
 +
 +  * New upstream release.
 +  * Refresh debian-archs-fix-build.patch and fix-objectvisualizer-build.patch.
 +  * Install new signalmonitor and translatorinspector plugins.
 +  * Update d/changelog with (re)moved files.
 +  * Re-enable objectvisualizer plugin since Qt5-compatible VTK has become
 +    available.
 +  * Don't set RPATH in binaries; prevents binary-or-shlib-defines-rpath
 +    lintian error.
 +  * Disable build of Qt4 web inspector plugin since qtwebkit is to be removed
 +    from the repository (Closes: #784466).
 +
 + -- Jakub Adam <jakub.adam at ktknet.cz>  Sat, 07 Feb 2015 12:00:17 +0100
 +
+ gammaray (2.1.0-5) unstable; urgency=medium
+ 
+   * Apply changes from 2.1.0-3.1ubuntu2 by Dmitry Shachnev:
+     - Backport one more upstream patch, to fix build on armhf.
+     - Adapt to Qt 5.4 API changes (LP: #1395646).
+ 
+  -- Felix Geyer <fgeyer at debian.org>  Thu, 25 Jun 2015 19:32:55 +0200
+ 
  gammaray (2.1.0-4) unstable; urgency=medium
  
    [ Felix Geyer ]
diff --cc debian/patches/series
index d2e8ae3,5c5f6d9..a25056a
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,5 -1,3 +1,7 @@@
  debian-archs-fix-build.patch
 +fix-objectvisualizer-build.patch
 +use-empty-rpath.patch
 +disable-qt4-objectvisualizer.patch
 +disable-qt4-webinspector.patch
+ qsglayer.patch
+ gldouble.patch

-- 
gammaray packaging