[pkg-kde-commits] rev 2805 - trunk/packages/qt4-x11/debian

[Brian Nelson]

Author: pyro
Date: 2006-01-09 22:51:21 +0000 (Mon, 09 Jan 2006)
New Revision: 2805

Added:
   trunk/packages/qt4-x11/debian/libqt4-debug-dev.install
Modified:
   trunk/packages/qt4-x11/debian/changelog
   trunk/packages/qt4-x11/debian/control
   trunk/packages/qt4-x11/debian/libqt4-dev.install
Log:
  * debian/control: added explicit dependencies for libqt4-dev on the
    Source-Version packages libqt4-core, libqt4-gui, libqt4-sql, and
    libqt4-qt3support.  These dependencies were accidentally dropped in
    the last version.
  * Split the *_debug.so symlinks out of libqt4-dev and into a separate
    libqt4-debug-dev package.  Made the libqt4-debug-dev package depend on
    the Source-Version of libqt4-debug.  This way, the symlinks won't be
    dangling if libqt4-debug isn't installed and prevents failed linking
    due to version mismatches.  (Closes: #346603, #346605)

Modified: trunk/packages/qt4-x11/debian/changelog
===================================================================
--- trunk/packages/qt4-x11/debian/changelog	2006-01-09 22:04:40 UTC (rev 2804)
+++ trunk/packages/qt4-x11/debian/changelog	2006-01-09 22:51:21 UTC (rev 2805)
@@ -11,8 +11,19 @@
   * debian/control: build against libmysqlclient15, and updated all
     dependencies to libmysqlclient15-dev (Closes: #346586)
 
- -- Brian Nelson <pyro at debian.org>  Mon,  9 Jan 2006 14:03:57 -0800
+  * debian/control: added explicit dependencies for libqt4-dev on the
+    Source-Version packages libqt4-core, libqt4-gui, libqt4-sql, and
+    libqt4-qt3support.  These dependencies were accidentally dropped in
+    the last version.
 
+  * Split the *_debug.so symlinks out of libqt4-dev and into a separate
+    libqt4-debug-dev package.  Made the libqt4-debug-dev package depend on
+    the Source-Version of libqt4-debug.  This way, the symlinks won't be
+    dangling if libqt4-debug isn't installed and prevents failed linking
+    due to version mismatches.  (Closes: #346603, #346605)
+
+ -- Brian Nelson <pyro at debian.org>  Mon,  9 Jan 2006 14:43:51 -0800
+
 qt4-x11 (4.1.0-1) unstable; urgency=low
 
   * New upstream release

Modified: trunk/packages/qt4-x11/debian/control
===================================================================
--- trunk/packages/qt4-x11/debian/control	2006-01-09 22:04:40 UTC (rev 2804)
+++ trunk/packages/qt4-x11/debian/control	2006-01-09 22:51:21 UTC (rev 2805)
@@ -9,10 +9,10 @@
 Package: libqt4-dev
 Architecture: any
 Section: libdevel
-Depends: ${shlibs:Depends}, ${misc:Depends}, libxext-dev (>= 4.3.0.dfsg.1-4), libxrandr-dev (>= 4.3.0.dfsg.1-4), x-dev (>= 4.3.0.dfsg.1-4), libsm-dev (>= 4.3.0.dfsg.1-4), libxmu-dev (>= 4.3.0.dfsg.1-4), libice-dev (>= 4.3.0.dfsg.1-4), libx11-dev (>= 4.3.0.dfsg.1-4), libxt-dev (>= 4.3.0.dfsg.1-4), libxrender-dev, libxcursor-dev, libxinerama-dev, libxi-dev, libmng-dev (>= 1.0.3), libpng12-0-dev, libjpeg62-dev, zlib1g-dev, libfreetype6-dev, xlibmesa-gl-dev | libgl-dev, libglu1-xorg-dev | libglu1-mesa-dev | libglu-dev, libxft-dev, libaudio-dev, xlibs-static-pic, libpq-dev, libmysqlclient15-dev
+Depends: ${shlibs:Depends}, ${misc:Depends}, libqt4-core (= ${Source-Version}), libqt4-gui (= ${Source-Version}), libqt4-sql (= ${Source-Version}), libqt4-qt3support (= ${Source-Version}), libxext-dev (>= 4.3.0.dfsg.1-4), libxrandr-dev (>= 4.3.0.dfsg.1-4), x-dev (>= 4.3.0.dfsg.1-4), libsm-dev (>= 4.3.0.dfsg.1-4), libxmu-dev (>= 4.3.0.dfsg.1-4), libice-dev (>= 4.3.0.dfsg.1-4), libx11-dev (>= 4.3.0.dfsg.1-4), libxt-dev (>= 4.3.0.dfsg.1-4), libxrender-dev, libxcursor-dev, libxinerama-dev, libxi-dev, libmng-dev (>= 1.0.3), libpng12-0-dev, libjpeg62-dev, zlib1g-dev, libfreetype6-dev, xlibmesa-gl-dev | libgl-dev, libglu1-xorg-dev | libglu1-mesa-dev | libglu-dev, libxft-dev, libaudio-dev, xlibs-static-pic, libpq-dev, libmysqlclient15-dev
 Conflicts: qt3-dev-tools (<= 3:3.3.4-7)
 Recommends: qt4-dev-tools
-Suggests: qt4-doc, libqt4-debug
+Suggests: qt4-doc, libqt4-debug-dev
 Description: Qt 4 development files
  Qt is a cross-platform C++ application framework.  Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -22,6 +22,19 @@
  .
   Homepage: http://www.trolltech.com
 
+Package: libqt4-debug-dev
+Architecture: any
+Section: libdevel
+Depends: ${shlibs:Depends}, ${misc:Depends}, libqt4-dev (= ${Source-Version}), libqt4-debug (= ${Source-Version})
+Description: Qt 4 debugging development files
+ 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 header files and programs used for building
+ debugging versions of Qt applications.
+ .
+  Homepage: http://www.trolltech.com
+
 Package: libqt4-core
 Architecture: any
 Section: libs

Added: trunk/packages/qt4-x11/debian/libqt4-debug-dev.install
===================================================================
--- trunk/packages/qt4-x11/debian/libqt4-debug-dev.install	2006-01-09 22:04:40 UTC (rev 2804)
+++ trunk/packages/qt4-x11/debian/libqt4-debug-dev.install	2006-01-09 22:51:21 UTC (rev 2805)
@@ -0,0 +1 @@
+usr/lib/*_debug.so

Modified: trunk/packages/qt4-x11/debian/libqt4-dev.install
===================================================================
--- trunk/packages/qt4-x11/debian/libqt4-dev.install	2006-01-09 22:04:40 UTC (rev 2804)
+++ trunk/packages/qt4-x11/debian/libqt4-dev.install	2006-01-09 22:51:21 UTC (rev 2805)
@@ -1,7 +1,17 @@
 usr/include/qt4/*
 usr/lib/*.la
 usr/lib/*.prl
-usr/lib/*.so
+usr/lib/libQt3Support.so
+usr/lib/libQtCore.so
+usr/lib/libQtDesigner.so
+usr/lib/libQtDesignerComponents.so
+usr/lib/libQtGui.so
+usr/lib/libQtNetwork.so
+usr/lib/libQtOpenGL.so
+usr/lib/libQtSql.so
+usr/lib/libQtSvg.so
+usr/lib/libQtTest.so
+usr/lib/libQtXml.so
 usr/lib/*.pc usr/lib/pkgconfig/
 usr/share/qt4/q3porting.xml
 usr/share/qt4/mkspecs/*