Merge lp:~mitya57/ubuntu/saucy/qtdeclarative-opensource-src/merge into lp:ubuntu/saucy/qtdeclarative-opensource-src

[Dmitry Shachnev]

This is a merge from Debian, started by Timo and finished by me. This is needed to unblock landing of new qtdoc package.

The only difference from what is in bzr now is a "dch -r" call.

[Timo Jyrinki (timo-jyrinki)]

Looks good, the documentation packages will be very welcome.

review: Approve

[Timo Jyrinki (timo-jyrinki)]

Addendum: I added two cherry-picked patches requested by Florian on top of the packaging branch lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src - those were tested to be functional (https://bugs.launchpad.net/ubuntu/+source/qtdeclarative-opensource-src/+bug/1198830) and would be good to include as well.

[Timo Jyrinki (timo-jyrinki)]

That now also at https://code.launchpad.net/~timo-jyrinki/ubuntu/saucy/qtdeclarative-opensource-src/merge_continued/+merge/173448

=== modified file 'debian/changelog'
--- debian/changelog	2013-06-20 15:24:17 +0000
+++ debian/changelog	2013-06-28 14:52:14 +0000
@@ -1,3 +1,83 @@
+qtdeclarative-opensource-src (5.0.2-6ubuntu1) saucy; urgency=low
+
+  [ Timo Jyrinki ]
+  * Resync with Debian, remaining changes:
+    - Keep cherry-picked patches, and symbols
+    - Keep debian/patches/rendering_performance_fix_lp1092358.patch
+    - Add Vcs-Bzr field
+
+  [ Dmitry Shachnev ]
+  * Merge with Debian 5.0.2-6 to bring in documentation packages.
+  * Note: architecture restrictions have been dropped from this upload,
+    as requested by the Release Team.
+
+ -- Dmitry Shachnev <[e-mail]>  Fri, 28 Jun 2013 18:32:07 +0400
+
+qtdeclarative-opensource-src (5.0.2-6) experimental; urgency=low
+
+  * Update symbols files.
+
+ -- Lisandro Damián Nicanor Pérez Meyer <[e-mail]>  Wed, 26 Jun 2013 18:29:51 -0300
+
+qtdeclarative-opensource-src (5.0.2-5) experimental; urgency=low
+
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Make every package that ships a binary managed by qtchooser depend on it.
+  * Build the documentation shipped with this submodule as a build-indep task:
+    - Add the necessary indep build dependencies:
+      * qttools5-dev-tools to use qhelpgenerator.
+      * libqt5sql5-sqlite to generate qch doc.
+    - Build and create packages for qch and HTML doc formats.
+  * Update symbols files.
+  * Set qtdeclarative5-dbg as M-A same, so it can be coinstalled with other
+    archs debugging symbols.
+
+  [ Timo Jyrinki ]
+  * Depend on libgl1-mesa-dri from the qtquick2 QML plugin
+    - Not depending may cause crashes due to lack of VBO support
+      (https://bugs.launchpad.net/bugs/1176199)
+
+ -- Lisandro Damián Nicanor Pérez Meyer <[e-mail]>  Wed, 19 Jun 2013 21:33:20 -0300
+
+qtdeclarative-opensource-src (5.0.2-4) experimental; urgency=low
+
+  [ Pino Toscano ]
+  * debian/control: remove extra ${misc:Pre-Depends} from qmlscene and
+    qtdeclarative5-dev-tools.
+  * Update symbols files.
+  * Fix Vcs-* headers.
+
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Update symbols with amd64 build.
+
+ -- Lisandro Damián Nicanor Pérez Meyer <[e-mail]>  Sat, 18 May 2013 21:25:40 -0300
+
+qtdeclarative-opensource-src (5.0.2-3) experimental; urgency=low
+
+  [ Pino Toscano ]
+  * Update symbols files.
+
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Update symbols files.
+
+ -- Lisandro Damián Nicanor Pérez Meyer <[e-mail]>  Mon, 06 May 2013 14:53:19 -0300
+
+qtdeclarative-opensource-src (5.0.2-2) experimental; urgency=low
+
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Fix wrong permissions of examples.
+
+  [ Pino Toscano ]
+  * Update symbols files.
+  * qtdeclarative5-localstorage-plugin: depend on libqt5sql5-sqlite, as it is
+    used directly.
+  * Remove extra ${shlibs:Depends} from qtdeclarative5-private-dev.
+  * Bump the libqt5v8-5-private-dev and libqt5xmlpatterns5-private-dev build
+    dependencies to 5.0.2~.
+  * rules: use $(DEB_HOST_MULTIARCH) everywhere.
+
+ -- Lisandro Damián Nicanor Pérez Meyer <[e-mail]>  Tue, 30 Apr 2013 20:45:49 -0300
+
 qtdeclarative-opensource-src (5.0.2-1ubuntu2) saucy; urgency=low
 
   [ Timo Jyrinki ]

=== modified file 'debian/control'
--- debian/control	2013-04-29 16:27:13 +0000
+++ debian/control	2013-06-28 14:52:14 +0000
@@ -11,18 +11,20 @@
            Timo Jyrinki <[e-mail]>
 Build-Depends: debhelper (>= 9),
                dpkg-dev (>= 1.16.1),
-               libqt5v8-5-private-dev (>= 5.0.1~),
-               libqt5xmlpatterns5-private-dev (>= 5.0.1~),
+               libqt5v8-5-private-dev (>= 5.0.2~),
+               libqt5xmlpatterns5-private-dev (>= 5.0.2~),
                pkg-kde-tools,
                qtbase5-private-dev (>= 5.0.2~)
+Build-Depends-Indep: libqt5sql5-sqlite,
+                     qttools5-dev-tools (>= 5.0.2~)
 Standards-Version: 3.9.4
 Homepage: http://qt-project.org/
-Vcs-Git: git://git.debian.org/pkg-kde/qt/qtdeclarative.git
-Vcs-Browser: http://git.debian.org/?p=pkg-kde/qt/qtdeclarative.git;a=summary
+Vcs-Git: git://anonscm.debian.org/pkg-kde/qt/qtdeclarative.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/qt/qtdeclarative.git;a=summary
 Vcs-Bzr: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src
 
 Package: libqt5qml5
-Architecture: amd64 i386 armhf
+Architecture: any
 Multi-Arch: same
 Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -37,7 +39,7 @@
  QML code with JavaScript and C++.
 
 Package: libqt5quick5
-Architecture: amd64 i386 armhf
+Architecture: any
 Multi-Arch: same
 Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -51,7 +53,7 @@
  boxes and other portable devices.
 
 Package: libqt5quickparticles5
-Architecture: amd64 i386 armhf
+Architecture: any
 Multi-Arch: same
 Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -62,7 +64,7 @@
  This package contains the Qt Quick Particles support library.
 
 Package: libqt5quicktest5
-Architecture: amd64 i386 armhf
+Architecture: any
 Multi-Arch: same
 Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -73,7 +75,7 @@
  This package contains the Qt Quick Test library for QtDeclarative module.
 
 Package: qtdeclarative5-folderlistmodel-plugin
-Architecture: amd64 i386 armhf
+Architecture: any
 Multi-Arch: same
 Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -84,10 +86,10 @@
  The FolderListModel provides a model of the contents of a file system folder.
 
 Package: qtdeclarative5-localstorage-plugin
-Architecture: amd64 i386 armhf
+Architecture: any
 Multi-Arch: same
 Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}, libqt5sql5-sqlite
 Description: Qt 5 localstorage QML plugin
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -95,7 +97,7 @@
  This is a singleton type for reading and writing to SQLite databases.
 
 Package: qtdeclarative5-particles-plugin
-Architecture: amd64 i386 armhf
+Architecture: any
 Multi-Arch: same
 Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -106,7 +108,7 @@
  This QML module contains a particle system for Qt Quick.
 
 Package: qtdeclarative5-qtquick2-plugin
-Architecture: amd64 i386 armhf
+Architecture: any
 Multi-Arch: same
 Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
 Depends: libgl1-mesa-dri, ${misc:Depends}, ${shlibs:Depends}
@@ -117,7 +119,7 @@
  This package contains the Qt Quick 2 QML plugin for Qt declarative.
 
 Package: qtdeclarative5-test-plugin
-Architecture: amd64 i386 armhf
+Architecture: any
 Multi-Arch: same
 Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -128,7 +130,7 @@
  This package contains the test QML plugin for Qt declarative.
 
 Package: qtdeclarative5-window-plugin
-Architecture: amd64 i386 armhf
+Architecture: any
 Multi-Arch: same
 Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -140,7 +142,7 @@
  accessing screen information.
 
 Package: qtdeclarative5-xmllistmodel-plugin
-Architecture: amd64 i386 armhf
+Architecture: any
 Multi-Arch: same
 Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -152,7 +154,7 @@
 
 Package: qtdeclarative5-dev
 Section: libdevel
-Architecture: amd64 i386 armhf
+Architecture: any
 Pre-Depends: dpkg (>= 1.15.6~)
 Depends: libqt5qml5 (= ${binary:Version}),
          libqt5quick5 (= ${binary:Version}),
@@ -168,12 +170,11 @@
  Qt 5 applications using Qt 5 declarative headers.
 
 Package: qtdeclarative5-private-dev
-Architecture: amd64 i386 armhf
+Architecture: any
 Section: libdevel
 Pre-Depends: dpkg (>= 1.15.6~)
 Depends: qtdeclarative5-dev (= ${binary:Version}),
          ${misc:Depends},
-         ${shlibs:Depends}
 Description: Qt 5 declarative private development files
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -184,12 +185,11 @@
  Use at your own risk.
 
 Package: qtdeclarative5-dev-tools
-Architecture: amd64 i386 armhf
+Architecture: any
 Multi-Arch: foreign
 Section: devel
-Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Recommends: qtchooser
+Pre-Depends: dpkg (>= 1.15.6~)
+Depends: qtchooser, ${misc:Depends}, ${shlibs:Depends}
 Description: Qt 5 declarative development programs
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -198,12 +198,11 @@
  declarative applications.
 
 Package: qmlscene
-Architecture: amd64 i386 armhf
+Architecture: any
 Multi-Arch: foreign
 Section: devel
-Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Recommends: qtchooser
+Pre-Depends: dpkg (>= 1.15.6~)
+Depends: qtchooser, ${misc:Depends}, ${shlibs:Depends}
 Description: Qt 5 QML scene viewer
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -211,7 +210,7 @@
  This package contains the QML viewer for Qt Quick 2.
 
 Package: qtdeclarative5-examples
-Architecture: amd64 i386 armhf
+Architecture: any
 Multi-Arch: same
 Section: x11
 Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
@@ -224,7 +223,8 @@
 
 Package: qtdeclarative5-dbg
 Priority: extra
-Architecture: amd64 i386 armhf
+Architecture: any
+Multi-Arch: same
 Section: debug
 Pre-Depends: dpkg (>= 1.15.6~)
 Depends: libqt5qml5 (= ${binary:Version}),
@@ -239,3 +239,26 @@
  is its rich set of widgets that provide standard GUI functionality.
  .
  This package contains the debugging symbols for the Qt 5 declarative libraries.
+
+Package: qtdeclarative5-doc
+Priority: extra
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}
+Description: Qt 5 declarative documentation
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ This package contains the documentation for the Qt 5 declarative libraries.
+
+Package: qtdeclarative5-doc-html
+Priority: extra
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}
+Description: Qt 5 declarative HTML documentation
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ This package contains the HTML documentation for the Qt 5 declarative
+ libraries.

