[SCM] qtquickcontrols packaging branch, experimental, updated. debian/5.6.1-2-12-g5bdcb67

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit 6d34720c9c952471f1f19e3adee27f3613f82319
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Mon Jul 11 23:36:03 2016 +0300

    Add a patch to make the Dashboard example use packaged DejaVu Sans font.
---
 debian/changelog                         |  2 ++
 debian/control                           |  3 ++-
 debian/patches/packaged_dejavu_sans.diff | 25 +++++++++++++++++++++++++
 debian/patches/series                    |  1 +
 debian/rules                             |  7 +++++++
 5 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 1f476e1..8c26667 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ qtquickcontrols-opensource-src (5.7.0-1) UNRELEASED; urgency=medium
   * Drop obsolete Breaks/Replaces.
   * Make the examples package depend on qml-module-qtquick-extras.
   * Make qml-module-qtquick-controls depend on qml-module-qtgraphicaleffects.
+  * Add a patch to make the Dashboard example use packaged DejaVu Sans font
+    (packaged_dejavu_sans.diff).
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 28 Jun 2016 14:43:47 +0200
 
diff --git a/debian/control b/debian/control
index f4a67c0..c16e8ef 100644
--- a/debian/control
+++ b/debian/control
@@ -80,7 +80,8 @@ Architecture: any
 Multi-Arch: same
 Section: x11
 Pre-Depends: ${misc:Pre-Depends}
-Depends: qml-module-qtquick-controls,
+Depends: fonts-dejavu-core,
+         qml-module-qtquick-controls,
          qml-module-qtquick-dialogs,
          qml-module-qtquick-privatewidgets,
          qml-module-qtquick-extras,
diff --git a/debian/patches/packaged_dejavu_sans.diff b/debian/patches/packaged_dejavu_sans.diff
new file mode 100644
index 0000000..336f3f5
--- /dev/null
+++ b/debian/patches/packaged_dejavu_sans.diff
@@ -0,0 +1,25 @@
+Description: use packaged DejaVu Sans font
+Author: Dmitry Shachnev <mitya57 at debian.org>
+Forwarded: not-needed
+Last-Update: 2016-07-11
+
+--- a/examples/quickcontrols/extras/dashboard/dashboard.qrc
++++ b/examples/quickcontrols/extras/dashboard/dashboard.qrc
+@@ -1,6 +1,5 @@
+ <RCC>
+     <qresource prefix="/">
+-        <file>fonts/DejaVuSans.ttf</file>
+         <file>images/fuel-icon.png</file>
+         <file>images/temperature-icon.png</file>
+         <file>qml/dashboard.qml</file>
+--- a/examples/quickcontrols/extras/dashboard/main.cpp
++++ b/examples/quickcontrols/extras/dashboard/main.cpp
+@@ -57,7 +57,7 @@
+ {
+     QGuiApplication app(argc, argv);
+ 
+-    QFontDatabase::addApplicationFont(":/fonts/DejaVuSans.ttf");
++    QFontDatabase::addApplicationFont("/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf");
+     app.setFont(QFont("DejaVu Sans"));
+ 
+     QQmlApplicationEngine engine(QUrl("qrc:/qml/dashboard.qml"));
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..315877e
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+packaged_dejavu_sans.diff
diff --git a/debian/rules b/debian/rules
index eaaf239..eb236a7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
 export CFLAGS := $(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
 export CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
 export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
@@ -24,6 +26,11 @@ override_dh_auto_build-indep:
 override_dh_auto_install-indep:
 	make INSTALL_ROOT=$(CURDIR)/debian/tmp install_docs
 
+override_dh_auto_install-arch:
+	dh_auto_install
+	# Dashboard example is patched to use packaged DejaVu Sans font
+	rm -rfv debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/examples/quickcontrols/extras/dashboard/fonts/
+
 override_dh_auto_test-indep:
 
 override_dh_install:

-- 
qtquickcontrols packaging