[SCM] qtchooser packaging branch, master, updated. 574c36169af7870102aee3d8db260fbaf36a9dba

[Timo Jyrinki]

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

The following commit has been merged in the master branch:
commit 574c36169af7870102aee3d8db260fbaf36a9dba
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Wed Feb 6 13:18:06 2013 +0000

    Add qdoc patch, document the other patch, add qt4-qmlviewer conflict
---
 debian/changelog                        |    6 +++++-
 debian/control                          |    2 +-
 debian/patches/add_qdoc_and_qdoc3.patch |   30 ++++++++++++++++++++++++++++++
 debian/patches/series                   |    1 +
 debian/qtchooser.lintian-overrides      |    2 ++
 5 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4814c42..844f445 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 qtchooser (0.0.1~git20121229.g8f08405-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, 02 Jan 2013 09:13:28 +0000
+ -- Timo Jyrinki <timo at debian.org>  Wed, 06 Feb 2013 12:48:19 +0000
diff --git a/debian/control b/debian/control
index c5d8219..793a582 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Homepage: https://qt-project.org/
 Package: qtchooser
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Conflicts: libqt4-dev-bin (<= 4:4.8.4+dfsg-1~), qt4-designer (<= 4:4.8.4+dfsg-1~), qt4-dev-tools (<= 4:4.8.4+dfsg-1~), qt4-linguist-tools (<= 4:4.8.4+dfsg-1~), qt4-qmake (<= 4:4.8.4+dfsg-1~), qt4-qtconfig (<= 4:4.8.4+dfsg-1~), qdbus (<= 4:4.8.4+dfsg-1~)
+Conflicts: libqt4-dev-bin (<= 4:4.8.4+dfsg-1~), qt4-designer (<= 4:4.8.4+dfsg-1~), qt4-dev-tools (<= 4:4.8.4+dfsg-1~), qt4-linguist-tools (<= 4:4.8.4+dfsg-1~), qt4-qmake (<= 4:4.8.4+dfsg-1~), qt4-qtconfig (<= 4:4.8.4+dfsg-1~), qdbus (<= 4:4.8.4+dfsg-1~), qt4-qmlviewer (<= 4:4.8.4+dfsg-1~)
 Suggests: qt4-default, qt5-default
 Description: Wrapper to select between Qt development binary versions
  Qt is a cross-platform C++ application framework. Qt's primary feature
diff --git a/debian/patches/add_qdoc_and_qdoc3.patch b/debian/patches/add_qdoc_and_qdoc3.patch
new file mode 100644
index 0000000..0cc1d20
--- /dev/null
+++ b/debian/patches/add_qdoc_and_qdoc3.patch
@@ -0,0 +1,30 @@
+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
+
diff --git a/debian/patches/series b/debian/patches/series
index 3be69d4..45beb67 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 create-a-system-default-path.patch
+add_qdoc_and_qdoc3.patch
diff --git a/debian/qtchooser.lintian-overrides b/debian/qtchooser.lintian-overrides
index 03fc07e..989b396 100644
--- a/debian/qtchooser.lintian-overrides
+++ b/debian/qtchooser.lintian-overrides
@@ -29,3 +29,5 @@ qtchooser: binary-without-manpage usr/bin/uic
 qtchooser: binary-without-manpage usr/bin/uic3
 qtchooser: binary-without-manpage usr/bin/xmlpatterns
 qtchooser: binary-without-manpage usr/bin/xmlpatternsvalidator
+qtchooser: binary-without-manpage usr/bin/qdoc
+qtchooser: binary-without-manpage usr/bin/qdoc3

-- 
qtchooser packaging