[SCM] qtchooser packaging branch, master, updated. debian/39-g4717841-3-6-g4d0f291

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 22ec44ebe3caa045757a550617c6dd31f2842662
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Tue Aug 26 11:02:11 2014 -0300

    Remove Add-qmlimportscanner-qtpaths.patch, applied upstream.
---
 debian/changelog                                  |  2 ++
 debian/patches/Add-qmlimportscanner-qtpaths.patch | 30 -----------------------
 debian/patches/series                             |  1 -
 3 files changed, 2 insertions(+), 31 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c52cca9..4f547a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 qtchooser (47-gd2b7997-1) UNRELEASED; urgency=medium
 
+  [ Lisandro Damián Nicanor Pérez Meyer ]
   * New upstream git snapshot.
+  * Remove Add-qmlimportscanner-qtpaths.patch, applied upstream.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 26 Aug 2014 10:57:17 -0300
 
diff --git a/debian/patches/Add-qmlimportscanner-qtpaths.patch b/debian/patches/Add-qmlimportscanner-qtpaths.patch
deleted file mode 100644
index c65ddbc..0000000
--- a/debian/patches/Add-qmlimportscanner-qtpaths.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-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(+)
-
---- a/Makefile
-+++ b/Makefile
-@@ -22,6 +22,7 @@ TOOLS = assistant \
- 	qml \
- 	qml1plugindump \
- 	qmlbundle \
-+	qmlimportscanner \
- 	qmlmin \
- 	qmlplugindump \
- 	qmlprofiler \
-@@ -29,6 +30,7 @@ TOOLS = assistant \
- 	qmltestrunner \
- 	qmlviewer \
- 	qtconfig \
-+	qtpaths \
- 	rcc \
- 	uic \
- 	uic3 \
diff --git a/debian/patches/series b/debian/patches/series
index 64b6dbb..e78b3cb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 enable-tests.patch
-Add-qmlimportscanner-qtpaths.patch

-- 
qtchooser packaging