=== modified file 'debian/copyright'
--- debian/copyright	2013-04-29 16:27:13 +0000
+++ debian/copyright	2013-06-28 14:52:14 +0000
@@ -17,8 +17,48 @@
            2012-2013 Timo Jyrinki <[e-mail]>
 License: LGPL-2.1
 
-Files: examples/* src/qml/doc/snippets/* src/quick/doc/snippets/* tests/auto/qmltest/listview/tst_listview.qml tests/auto/qmltest/listview/tst_listview.qml tests/auto/qmltest/image/tst_image.qml tests/auto/qmltest/image/tst_image.qml tests/auto/qmltest/text/tst_text.qml tests/auto/qmltest/text/tst_text.qml tests/auto/qmltest/animatedimage/tst_animatedimage.qml tests/auto/qmltest/animatedimage/tst_animatedimage.qml tests/auto/qmltest/gradient/tst_gradient.qml tests/auto/qmltest/gradient/tst_gradient.qml tests/auto/qmltest/textinput/tst_textinput.qml tests/auto/qmltest/textinput/tst_textinput.qml tests/auto/qmltest/rectangle/tst_rectangle.qml tests/auto/qmltest/rectangle/tst_rectangle.qml tests/auto/qmltest/textedit/tst_textedit.qml tests/auto/qmltest/textedit/tst_textedit.qml tests/auto/qmltest/listmodel/tst_listmodel.qml tests/auto/qmltest/listmodel/tst_listmodel.qml tests/auto/qmltest/fontloader/tst_fontloader.qml tests/auto/qmltest/fontloader/tst_fontloader.qml tests/benchmarks/qml/holistic/data/
-largeTargets/gridview-example.qml tests/benchmarks/qml/holistic/data/largeTargets/gridview-example.qml tests/benchmarks/qml/holistic/data/largeTargets/mousearea-example.qml tests/benchmarks/qml/holistic/data/largeTargets/mousearea-example.qml tests/benchmarks/qml/holistic/data/largeTargets/layoutdirection.qml tests/benchmarks/qml/holistic/data/largeTargets/layoutdirection.qml tests/testapplications/listview/sections.qml tests/testapplications/listview/sections.qml tests/testapplications/listview/onRemove.qml tests/testapplications/listview/onRemove.qml tests/testapplications/listview/alteredViews.qml tests/testapplications/listview/alteredViews.qml tests/testapplications/listview/viewTransitions.qml tests/testapplications/listview/viewTransitions.qml tests/testapplications/animatedsprite/animatedsprite.qml tests/testapplications/animatedsprite/animatedsprite.qml tests/testapplications/animatedsprite/animatedspriteadvance.qml tests/testapplications/animatedsprite/animatedspriteadvance.qml
+Files: examples/*
+ src/qml/doc/snippets/*
+ src/quick/doc/snippets/*
+ tests/auto/qmltest/listview/tst_listview.qml
+ tests/auto/qmltest/listview/tst_listview.qml
+ tests/auto/qmltest/image/tst_image.qml
+ tests/auto/qmltest/image/tst_image.qml
+ tests/auto/qmltest/text/tst_text.qml
+ tests/auto/qmltest/text/tst_text.qml
+ tests/auto/qmltest/animatedimage/tst_animatedimage.qml
+ tests/auto/qmltest/animatedimage/tst_animatedimage.qml
+ tests/auto/qmltest/gradient/tst_gradient.qml
+ tests/auto/qmltest/gradient/tst_gradient.qml
+ tests/auto/qmltest/textinput/tst_textinput.qml
+ tests/auto/qmltest/textinput/tst_textinput.qml
+ tests/auto/qmltest/rectangle/tst_rectangle.qml
+ tests/auto/qmltest/rectangle/tst_rectangle.qml
+ tests/auto/qmltest/textedit/tst_textedit.qml
+ tests/auto/qmltest/textedit/tst_textedit.qml
+ tests/auto/qmltest/listmodel/tst_listmodel.qml
+ tests/auto/qmltest/listmodel/tst_listmodel.qml
+ tests/auto/qmltest/fontloader/tst_fontloader.qml
+ tests/auto/qmltest/fontloader/tst_fontloader.qml
+ tests/benchmarks/qml/holistic/data/
+ largeTargets/gridview-example.qml
+ tests/benchmarks/qml/holistic/data/largeTargets/gridview-example.qml
+ tests/benchmarks/qml/holistic/data/largeTargets/mousearea-example.qml
+ tests/benchmarks/qml/holistic/data/largeTargets/mousearea-example.qml
+ tests/benchmarks/qml/holistic/data/largeTargets/layoutdirection.qml
+ tests/benchmarks/qml/holistic/data/largeTargets/layoutdirection.qml
+ tests/testapplications/listview/sections.qml
+ tests/testapplications/listview/sections.qml
+ tests/testapplications/listview/onRemove.qml
+ tests/testapplications/listview/onRemove.qml
+ tests/testapplications/listview/alteredViews.qml
+ tests/testapplications/listview/alteredViews.qml
+ tests/testapplications/listview/viewTransitions.qml
+ tests/testapplications/listview/viewTransitions.qml
+ tests/testapplications/animatedsprite/animatedsprite.qml
+ tests/testapplications/animatedsprite/animatedsprite.qml
+ tests/testapplications/animatedsprite/animatedspriteadvance.qml
+ tests/testapplications/animatedsprite/animatedspriteadvance.qml
 Copyright: 2012 Digia Plc and/or its subsidiary(-ies)
 License: BSD-3-clause
 

=== added file 'debian/qtdeclarative5-doc-html.install'
--- debian/qtdeclarative5-doc-html.install	1970-01-01 00:00:00 +0000
+++ debian/qtdeclarative5-doc-html.install	2013-06-28 14:52:14 +0000
@@ -0,0 +1,2 @@
+usr/share/qt5/doc/qtqml/
+usr/share/qt5/doc/qtquick/

=== added file 'debian/qtdeclarative5-doc.install'
--- debian/qtdeclarative5-doc.install	1970-01-01 00:00:00 +0000
+++ debian/qtdeclarative5-doc.install	2013-06-28 14:52:14 +0000
@@ -0,0 +1,2 @@
+usr/share/qt5/doc/qtquick.qch
+usr/share/qt5/doc/qtqml.qch

=== modified file 'debian/rules'
--- debian/rules	2013-04-29 16:27:13 +0000
+++ debian/rules	2013-06-28 14:52:14 +0000
@@ -14,25 +14,31 @@
 override_dh_auto_configure:
 	qmake
 
-override_dh_auto_install:
+override_dh_auto_build-indep:
+	dh_auto_build -Smakefile -- docs
+
+override_dh_auto_install-arch:
 	dh_auto_install
 
 	# Fix wrong path in pkgconfig files
-	find $(CURDIR)/debian/tmp/usr/lib/*/pkgconfig -type f -name '*.pc' \
+	find $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig -type f -name '*.pc' \
 	-exec sed -i -e 's/$(DEB_HOST_MULTIARCH)\/$(DEB_HOST_MULTIARCH)/$(DEB_HOST_MULTIARCH)/g' {} \;
 
+	# Remove libtool-like files
+	rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.la
+
 	# Fix wrong permissions in examples.
-	find $(CURDIR)/debian/tmp/usr/lib/*/qt5/examples/ -type f \( \
+	find $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/examples/ -type f \( \
 	-name '*.png' \
 	-o -name '*.php' \
 	-o -name '*.xsl' \
 	-o -name '*.xml' \
 	-o -name '*.js' \
 	-o -name '*.jpg' \
-	\) -print0 | xargs -0 chmod 644
+	\) -print0 | xargs -0 chmod a-x
 
-	# Remove libtool-like files
-	rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.la
+override_dh_auto_install-indep:
+	make INSTALL_ROOT=$(CURDIR)/debian/tmp install_docs
 
 override_dh_install:
 	dh_install --fail-missing