[SCM] qtchooser packaging branch, master, updated. debian/39-g4717841-1-5-g80b4f3c

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 98dd1bc57c9904057657ccf4b63b25cdf20c9d8d
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Sat Jan 18 22:58:56 2014 -0300

    Backport Add-qmlimportscanner-qtpaths.patch to support qmlimportscanner and qtpaths.
---
 debian/changelog                                  |  4 +++
 debian/patches/Add-qmlimportscanner-qtpaths.patch | 35 +++++++++++++++++++++++
 debian/patches/series                             |  1 +
 3 files changed, 40 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 6f944ea..9d907a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,10 @@ qtchooser (39-g4717841-2) UNRELEASED; urgency=low
   [ Dmitry Shachnev ]
   * Make qtchooser Multi-Arch: foreign.
 
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Backport Add-qmlimportscanner-qtpaths.patch to support qmlimportscanner
+    and qtpaths (Closes: #735599).
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 02 Jan 2014 19:59:45 +0400
 
 qtchooser (39-g4717841-1) unstable; urgency=low
diff --git a/debian/patches/Add-qmlimportscanner-qtpaths.patch b/debian/patches/Add-qmlimportscanner-qtpaths.patch
new file mode 100644
index 0000000..75954f8
--- /dev/null
+++ b/debian/patches/Add-qmlimportscanner-qtpaths.patch
@@ -0,0 +1,35 @@
+From 8a3bf5a1cafe65fea0b7ca3e00bee27b2dbad2c4 Mon Sep 17 00:00:00 2001
+From: Andrea Scarpino <scarpino at kde.org>
+Date: Thu, 16 Jan 2014 09:33:43 +0100
+Subject: [PATCH] Add qmlimportscanner, qtpaths
+
+Change-Id: Ibd0829127a246f4a97e46cbaa6d99117f826fc86
+Change-Id: I870bdd0b46c97721356c8cd3fbb8778ff081ff4c
+Reviewed-by: Thiago Macieira <thiago.macieira at intel.com>
+---
+ Makefile | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/Makefile b/Makefile
+index bb5b5d1..2b44323 100644
+--- a/Makefile
++++ b/Makefile
+@@ -23,6 +23,7 @@ TOOLS = assistant \
+ 	qml \
+ 	qml1plugindump \
+ 	qmlbundle \
++	qmlimportscanner \
+ 	qmlmin \
+ 	qmlplugindump \
+ 	qmlprofiler \
+@@ -30,6 +31,7 @@ TOOLS = assistant \
+ 	qmltestrunner \
+ 	qmlviewer \
+ 	qtconfig \
++	qtpaths \
+ 	rcc \
+ 	uic \
+ 	uic3 \
+-- 
+1.8.5.3
+
diff --git a/debian/patches/series b/debian/patches/series
index e78b3cb..64b6dbb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 enable-tests.patch
+Add-qmlimportscanner-qtpaths.patch

-- 
qtchooser packaging