[Pkg-kde-commits] rev 2087 - trunk/packages/qt4-x11/debian
Brian Nelson
pyro at costa.debian.org
Fri Oct 21 03:17:01 UTC 2005
Author: pyro
Date: 2005-10-21 03:17:00 +0000 (Fri, 21 Oct 2005)
New Revision: 2087
Added:
trunk/packages/qt4-x11/debian/qt4-designer.install
trunk/packages/qt4-x11/debian/qt4-designer.manpages
trunk/packages/qt4-x11/debian/qt4-designer.postinst
trunk/packages/qt4-x11/debian/qt4-designer.prerm
Removed:
trunk/packages/qt4-x11/debian/libqt4-designer.install
Modified:
trunk/packages/qt4-x11/debian/changelog
trunk/packages/qt4-x11/debian/control
trunk/packages/qt4-x11/debian/qt4-dev-tools.install
trunk/packages/qt4-x11/debian/qt4-dev-tools.manpages
trunk/packages/qt4-x11/debian/qt4-dev-tools.postinst
trunk/packages/qt4-x11/debian/qt4-dev-tools.prerm
Log:
* Renamed libqt4-designer to qt4-designer, merged in the designer binary
from qt4-dev-tools, and added a dependency on libqt4-dev (Closes:
#330094)
Modified: trunk/packages/qt4-x11/debian/changelog
===================================================================
--- trunk/packages/qt4-x11/debian/changelog 2005-10-21 03:05:27 UTC (rev 2086)
+++ trunk/packages/qt4-x11/debian/changelog 2005-10-21 03:17:00 UTC (rev 2087)
@@ -15,8 +15,12 @@
* debian/control: added dependencies on libsqlite3-dev in appropriate
packages
- -- Brian Nelson <pyro at debian.org> Thu, 20 Oct 2005 20:04:17 -0700
+ * Renamed libqt4-designer to qt4-designer, merged in the designer binary
+ from qt4-dev-tools, and added a dependency on libqt4-dev (Closes:
+ #330094)
+ -- Brian Nelson <pyro at debian.org> Thu, 20 Oct 2005 20:16:00 -0700
+
qt4-x11 (4.0.1-2) unstable; urgency=low
* debian/patches/10_qmake_use_qt4_tools.dpatch: new patch that modifies
Modified: trunk/packages/qt4-x11/debian/control
===================================================================
--- trunk/packages/qt4-x11/debian/control 2005-10-21 03:05:27 UTC (rev 2086)
+++ trunk/packages/qt4-x11/debian/control 2005-10-21 03:17:00 UTC (rev 2087)
@@ -80,15 +80,18 @@
.
Homepage: http://www.trolltech.com
-Package: libqt4-designer
+Package: qt4-designer
Architecture: any
Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Qt 4 Designer libraries
+Depends: ${shlibs:Depends}, ${misc:Depends}, libqt4-dev
+Conflicts: libqt4-designer
+Replaces: libqt4-designer, qt4-dev-tools (<= 4.0.1-2)
+Description: Qt 4 Designer
Qt is a cross-platform C++ application framework. Qt's primary feature
is its rich set of widgets that provide standard GUI functionality.
.
- This packages contains the Qt Designer runtime libraries and plugins.
+ Qt Designer is a tool for designing and building graphical user
+ interfaces (GUIs) from Qt components.
.
Homepage: http://www.trolltech.com
@@ -108,13 +111,13 @@
Section: devel
Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: qt3-assistant (<= 3:3.3.4-7), qt3-designer (<= 3:3.3.4-7), qt3-linguist (<= 3:3.3.4-7)
-Recommends: libqt4-dev, qt4-doc
+Recommends: libqt4-dev, qt4-doc, qt4-designer
Description: Qt 4 development tools
Qt is a cross-platform C++ application framework. Qt's primary feature
is its rich set of widgets that provide standard GUI functionality.
.
This packages contains tools used to assist in Qt 4 development,
- including the Qt Designer, Assistant, and Linguist applications.
+ including the Qt Assistant and Linguist applications.
.
Homepage: http://www.trolltech.com
Deleted: trunk/packages/qt4-x11/debian/libqt4-designer.install
Copied: trunk/packages/qt4-x11/debian/qt4-designer.install (from rev 1795, trunk/packages/qt4-x11/debian/libqt4-designer.install)
===================================================================
--- trunk/packages/qt4-x11/debian/libqt4-designer.install 2005-09-14 10:50:54 UTC (rev 1795)
+++ trunk/packages/qt4-x11/debian/qt4-designer.install 2005-10-21 03:17:00 UTC (rev 2087)
@@ -0,0 +1,5 @@
+usr/bin/designer-qt4
+usr/lib/libQtDesigner.so.*
+usr/lib/libQtDesignerComponents.so.*
+usr/lib/qt4/plugins/designer/*plugin.so
+usr/lib/qt4/plugins/designer/libqt3supportwidgets.so
Copied: trunk/packages/qt4-x11/debian/qt4-designer.manpages (from rev 1795, trunk/packages/qt4-x11/debian/qt4-dev-tools.manpages)
===================================================================
--- trunk/packages/qt4-x11/debian/qt4-dev-tools.manpages 2005-09-14 10:50:54 UTC (rev 1795)
+++ trunk/packages/qt4-x11/debian/qt4-designer.manpages 2005-10-21 03:17:00 UTC (rev 2087)
@@ -0,0 +1 @@
+debian/manpages/designer-qt4.1
Copied: trunk/packages/qt4-x11/debian/qt4-designer.postinst (from rev 1795, trunk/packages/qt4-x11/debian/qt4-dev-tools.postinst)
===================================================================
--- trunk/packages/qt4-x11/debian/qt4-dev-tools.postinst 2005-09-14 10:50:54 UTC (rev 1795)
+++ trunk/packages/qt4-x11/debian/qt4-designer.postinst 2005-10-21 03:17:00 UTC (rev 2087)
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+set -e
+
+update-alternatives --install \
+ /usr/bin/designer designer "/usr/bin/designer-qt4" "40" \
+ --slave /usr/share/man/man1/designer.1.gz designer.1.gz \
+ "/usr/share/man/man1/designer-qt4.1.gz"
+
+#DEBHELPER#
Copied: trunk/packages/qt4-x11/debian/qt4-designer.prerm (from rev 1795, trunk/packages/qt4-x11/debian/qt4-dev-tools.prerm)
===================================================================
--- trunk/packages/qt4-x11/debian/qt4-dev-tools.prerm 2005-09-14 10:50:54 UTC (rev 1795)
+++ trunk/packages/qt4-x11/debian/qt4-designer.prerm 2005-10-21 03:17:00 UTC (rev 2087)
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+ upgrade) ;;
+ remove|failed-upgrade|deconfigure)
+ update-alternatives --remove designer "/usr/bin/designer-qt4"
+ ;;
+esac
+
+#DEBHELPER#
Modified: trunk/packages/qt4-x11/debian/qt4-dev-tools.install
===================================================================
--- trunk/packages/qt4-x11/debian/qt4-dev-tools.install 2005-10-21 03:05:27 UTC (rev 2086)
+++ trunk/packages/qt4-x11/debian/qt4-dev-tools.install 2005-10-21 03:17:00 UTC (rev 2087)
@@ -1,5 +1,4 @@
usr/bin/assistant-qt4
-usr/bin/designer-qt4
usr/bin/linguist-qt4
usr/share/qt4/templates/*
usr/share/qt4/phrasebooks/*
Modified: trunk/packages/qt4-x11/debian/qt4-dev-tools.manpages
===================================================================
--- trunk/packages/qt4-x11/debian/qt4-dev-tools.manpages 2005-10-21 03:05:27 UTC (rev 2086)
+++ trunk/packages/qt4-x11/debian/qt4-dev-tools.manpages 2005-10-21 03:17:00 UTC (rev 2087)
@@ -1,3 +1,2 @@
debian/manpages/assistant-qt4.1
-debian/manpages/designer-qt4.1
debian/manpages/linguist-qt4.1
Modified: trunk/packages/qt4-x11/debian/qt4-dev-tools.postinst
===================================================================
--- trunk/packages/qt4-x11/debian/qt4-dev-tools.postinst 2005-10-21 03:05:27 UTC (rev 2086)
+++ trunk/packages/qt4-x11/debian/qt4-dev-tools.postinst 2005-10-21 03:17:00 UTC (rev 2087)
@@ -8,11 +8,6 @@
"/usr/share/man/man1/assistant-qt4.1.gz"
update-alternatives --install \
- /usr/bin/designer designer "/usr/bin/designer-qt4" "40" \
- --slave /usr/share/man/man1/designer.1.gz designer.1.gz \
- "/usr/share/man/man1/designer-qt4.1.gz"
-
-update-alternatives --install \
/usr/bin/linguist linguist "/usr/bin/linguist-qt4" "40" \
--slave /usr/share/man/man1/linguist.1.gz linguist.1.gz \
"/usr/share/man/man1/linguist-qt4.1.gz"
Modified: trunk/packages/qt4-x11/debian/qt4-dev-tools.prerm
===================================================================
--- trunk/packages/qt4-x11/debian/qt4-dev-tools.prerm 2005-10-21 03:05:27 UTC (rev 2086)
+++ trunk/packages/qt4-x11/debian/qt4-dev-tools.prerm 2005-10-21 03:17:00 UTC (rev 2087)
@@ -6,7 +6,6 @@
upgrade) ;;
remove|failed-upgrade|deconfigure)
update-alternatives --remove assistant "/usr/bin/assistant-qt4"
- update-alternatives --remove designer "/usr/bin/designer-qt4"
update-alternatives --remove linguist "/usr/bin/linguist-qt4"
;;
esac
More information about the pkg-kde-commits
mailing list