[SCM] qt3d packaging branch, ubuntu, updated. debian/5.5.0-1-9-g9e9083a

Timo Jyrinki timo at moszumanska.debian.org
Wed Sep 9 11:21:21 UTC 2015


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

The following commit has been merged in the ubuntu branch:
commit 9e9083a7cfd6156527f6aaf5ba830edefebccf39
Merge: ca21aba7ab0f51e7ff0627ecae47af08124de320 89c2b1ded1c2617f780ab4fd8d5590ecd9f59c6f
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Wed Sep 9 11:09:32 2015 +0000

    Merge branch 'master' into ubuntu

 debian/changelog                          |   12 +-
 debian/control                            |   99 +-
 debian/copyright                          |  449 +++-----
 debian/libqt53dinput5.symbols             |  120 +++
 debian/libqt53dquickrenderer5.symbols     |  266 +++++
 debian/libqt53drenderer5.symbols          | 1678 +++++++++++++++++++++++++++++
 debian/qml-module-qt3d.install            |    2 +-
 debian/qml-module-qtquick-scene3d.install |    1 +
 debian/qt3d5-doc-html.install             |    2 +
 debian/qt3d5-doc.install                  |    2 +
 debian/rules                              |   27 +-
 debian/watch                              |    2 +
 12 files changed, 2289 insertions(+), 371 deletions(-)

diff --cc debian/changelog
index 56f4606,c3eb4a0..4bed08e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,130 -1,6 +1,140 @@@
- qt3d-opensource-src (5.5.0-0ubuntu1) UNRELEASED; urgency=medium
++qt3d-opensource-src (5.5.0-1ubuntu1) UNRELEASED; urgency=medium
 +
 +  * New upstream release of the rewritten Qt 3D 2.0.
 +  * Update symbols.
++  * Merge with Debian's initial release, remaining changes:
++    - A transitional package for Ubuntu 14.04 LTS -> 16.04 LTS.
++    - Own symbols files.
 +
 + -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Wed, 03 Jun 2015 14:47:26 +0000
 +
