[SCM] qt3d packaging branch, master, updated. debian/5.9.1+dfsg-1

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qt3d.git;a=commitdiff;h=e5af385

The following commit has been merged in the master branch:
commit e5af385c3ee1b5081e53f2bb990050302fc2fa88
Author: Simon Quigley <tsimonq2 at ubuntu.com>
Date:   Sun Jun 11 23:01:55 2017 -0500

    QTBUG-57543 was fixed, and we can ship the planets example now. Drop the exclusions in the packaging.
---
 debian/changelog                                  |  4 +++-
 debian/copyright                                  |  2 --
 debian/patches/do_not_build_planets_example.patch | 18 ------------------
 debian/patches/series                             |  1 -
 debian/watch                                      |  1 -
 5 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 39f8483..8ca8ff6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-qt3d-opensource-src (5.9.0+dfsg-1) UNRELEASED; urgency=medium
+qt3d-opensource-src (5.9.0-1) UNRELEASED; urgency=medium
 
   * New upstream release.
   * Add myself to Uploaders.
@@ -7,6 +7,8 @@ qt3d-opensource-src (5.9.0+dfsg-1) UNRELEASED; urgency=medium
     all gltf-related files.
   * Qt 3D GL Assimp scene IO plugin was renamed upstream, adjust
     accordingly.
+  * QTBUG-57543 was fixed, and we can ship the planets example now. Drop
+    the exclusions in the packaging.
 
  -- Simon Quigley <tsimonq2 at ubuntu.com>  Fri, 09 Jun 2017 23:52:28 -0500
 
diff --git a/debian/copyright b/debian/copyright
index 5bf0063..4c554dc 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,8 +1,6 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: qt3d-opensource-src
 Source: https://download.qt.io/official_releases/qt/*/submodules/
-Files-Excluded: examples/qt3d/audio-visualizer-qml
-  examples/qt3d/planets-qml/images
 
 Files: *
 Copyright: 2014 Klaralvdalens Datakonsult AB (KDAB)
diff --git a/debian/patches/do_not_build_planets_example.patch b/debian/patches/do_not_build_planets_example.patch
deleted file mode 100644
index 64504a4..0000000
--- a/debian/patches/do_not_build_planets_example.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: do not build planets-qml example.
- This examples uses non-free images which we can't distribute.
-Author: Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
-Forwarded: not-needed
----
- examples/qt3d/qt3d.pro |    1 -
- 1 file changed, 1 deletion(-)
-
---- a/examples/qt3d/qt3d.pro
-+++ b/examples/qt3d/qt3d.pro
-@@ -12,7 +12,6 @@ SUBDIRS += \
-     scene3d \
-     controls \
-     anaglyph-rendering \
--    planets-qml \
-     instanced-arrays-qml \
-     lights \
-     compute-particles \
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index d91f544..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-do_not_build_planets_example.patch
diff --git a/debian/watch b/debian/watch
index 10c9049..03caf01 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,2 @@
 version=3
-opts=uversionmangle=s/-/~/,dversionmangle=s/\+dfsg//,repacksuffix=+dfsg \
 https://download.qt.io/official_releases/qt/([\d\.]*)/([\d\.]*)/submodules/qt3d-opensource-src-([^-]*)\.tar.xz

-- 
qt3d packaging