[SCM] qtbase packaging branch, experimental, updated. debian/5.9.0-beta+dfsg-1-2-g493b759

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit 493b759cae7838dd3426702994d77678514362b5
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sun Apr 9 22:02:07 2017 +0300

    Update qmake-qt5 manpage.
    
    Closes: #859968.
---
 debian/changelog            |  2 ++
 debian/manpages/qmake-qt5.1 | 38 +++++++++++++++++++-------------------
 2 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1b12cde..2ab555f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 qtbase-opensource-src (5.9.0~beta+dfsg-2) UNRELEASED; urgency=medium
 
+  [ Dmitry Shachnev ]
+  * Update qmake-qt5 manpage (closes: #859968).
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 09 Apr 2017 21:50:40 +0300
 
diff --git a/debian/manpages/qmake-qt5.1 b/debian/manpages/qmake-qt5.1
index f13a2a4..6fe7099 100644
--- a/debian/manpages/qmake-qt5.1
+++ b/debian/manpages/qmake-qt5.1
@@ -1,4 +1,4 @@
-.TH QMAKE 1 "2005-07-23" "Nokia Corporation and/or its subsidiary(-ies)" ""
+.TH QMAKE 1 "2017-04-09" "The Qt Company Ltd."
 .SH NAME
 qmake \- cross-platform makefile generator for Qt
 
@@ -29,7 +29,7 @@ try to find a project file in your current working directory.
 .SH WARNINGS OPTIONS
 .TP
 .BI "\-Wnone"
-Turn off all warnings
+Turn off all warnings; specific ones may be re-enabled by later \-W options
 .TP
 .BI "\-Wall"
 Turn on all warnings
@@ -38,29 +38,23 @@ Turn on all warnings
 Turn on parser warnings
 .TP
 .BI "\-Wlogic"
-Turn on logic warnings
+Turn on logic warnings (on by default)
+.TP
+.BI "\-Wdeprecated"
+Turn on deprecation warnings (on by default)
 
 .SH OPTIONS
 .TP
-.BI "\-o" file
+.BI "\-o file"
 Write output to file
 .TP
-.BI "\-unix"
-Run in unix mode
-.TP
-.BI "\-win32"
-Run in win32 mode
-.TP
-.BI "\-macx"
-Run in Mac OS X mode
-.TP
 .BI "\-d"
 Increase debug level
 .TP
-.BI "\-t" templ
-Overrides TEMPLATE as templ
+.BI "\-t templ"
+Overrides TEMPLATE as 
Btempl
R
 .TP
-.BI "\-tp" prefix
+.BI "\-tp prefix"
 Overrides TEMPLATE so that prefix is prefixed into the value
 .TP
 .BI "\-help"
@@ -81,14 +75,20 @@ Do a recursive search
 .BI "\-set <prop> <value>"
 Set persistent property
 .TP
+.BI "\-unset <prop>"
+Unset persistent property
+.TP
 .BI "\-query <prop>"
 Query persistent property. Show all if <prop> is empty.
 .TP
+.BI "\-qtconf file"
+Use 
Bfile
R instead of looking for qt.conf
+.TP
 .BI "\-cache file"
-Use file as cache [makefile mode only]
+Use 
Bfile
R as cache [makefile mode only]
 .TP
 .BI "\-spec spec"
-Use spec as QMAKESPEC [makefile mode only]
+Use 
Bspec
R as QMAKESPEC [makefile mode only]
 .TP
 .BI "\-nocache"
 Do not use a cache file [makefile mode only]
@@ -104,7 +104,7 @@ Do not look for files in pwd [project mode only]
 
 .SH SEE ALSO
 .PP
-.BR /usr/share/qt5/doc/html/qmake-manual.html,
+.BR /usr/share/qt5/doc/qmake/qmake-manual.html,
 .BR assistant (1)
 .SH AUTHOR
 This manual page was written by Brian Nelson <pyro at debian.org> based on

-- 
qtbase packaging