[SCM] qt3d packaging branch, experimental, updated. debian/5.7.1+dfsg-2-14-gcea14a9

Dmitry Shachnev mitya57 at moszumanska.debian.org
Tue Jun 13 11:06:50 UTC 2017


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

The following commit has been merged in the experimental branch:
commit cea14a9f1737e836fd4b84302a60025772dbd1f5
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Tue Jun 13 13:52:02 2017 +0300

    We still need to exclude examples/qt3d/audio-visualizer-qml.
    
    Its license is CC BY-ND 2.0 which does not allow distributing modified
    material.
---
 debian/changelog | 4 ++--
 debian/control   | 4 ++--
 debian/copyright | 1 +
 debian/watch     | 1 +
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4dff63f..d1545f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-qt3d-opensource-src (5.9.0-1) UNRELEASED; urgency=medium
+qt3d-opensource-src (5.9.0+dfsg-1) UNRELEASED; urgency=medium
 
   [ Simon Quigley ]
   * New upstream release.
@@ -8,7 +8,7 @@ qt3d-opensource-src (5.9.0-1) UNRELEASED; urgency=medium
   * 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.
+    do_not_build_planets_example.patch.
   * Add the following packages from new upstream files:
     - qml-module-qtquick-scene2d
     - libqt53dquickscene2d5
diff --git a/debian/control b/debian/control
index 6ee575f..f2fd98f 100644
--- a/debian/control
+++ b/debian/control
@@ -189,8 +189,8 @@ Multi-Arch: same
 Depends: libqt53dcore5 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
-Breaks: qt3d-assimpsceneio-plugin (<< 5.9.0-1~)
-Replaces: qt3d-assimpsceneio-plugin (<< 5.9.0-1~)
+Breaks: qt3d-assimpsceneio-plugin (<< 5.9.0+dfsg-1~)
+Replaces: qt3d-assimpsceneio-plugin (<< 5.9.0+dfsg-1~)
 Description: Qt 3D GL Transmission Format scene IO plugin
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
diff --git a/debian/copyright b/debian/copyright
index 4c554dc..11fb04d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,7 @@
 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
 
 Files: *
 Copyright: 2014 Klaralvdalens Datakonsult AB (KDAB)
diff --git a/debian/watch b/debian/watch
index 03caf01..10c9049 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,3 @@
 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



More information about the pkg-kde-commits mailing list