rev 9983 - in branches/qt4-x11/debian: . patches

Fathi Boudra fabo at alioth.debian.org
Fri Apr 4 18:46:13 UTC 2008 

Author: fabo
Date: 2008-04-04 18:46:13 +0000 (Fri, 04 Apr 2008)
New Revision: 9983

Modified:
   branches/qt4-x11/debian/changelog
   branches/qt4-x11/debian/control
   branches/qt4-x11/debian/patches/0203-qtexthtmlparser-link-color.diff
   branches/qt4-x11/debian/patches/0209-prevent-qt-mixing.diff
   branches/qt4-x11/debian/patches/0210-fix-crash-q3stylesheet-font-size.diff
   branches/qt4-x11/debian/patches/0220-no-x-recursion-in-xerrhandler.diff
Log:
  * Remove Conflicts against libqt4-core.
  * Reorder libqt4-sql dependencies to have packages available on all
    architectures listed first. (Closes: #473348)
  * Add architectures availability list to libqt4-sql-ibase package.
    (Closes: #473348)


Modified: branches/qt4-x11/debian/changelog
===================================================================
--- branches/qt4-x11/debian/changelog	2008-04-04 18:07:14 UTC (rev 9982)
+++ branches/qt4-x11/debian/changelog	2008-04-04 18:46:13 UTC (rev 9983)
@@ -1,6 +1,6 @@
-qt4-x11 (4.4.0~rc1-1~pre2) experimental; urgency=low
+qt4-x11 (4.4.0~rc1-1) unstable; urgency=low
 
-  * New upstream release.
+  * New upstream release. (Closes: #469783)
 
   +++ Changes by Modestas Vainius:
 
@@ -33,14 +33,23 @@
     * libqt4-script.install: remove libqtscriptdbus.so
     * qt4-dev-tools.install: a few renames of the language files,
       s/assistant-qt3/assistant-qt4/, add usr/bin/xmlpatterns
-  * Add libqt4-core transitional package.
+  * Add libqt4-core transitional package. (Closes: #473658)
   * Add debian/not-installed to document files which are deliberately not
     installed
   * Avoid calling ./configure repeatedly during build/install: tie ./configure
     to config.status
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 04 Apr 2008 03:34:39 +0300
+  +++ Changes by Fathi Boudra:
 
+  * Re-introduce LD_LIBRARY_PATH workaround to use lrelease.
+  * Remove Conflicts against libqt4-core.
+  * Reorder libqt4-sql dependencies to have packages available on all
+    architectures listed first. (Closes: #473348)
+  * Add architectures availability list to libqt4-sql-ibase package.
+    (Closes: #473348)
+
+ -- Fathi Boudra <fabo at debian.org>  Fri, 04 Apr 2008 10:42:06 +0200
+
 qt4-x11 (4.4.0~beta1-1) experimental; urgency=low
 
   * New upstream release.

Modified: branches/qt4-x11/debian/control
===================================================================
--- branches/qt4-x11/debian/control	2008-04-04 18:07:14 UTC (rev 9982)
+++ branches/qt4-x11/debian/control	2008-04-04 18:46:13 UTC (rev 9983)
@@ -22,7 +22,6 @@
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: libqt4-core (<< 4.4.0~beta1-1)
 Replaces: libqt4-core (<< 4.4.0~beta1-1)
 Description: Qt 4 core module
  Qt is a cross-platform C++ application framework. Qt's primary feature
@@ -59,7 +58,6 @@
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: libqt4-core (<< 4.4.0~beta1-1)
 Replaces: libqt4-core (<< 4.4.0~beta1-1)
 Description: Qt 4 network module
  Qt is a cross-platform C++ application framework. Qt's primary feature
@@ -88,7 +86,6 @@
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: libqt4-core (<< 4.4.0~beta1-1)
 Replaces: libqt4-core (<< 4.4.0~beta1-1)
 Description: Qt 4 script module
  Qt is a cross-platform C++ application framework. Qt's primary feature
@@ -100,7 +97,7 @@
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends},
- libqt4-sql-ibase | libqt4-sql-mysql | libqt4-sql-odbc | libqt4-sql-psql | libqt4-sql-sqlite | libqt4-sql-sqlite2
+ libqt4-sql-mysql | libqt4-sql-odbc | libqt4-sql-psql | libqt4-sql-sqlite | libqt4-sql-sqlite2 | libqt4-sql-ibase [i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64 sparc powerpc]
 Suggests: libqt4-dev
 Description: Qt 4 SQL module
  Qt is a cross-platform C++ application framework. Qt's primary feature
@@ -208,7 +205,6 @@
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: libqt4-core (<< 4.4.0~beta1-1)
 Replaces: libqt4-core (<< 4.4.0~beta1-1)
 Description: Qt 4 XML module
  Qt is a cross-platform C++ application framework. Qt's primary feature
@@ -231,7 +227,6 @@
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: libqt4-core (<< 4.4.0~beta1-1)
 Replaces: libqt4-core (<< 4.4.0~beta1-1)
 Description: Qt 4 D-Bus module
  Qt is a cross-platform C++ application framework. Qt's primary feature
@@ -301,7 +296,6 @@
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: libqt4-core (<< 4.4.0~beta1-1)
 Replaces: libqt4-core (<< 4.4.0~beta1-1)
 Description: Qt 4 test module
  Qt is a cross-platform C++ application framework. Qt's primary feature
@@ -316,15 +310,15 @@
 Depends: ${shlibs:Depends}, ${misc:Depends},
  libqt4-gui (= ${binary:Version}), libqt4-network (= ${binary:Version}),
  libqt4-opengl (= ${binary:Version}), libqt4-script (= ${binary:Version}),
- libqt4-sql (= ${binary:Version}), libqt4-sql-ibase (= ${binary:Version}),
- libqt4-sql-mysql (= ${binary:Version}), libqt4-sql-odbc (= ${binary:Version}),
- libqt4-sql-psql (= ${binary:Version}), libqt4-sql-sqlite (= ${binary:Version}),
- libqt4-sql-sqlite2 (= ${binary:Version}), libqt4-svg (= ${binary:Version}),
- libqt4-webkit (= ${binary:Version}), libqt4-xml (= ${binary:Version}),
- libqt4-xmlpatterns (= ${binary:Version}), libqt4-dbus (= ${binary:Version}),
- libqt4-qt3support (= ${binary:Version}), libqt4-designer (= ${binary:Version}),
- libqt4-help (= ${binary:Version}), libqt4-assistant (= ${binary:Version}),
- libqt4-test (= ${binary:Version}),
+ libqt4-sql (= ${binary:Version}), libqt4-sql-mysql (= ${binary:Version}),
+ libqt4-sql-odbc (= ${binary:Version}), libqt4-sql-psql (= ${binary:Version}),
+ libqt4-sql-sqlite (= ${binary:Version}), libqt4-sql-sqlite2 (= ${binary:Version}),
+ libqt4-svg (= ${binary:Version}), libqt4-webkit (= ${binary:Version}),
+ libqt4-xml (= ${binary:Version}), libqt4-xmlpatterns (= ${binary:Version}),
+ libqt4-dbus (= ${binary:Version}), libqt4-qt3support (= ${binary:Version}),
+ libqt4-designer (= ${binary:Version}), libqt4-help (= ${binary:Version}),
+ libqt4-assistant (= ${binary:Version}), libqt4-test (= ${binary:Version}),
+ libqt4-sql-ibase (= ${binary:Version}) [i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64 sparc powerpc]
  firebird2.0-dev [i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64 sparc powerpc],
  libaudio-dev, libcupsys2-dev, libdbus-1-dev, libfreetype6-dev,
  libgl1-mesa-dev | libgl-dev, libglib2.0-dev, libglu1-mesa-dev | libglu-dev,

Modified: branches/qt4-x11/debian/patches/0203-qtexthtmlparser-link-color.diff
===================================================================
--- branches/qt4-x11/debian/patches/0203-qtexthtmlparser-link-color.diff	2008-04-04 18:07:14 UTC (rev 9982)
+++ branches/qt4-x11/debian/patches/0203-qtexthtmlparser-link-color.diff	2008-04-04 18:46:13 UTC (rev 9983)
@@ -5,9 +5,9 @@
 
 Links are assigned a foreground color according to the system current color scheme.
 
---- a/src/gui/text/qtexthtmlparser.cpp	(revisión: 745183)
-+++ b/src/gui/text/qtexthtmlparser.cpp	(copia de trabajo)
-@@ -1053,7 +1053,7 @@ void QTextHtmlParserNode::initializeProp
+--- a/src/gui/text/qtexthtmlparser.cpp
++++ b/src/gui/text/qtexthtmlparser.cpp
+@@ -1053,7 +1053,7 @@
                      && !attributes.at(i + 1).isEmpty()) {
                      hasHref = true;
                      charFormat.setUnderlineStyle(QTextCharFormat::SingleUnderline);

Modified: branches/qt4-x11/debian/patches/0209-prevent-qt-mixing.diff
===================================================================
--- branches/qt4-x11/debian/patches/0209-prevent-qt-mixing.diff	2008-04-04 18:07:14 UTC (rev 9982)
+++ branches/qt4-x11/debian/patches/0209-prevent-qt-mixing.diff	2008-04-04 18:46:13 UTC (rev 9983)
@@ -13,9 +13,9 @@
 This patch does not make qt-copy binary incompatible with upstream Qt.
 It only further enforces using the same sources for the whole Qt build.
 
---- a/src/corelib/kernel/qobject_p.h.sav	2008-01-29 19:37:26.000000000 +0100
-+++ b/src/corelib/kernel/qobject_p.h	2008-01-30 14:08:15.000000000 +0100
-@@ -85,7 +85,9 @@ extern QSignalSpyCallbackSet Q_CORE_EXPO
+--- a/src/corelib/kernel/qobject_p.h
++++ b/src/corelib/kernel/qobject_p.h
+@@ -85,7 +85,9 @@
  
  inline QObjectData::~QObjectData() {}
  

Modified: branches/qt4-x11/debian/patches/0210-fix-crash-q3stylesheet-font-size.diff
===================================================================
--- branches/qt4-x11/debian/patches/0210-fix-crash-q3stylesheet-font-size.diff	2008-04-04 18:07:14 UTC (rev 9982)
+++ branches/qt4-x11/debian/patches/0210-fix-crash-q3stylesheet-font-size.diff	2008-04-04 18:46:13 UTC (rev 9983)
@@ -1,7 +1,7 @@
 qt-bugs@ issue : 197621
 Trolltech task ID : 197836
 bugs.kde.org number : none
-applied: yes
+applied: no
 author: Montel Laurent <montel at kde.org>
 
 This patch fixes crashs in q3stylesheet (it was possible to

Modified: branches/qt4-x11/debian/patches/0220-no-x-recursion-in-xerrhandler.diff
===================================================================
--- branches/qt4-x11/debian/patches/0220-no-x-recursion-in-xerrhandler.diff	2008-04-04 18:07:14 UTC (rev 9982)
+++ branches/qt4-x11/debian/patches/0220-no-x-recursion-in-xerrhandler.diff	2008-04-04 18:46:13 UTC (rev 9983)
@@ -9,9 +9,9 @@
 QDragManager instance should not be allowed in it, as it results in things like
 creating X pixmaps. See https://bugzilla.novell.com/show_bug.cgi?id=368456.
 
---- a/src/gui/kernel/qdnd_x11.cpp.sav	2008-03-01 02:33:57.000000000 +0100
-+++ b/src/gui/kernel/qdnd_x11.cpp	2008-04-03 14:33:02.000000000 +0200
-@@ -1700,21 +1700,23 @@ void QDragManager::drop()
+--- a/src/gui/kernel/qdnd_x11.cpp
++++ b/src/gui/kernel/qdnd_x11.cpp
+@@ -1700,21 +1700,23 @@
  
  bool QX11Data::xdndHandleBadwindow()
  {

More information about the pkg-kde-commits mailing list