[Pkg-kde-commits] rev 1765 - in trunk/packages/qt4-x11/debian: . patches

[Brian Nelson]

Author: pyro
Date: 2005-09-11 16:06:38 +0000 (Sun, 11 Sep 2005)
New Revision: 1765

Added:
   trunk/packages/qt4-x11/debian/patches/11_launch_assistant-qt4.dpatch
Modified:
   trunk/packages/qt4-x11/debian/changelog
   trunk/packages/qt4-x11/debian/control
   trunk/packages/qt4-x11/debian/patches/00list
Log:
  * debian/patches/11_launch_assistant-qt4: new patch that modifies the
    QAssistantClient class to launch Qt Assistant as "assistant-qt4" to
    cope with the alternatives system (Closes: #327294)

Modified: trunk/packages/qt4-x11/debian/changelog
===================================================================
--- trunk/packages/qt4-x11/debian/changelog	2005-09-11 01:06:37 UTC (rev 1764)
+++ trunk/packages/qt4-x11/debian/changelog	2005-09-11 16:06:38 UTC (rev 1765)
@@ -11,8 +11,12 @@
   
   * debian/libqt4-core.install: added /usr/lib/qt4/plugins/codecs
 
- -- Brian Nelson <pyro at debian.org>  Tue, 30 Aug 2005 21:27:38 -0700
+  * debian/patches/11_launch_assistant-qt4: new patch that modifies the
+    QAssistantClient class to launch Qt Assistant as "assistant-qt4" to
+    cope with the alternatives system (Closes: #327294)
 
+ -- Brian Nelson <pyro at debian.org>  Sun, 11 Sep 2005 09:04:24 -0700
+
 qt4-x11 (4.0.1-1) unstable; urgency=low
 
   * New upstream release

Modified: trunk/packages/qt4-x11/debian/control
===================================================================
--- trunk/packages/qt4-x11/debian/control	2005-09-11 01:06:37 UTC (rev 1764)
+++ trunk/packages/qt4-x11/debian/control	2005-09-11 16:06:38 UTC (rev 1765)
@@ -53,7 +53,7 @@
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: libpq-dev, libmysqlclient12-dev | libmysqlclient-dev
+Suggests: libpq-dev, libmysqlclient14-dev | libmysqlclient-dev
 Description: Qt 4 SQL database module
  Qt is a cross-platform C++ application framework.  Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.

Modified: trunk/packages/qt4-x11/debian/patches/00list
===================================================================
--- trunk/packages/qt4-x11/debian/patches/00list	2005-09-11 01:06:37 UTC (rev 1764)
+++ trunk/packages/qt4-x11/debian/patches/00list	2005-09-11 16:06:38 UTC (rev 1765)
@@ -1 +1,2 @@
 10_qmake_use_qt4_tools
+11_launch_assistant-qt4

Added: trunk/packages/qt4-x11/debian/patches/11_launch_assistant-qt4.dpatch
===================================================================
--- trunk/packages/qt4-x11/debian/patches/11_launch_assistant-qt4.dpatch	2005-09-11 01:06:37 UTC (rev 1764)
+++ trunk/packages/qt4-x11/debian/patches/11_launch_assistant-qt4.dpatch	2005-09-11 16:06:38 UTC (rev 1765)
@@ -0,0 +1,24 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 11_launch_assistant-qt4.dpatch by Brian Nelson <pyro at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad --exclude=CVS --exclude=.svn ./tools/assistant/lib/qassistantclient.cpp /home/nelson/tmp/dpep-work.Zny9K3/qt4-x11-4.0.1/tools/assistant/lib/qassistantclient.cpp
+--- ./tools/assistant/lib/qassistantclient.cpp	2005-08-16 01:41:14.000000000 -0700
++++ /home/nelson/tmp/dpep-work.Zny9K3/qt4-x11-4.0.1/tools/assistant/lib/qassistantclient.cpp	2005-09-11 09:01:31.000000000 -0700
+@@ -128,11 +128,11 @@
+     : QObject( parent ), host ( "localhost" )
+ {
+     if ( path.isEmpty() )
+-        assistantCommand = "assistant";
++        assistantCommand = "assistant-qt4";
+     else {
+         QFileInfo fi( path );
+         if ( fi.isDir() )
+-            assistantCommand = path + "/assistant";
++            assistantCommand = path + "/assistant-qt4";
+         else
+             assistantCommand = path;
+     }


Property changes on: trunk/packages/qt4-x11/debian/patches/11_launch_assistant-qt4.dpatch
___________________________________________________________________
Name: svn:executable
   + *