+ qt3d-opensource-src (5.5.0-1) experimental; urgency=medium
+ 
+   [ Timo Jyrinki ]
+   * Initial release. (Closes: #697509)
+ 
+  -- Dmitry Shachnev <mitya57 at debian.org>  Fri, 04 Sep 2015 13:32:31 +0300
++
 +qt3d-opensource-src (5.0~git20130731-0ubuntu12) wily; urgency=medium
 +
 +  * Rebuild for GCC5 transition.
 +  * Update symbols.
 +
 + -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Tue, 14 Jul 2015 13:32:57 +0300
 +
 +qt3d-opensource-src (5.0~git20130731-0ubuntu11) wily; urgency=medium
 +
 +  * No-change rebuild against Qt 5.4.2
 +
 + -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Thu, 11 Jun 2015 13:54:22 +0000
 +
 +qt3d-opensource-src (5.0~git20130731-0ubuntu10) vivid; urgency=medium
 +
 +  * Build against Qt 5.4.1
 +
 + -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Wed, 11 Mar 2015 06:12:57 +0000
 +
 +qt3d-opensource-src (5.0~git20130731-0ubuntu9) vivid; urgency=medium
 +
 +  * Build against Qt 5.4.0
 +  * debian/patches/noprecompile.patch (LP: #1395657)
 +
 + -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Fri, 13 Feb 2015 06:45:53 +0000
 +
 +qt3d-opensource-src (5.0~git20130731-0ubuntu8) vivid; urgency=medium
 +
 +  * Switch to qml-module-* naming (LP: #1342031)
 +
 + -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Thu, 11 Dec 2014 12:37:32 +0000
 +
 +qt3d-opensource-src (5.0~git20130731-0ubuntu7) vivid; urgency=medium
 +
 +  * Rebuild against Qt 5.3.2
 +  * Update symbols
 +
 + -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Tue, 28 Oct 2014 07:07:38 +0000
 +
 +qt3d-opensource-src (5.0~git20130731-0ubuntu6) utopic; urgency=medium
 +
 +  * Rebuild against 5.3
 +  * Move include files
 +  * Add a patch to fix compilation
 +  * Disable a few qvectorarray tests for now that started failing
 +
 + -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Fri, 09 May 2014 08:04:40 +0000
 +
 +qt3d-opensource-src (5.0~git20130731-0ubuntu5) trusty; urgency=medium
 +
 +  * libqt53d5.symbols: updating symbols and adding adding dep alternative
 +    for the version compatible with OpenGLES (provided by another src pkg)
 +
 + -- Ricardo Salveti de Araujo <ricardo.salveti at canonical.com>  Thu, 10 Apr 2014 05:06:25 -0300
 +
 +qt3d-opensource-src (5.0~git20130731-0ubuntu4) trusty; urgency=medium
 +
 +  * Run tests only on archs known to pass in the past
 +
 + -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Fri, 14 Mar 2014 11:51:29 +0000
 +
 +qt3d-opensource-src (5.0~git20130731-0ubuntu3) trusty; urgency=medium
 +
 +  * Backport upstream patch to fix build on “uncommon” architectures.
 +
 + -- Dmitry Shachnev <mitya57 at ubuntu.com>  Fri, 14 Mar 2014 09:15:26 +0400
 +
 +qt3d-opensource-src (5.0~git20130731-0ubuntu2) trusty; urgency=medium
 +
 +  [ Timo Jyrinki ]
 +  * Rebuild against Qt 5.2.1, bump dependencies
 +  * Use QT_SELECT instead of depending on qt5-default
 +  * Use 'mkdir .git' to trigger header build for the snapshot release
 +
 +  [ Allan LeSage ]
 +  * Add tests to QT_BUILD_PARTS. (LP: #1193370)
 +  * Depend on xvfb for existing tests requiring a display.
 +  * Add dh_override_auto_test to dh_auto_test under xvfb-run.
 +  * debian/patches/skip_failing_tests.patch
 +    - Skip some failing tests pending investigation.
 +  * Depend on xauth, needed in some configurations.
 +
 + -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Fri, 28 Feb 2014 09:00:49 +0000
 +
 +qt3d-opensource-src (5.0~git20130731-0ubuntu1) saucy; urgency=low
 +
 +  * New upstream snapshot release
 +  * Improve override_dh_auto_install, use --fail-missing
 +  * Drop patches:
 +    - add_GPL_license_file.patch, merged upstream
 +    - add_module_version.patch, added upstream
 +    - disable_conflicting_examples.patch, not needed anymore
 +  * Refresh link_against_system_zlib.patch
 +  * Add bug link to workaround_zlib_linking_issue.patch
 +
 + -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Fri, 02 Aug 2013 11:10:16 +0300
 +
 +qt3d-opensource-src (5.0~git20130109-0ubuntu3) saucy; urgency=low
 +
 +  * debian/patches/add_module_version.patch:
 +    - Add a module version to fix FTBFS
 +
 + -- Didier Roche <didrocks at ubuntu.com>  Fri, 21 Jun 2013 17:59:14 +0200
 +
 +qt3d-opensource-src (5.0~git20130109-0ubuntu2) raring; urgency=low
 +
 +  [ Timo Jyrinki ]
 +  * Fix pkgconfig Libs.private path (LP: #1125156)
 +  * debian/patches/workaround_zlib_linking_issue.patch:
 +    - Fix FTBFS
 +
 +  [ Didier Roche ]
 +  * Fixed some small copyright issues
 +
 + -- Didier Roche <didrocks at ubuntu.com>  Fri, 15 Feb 2013 12:52:28 +0100
 +
 +qt3d-opensource-src (5.0~git20130109-0ubuntu1) raring; urgency=low
 +
 +  * Initial release
 +  * Cherry-pick from upstream:
 +    - add_license_files.patch
 +
 + -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Tue, 22 Jan 2013 14:32:08 +0200
diff --cc debian/control
index 11fa65c,9787ebf..49a5b66
--- a/debian/control
+++ b/debian/control
@@@ -1,12 -1,17 +1,18 @@@
  Source: qt3d-opensource-src
  Section: libs
  Priority: optional
 -Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 +Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
- Build-Depends: debhelper (>= 9.0.0),
-                libqt5opengl5-dev,
-                libqt5xcbqpa5,
++XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+ Uploaders: Timo Jyrinki <timo at debian.org>,
+            Sune Vuorela <debian at pusling.com>,
+            Pino Toscano <pino at debian.org>,
+            Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>,
+            Dmitry Shachnev <mitya57 at debian.org>
+ Build-Depends: debhelper (>= 9),
+                libqt5opengl5-dev (>= 5.5.0+dfsg~),
+                libqt5xcbqpa5 (>= 5.5.0+dfsg~),
                 pkg-kde-tools,
-                qtbase5-private-dev (>= 5.5.0~),
+                qtbase5-private-dev (>= 5.5.0+dfsg~),
                 qtdeclarative5-private-dev (>= 5.5.0~),
                 xauth,
                 xvfb,

-- 
qt3d packaging



More information about the pkg-kde-commits mailing list