[SCM] qtbase packaging branch, master, updated. debian/5.0.2+dfsg1-1-3-g8a09f58

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 8a09f58df5aa61fe4c039c148713b21e620c2060
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Sat Apr 20 21:26:45 2013 -0300

    Build examples without calling -developer-build.
---
 debian/changelog                    |    3 +++
 debian/patches/build_examples.patch |   23 +++++++++++++++++++++++
 debian/patches/series               |    3 +++
 3 files changed, 29 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 28f6e73..10067ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ qtbase-opensource-src (5.0.2+dfsg1-2) UNRELEASED; urgency=low
 
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * Remove the licenses of the removed fonts from debian/copyright.
+  * Patch out commit 2b397f985e4ef6ae5c0571a928bb1320fb048c61 to allow building
+    examples without calling -developer-build with build_examples.patch
+    (Closes: #705836).
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 20 Apr 2013 16:15:45 -0300
 
diff --git a/debian/patches/build_examples.patch b/debian/patches/build_examples.patch
new file mode 100644
index 0000000..00e0072
--- /dev/null
+++ b/debian/patches/build_examples.patch
@@ -0,0 +1,23 @@
+Description: re enable building the examples by default.
+ Commit 2b397f985e4ef6ae5c0571a928bb1320fb048c61 made the examples
+ not being made by default. The only way to get them is to
+ enable -developer-build, which we do not want. So we simply
+ patch out this commit.
+Author: Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
+Forwarded: https://bugreports.qt-project.org/browse/QTBUG-30788
+
+--- a/mkspecs/features/qt_example_installs.prf
++++ b/mkspecs/features/qt_example_installs.prf
+@@ -92,12 +92,4 @@ probase = $$relative_path($$_PRO_FILE_PW
+         allfiles -= doc
+         !isEmpty(allfiles): warning("remaining files in $$_PRO_FILE_PWD_: $$allfiles")
+     }
+-
+-    # Do not actually build the examples in production builds with -prefix
+-    !equals(TEMPLATE, subdirs):prefix_build:!contains(QT_CONFIG, private_tests) {
+-        TEMPLATE = aux
+-        CONFIG -= have_target qt staticlib dll
+-        SOURCES =
+-        INSTALLS -= target
+-    }
+ }
diff --git a/debian/patches/series b/debian/patches/series
index cbd57f0..b2035ba 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,4 @@
 undef_B0.diff
+
+# Debian specific.
+build_examples.patch

-- 
qtbase packaging