[SCM] qtchooser packaging branch, master, updated. debian/26-2-6-g25aa911

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit 25aa91139c6642f04312aa9de4d1ecbb644a16af
Author: Pino Toscano <pino at debian.org>
Date:   Fri May 3 13:25:44 2013 +0200

    drop the own copy of qtchooser.1 and use the upstream version
---
 debian/changelog          |    1 +
 debian/qtchooser.1        |   78 ---------------------------------------------
 debian/qtchooser.manpages |    2 +-
 3 files changed, 2 insertions(+), 79 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 129f927..8c6050e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ qtchooser (26-3) UNRELEASED; urgency=low
     the latter.
   * Export the LDFLAGS as LFLAGS, as qtchooser's build system uses only the
     latter.
+  * Drop the own copy of qtchooser.1 and use the upstream version.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 28 Apr 2013 16:31:49 +0200
 
diff --git a/debian/qtchooser.1 b/debian/qtchooser.1
deleted file mode 100644
index c8e7078..0000000
--- a/debian/qtchooser.1
+++ /dev/null
@@ -1,78 +0,0 @@
-.TH QTCHOOSER 1 "JANUARY 2, 2013"
-.\" Please adjust this date whenever revising the manpage.
-.SH NAME
-qtchooser \- a wrapper used to select between Qt development binary versions
-.SH SYNOPSIS
-.B qtchooser
-B\-list\-versionsR
-.br
-.B qtchooser
-B\-print\-envR [B\-qt=IversionR]
-.br
-.B qtchooser
-B\-run\-tool=ItoolR [B\-qt=IversionR] [Iprogram_argumentsR]
-.br
-.B <executable_name>
-[B\-qt=IversionR] [Iprogram_argumentsR]
-.br
-.SH DESCRIPTION
-Qt is a cross-platform C++ application framework. Qt's primary feature
-is its rich set of widgets that provide standard GUI functionality.
-
-The Qt Chooser provides a wrapper to switch between versions of Qt
-development binaries when multiple versions like 4 and 5 are installed
-or local Qt builds are to be used.
-
-It is commonly used via a symlink from an Iexecutable_nameR like qmake.
-.SH OPTIONS
-The options which apply to the
-BqtchooserR
-command are:
-.PP
-B\-list\-versionsR
-.RS 4
-Lists available Qt versions from the configuration files
-.RE
-.PP
-B\-print\-envR
-.RS 4
-Prints environment information
-.RE
-.PP
-B\-qt=IversionR
-.RS 4
-Selects IversionR as the Qt version to be used
-.RE
-.PP
-B\-run\-tool=ItoolR
-.RS 4
-Runs the selected ItoolR.
-.RE
-.SH ENVIRONMENT
-.TP
-.B QT_SELECT
-Same as B\-qt=IversionR. If set, the selected configuration is used and binaries
-symlinked to qtchooser will be executed without additional paramenters.
-.RE
-.TP
-.B XDG_CONFIG_HOME
-.TP
-.B XDG_CONFIG_DIRS
-Used as specified in
-<Bhttp://standards.freedesktop.org/basedir-spec/basedir-spec-latest.htmlR>
-.SH FILES
-.TP
-.I /etc/xdg/qtchooser/*.conf
-System-wide configuration files. Each has two lines, the first is the path
-to the binaries and the second is the path to the Qt libraries. If a
-Idefault.confR is provided, the settings from it will be automatically
-used in case nothing else is selected.
-.TP
-.I B$HOMEP/.config/qtchooser/*.conf
-User configuration files.
-
-.SH AUTHOR
-qtchooser was written by Thiago Macieira from Intel.
-.PP
-This manual page was written by Timo Jyrinki <timo at debian.org>,
-for the Debian project (but may be used by others).
diff --git a/debian/qtchooser.manpages b/debian/qtchooser.manpages
index a5183c6..d8b45d2 100644
--- a/debian/qtchooser.manpages
+++ b/debian/qtchooser.manpages
@@ -1 +1 @@
-debian/qtchooser.1
+doc/qtchooser.1

-- 
qtchooser packaging