[SCM] qtchooser packaging branch, master, updated. 09b6ccd1646d0a63af78e4687bdc951dc966a3c9

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 09b6ccd1646d0a63af78e4687bdc951dc966a3c9
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Tue Mar 12 19:15:09 2013 -0300

    Remove patch already present in upstream release.
---
 debian/changelog                        |    2 --
 debian/patches/add_qdoc_and_qdoc3.patch |   30 ------------------------------
 2 files changed, 0 insertions(+), 32 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9ff49f6..af5251c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,5 @@ qtchooser (26-1) UNRELEASED; urgency=low
   * Initial release. (Closes: #696687)
   * Proposed upstream patch:
     - create-a-system-default-path.patch
-  * Merged upstream patch:
-    - add_qdoc_and_qdoc3.patch
 
  -- Timo Jyrinki <timo at debian.org>  Wed, 06 Feb 2013 12:48:19 +0000
diff --git a/debian/patches/add_qdoc_and_qdoc3.patch b/debian/patches/add_qdoc_and_qdoc3.patch
deleted file mode 100644
index 0cc1d20..0000000
--- a/debian/patches/add_qdoc_and_qdoc3.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From e7fb861749bfa8e6b26eb059c5eed157f2cdf2c0 Mon Sep 17 00:00:00 2001
-From: Timo Jyrinki <timo.jyrinki at canonical.com>
-Date: Mon, 4 Feb 2013 11:01:00 +0200
-Subject: [PATCH] Add qdoc and qdoc3
-
-Make qtchooser handle also qdoc and qdoc3, expected to be found
-similar to other tools by developers.
-
-Change-Id: Ie6bfb1d85fbdcb1919f107e97557ccc848f334cd
-Reviewed-by: Thiago Macieira <thiago.macieira at intel.com>
----
- Makefile |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 1b93597..6be98a6 100644
---- a/Makefile
-+++ b/Makefile
-@@ -13,6 +13,8 @@ TOOLS = assistant \
- 	qdbuscpp2xml \
- 	qdbusviewer \
- 	qdbusxml2cpp \
-+	qdoc \
-+	qdoc3 \
- 	qglinfo \
- 	qhelpconverter \
- 	qhelpgenerator \
--- 
-1.7.1
-

-- 
qtchooser packaging