From d3b71c865f144373b75cbd0c3057558bbfc3a9ab Mon Sep 17 00:00:00 2001 From: Fathi Boudra Date: Fri, 19 Sep 2008 17:24:11 +0000 Subject: Split qmake in its own qt4-qmake package. (Closes: #437354) --- debian/changelog | 2 ++ debian/control | 15 +++++++++++++-- debian/libqt4-dev.install | 1 - debian/libqt4-dev.links | 1 - debian/libqt4-dev.manpages | 1 - debian/libqt4-dev.postinst | 5 ----- debian/libqt4-dev.prerm | 1 - debian/qt4-qmake.install | 1 + debian/qt4-qmake.links | 1 + debian/qt4-qmake.manpages | 1 + debian/qt4-qmake.postinst | 10 ++++++++++ debian/qt4-qmake.prerm | 12 ++++++++++++ 12 files changed, 40 insertions(+), 11 deletions(-) create mode 100644 debian/qt4-qmake.install create mode 100644 debian/qt4-qmake.links create mode 100644 debian/qt4-qmake.manpages create mode 100644 debian/qt4-qmake.postinst create mode 100644 debian/qt4-qmake.prerm (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 5d4cdda..0a29fbe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,6 +25,8 @@ qt4-x11 (4.4.2-1) UNRELEASED; urgency=low * Add missing QHelpGlobal include in libqt4-dev package. * Remove doxygen build dependency. It is useless to generate a tag file as Qt is shipped with qt.tags file. + * Split qmake in its own qt4-qmake package. (Closes: #437354) + TODO: review description. -- Debian Qt/KDE Maintainers Thu, 18 Sep 2008 18:22:04 +0200 diff --git a/debian/control b/debian/control index c2d1de2..66cb169 100644 --- a/debian/control +++ b/debian/control @@ -330,7 +330,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, libqtcore4 (= ${binary:Version}), libqt4-sql (= ${binary:Version}), libqt4-script (= ${binary:Version}), libqt4-xmlpatterns (= ${binary:Version}), libqt4-qt3support (= ${binary:Version}), libqt4-designer (= ${binary:Version}), libqt4-help (= ${binary:Version}), - libqt4-assistant (= ${binary:Version}), libqt4-test (= ${binary:Version}) + libqt4-assistant (= ${binary:Version}), libqt4-test (= ${binary:Version}), + qt4-qmake (= ${binary:Version}) Recommends: libqt4-opengl-dev (= ${binary:Version}) Conflicts: qt3-dev-tools (<= 3:3.3.4-7), libqtwebkit-dev Replaces: libqtwebkit-dev, libqt4-opengl-dev (<< 4.4.0-2) @@ -340,7 +341,7 @@ Description: Qt 4 development files is its rich set of widgets that provide standard GUI functionality. . This package contains the header development files and development programs - such as qmake (qmake-qt4) used for building Qt4 applications. + used for building Qt4 applications. Package: libqt4-opengl-dev Architecture: any @@ -420,6 +421,16 @@ Description: Qt 4 development tools This packages contains tools used to assist in Qt 4 development, including the Qt Assistant, Linguist, D-Bus Viewer and Pixel Tool applications. +Package: qt4-qmake +Architecture: any +Section: devel +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Qt 4 qmake + Qt is a cross-platform C++ application framework. Qt's primary feature + is its rich set of widgets that provide standard GUI functionality. + . + This package contains Qt 4 qmake. + Package: qt4-qtconfig Architecture: any Section: x11 diff --git a/debian/libqt4-dev.install b/debian/libqt4-dev.install index 7a51ab3..5ad546a 100644 --- a/debian/libqt4-dev.install +++ b/debian/libqt4-dev.install @@ -3,7 +3,6 @@ usr/bin/lupdate-qt4 usr/bin/moc-qt4 usr/bin/qdbuscpp2xml usr/bin/qdbusxml2cpp -usr/bin/qmake-qt4 usr/bin/qt3to4 usr/bin/rcc usr/bin/uic-qt4 diff --git a/debian/libqt4-dev.links b/debian/libqt4-dev.links index ba2fac3..78e4e72 100644 --- a/debian/libqt4-dev.links +++ b/debian/libqt4-dev.links @@ -2,7 +2,6 @@ usr/include/qt4 usr/share/qt4/include usr/bin/lrelease-qt4 usr/share/qt4/bin/lrelease usr/bin/lupdate-qt4 usr/share/qt4/bin/lupdate usr/bin/moc-qt4 usr/share/qt4/bin/moc -usr/bin/qmake-qt4 usr/share/qt4/bin/qmake usr/bin/uic-qt4 usr/share/qt4/bin/uic usr/bin/rcc usr/share/qt4/bin/rcc usr/lib/qt4/plugins usr/share/qt4/plugins diff --git a/debian/libqt4-dev.manpages b/debian/libqt4-dev.manpages index 4449450..5a86266 100644 --- a/debian/libqt4-dev.manpages +++ b/debian/libqt4-dev.manpages @@ -1,5 +1,4 @@ debian/manpages/lrelease-qt4.1 debian/manpages/lupdate-qt4.1 debian/manpages/moc-qt4.1 -debian/manpages/qmake-qt4.1 debian/manpages/uic-qt4.1 diff --git a/debian/libqt4-dev.postinst b/debian/libqt4-dev.postinst index 2836703..e730b69 100644 --- a/debian/libqt4-dev.postinst +++ b/debian/libqt4-dev.postinst @@ -12,11 +12,6 @@ update-alternatives --install \ --slave /usr/share/man/man1/uic.1.gz uic.1.gz \ "/usr/share/man/man1/uic-qt4.1.gz" -update-alternatives --install \ - /usr/bin/qmake qmake "/usr/bin/qmake-qt4" "40" \ - --slave /usr/share/man/man1/qmake.1.gz qmake.1.gz \ - "/usr/share/man/man1/qmake-qt4.1.gz" - update-alternatives --install \ /usr/bin/lupdate lupdate "/usr/bin/lupdate-qt4" "40" \ --slave /usr/share/man/man1/lupdate.1.gz lupdate.1.gz \ diff --git a/debian/libqt4-dev.prerm b/debian/libqt4-dev.prerm index 1c51e7c..2c5ba05 100644 --- a/debian/libqt4-dev.prerm +++ b/debian/libqt4-dev.prerm @@ -7,7 +7,6 @@ case "$1" in remove|failed-upgrade|deconfigure) update-alternatives --remove moc "/usr/bin/moc-qt4" update-alternatives --remove uic "/usr/bin/uic-qt4" - update-alternatives --remove qmake "/usr/bin/qmake-qt4" update-alternatives --remove lupdate "/usr/bin/lupdate-qt4" update-alternatives --remove lrelease "/usr/bin/lrelease-qt4" ;; diff --git a/debian/qt4-qmake.install b/debian/qt4-qmake.install new file mode 100644 index 0000000..d0b106e --- /dev/null +++ b/debian/qt4-qmake.install @@ -0,0 +1 @@ +usr/bin/qmake-qt4 diff --git a/debian/qt4-qmake.links b/debian/qt4-qmake.links new file mode 100644 index 0000000..8a70be9 --- /dev/null +++ b/debian/qt4-qmake.links @@ -0,0 +1 @@ +usr/bin/qmake-qt4 usr/share/qt4/bin/qmake diff --git a/debian/qt4-qmake.manpages b/debian/qt4-qmake.manpages new file mode 100644 index 0000000..7931d2b --- /dev/null +++ b/debian/qt4-qmake.manpages @@ -0,0 +1 @@ +debian/manpages/qmake-qt4.1 diff --git a/debian/qt4-qmake.postinst b/debian/qt4-qmake.postinst new file mode 100644 index 0000000..43edfef --- /dev/null +++ b/debian/qt4-qmake.postinst @@ -0,0 +1,10 @@ +#!/bin/sh + +set -e + +update-alternatives --install \ + /usr/bin/qmake qmake "/usr/bin/qmake-qt4" "40" \ + --slave /usr/share/man/man1/qmake.1.gz qmake.1.gz \ + "/usr/share/man/man1/qmake-qt4.1.gz" + +#DEBHELPER# diff --git a/debian/qt4-qmake.prerm b/debian/qt4-qmake.prerm new file mode 100644 index 0000000..49cbd3d --- /dev/null +++ b/debian/qt4-qmake.prerm @@ -0,0 +1,12 @@ +#!/bin/sh + +set -e + +case "$1" in + upgrade) ;; + remove|failed-upgrade|deconfigure) + update-alternatives --remove qmake "/usr/bin/qmake-qt4" + ;; +esac + +#DEBHELPER# -- cgit v1.2.3