[SCM] Qt 4 packaging branch, experimental-snapshots, updated. debian/4.7.0-rc1-1-14-g1e53124

Pino Toscano pino-guest at alioth.debian.org
Wed Oct 6 13:00:23 UTC 2010


The following commit has been merged in the experimental-snapshots branch:
commit 072bae246c34493c115270202983b2ed86205d00
Author: Pino Toscano <pino at kde.org>
Date:   Wed Oct 6 14:56:09 2010 +0200

    Merge all the "append -qt4 suffix" changes into a single 01_debian_append_qt4_suffix.diff.
---
 debian/changelog                                   |   10 ++-
 ...arget.diff => 01_debian_append_qt4_suffix.diff} |   88 +++++++++++++++++---
 debian/patches/01_qmake_for_debian.diff            |   17 ----
 debian/patches/02_launch_assistant-qt4.diff        |   25 ------
 debian/patches/03_launch_moc-qt4.diff              |   15 ----
 debian/patches/04_launch_uic-qt4.diff              |   13 ---
 debian/patches/series                              |    6 +-
 7 files changed, 87 insertions(+), 87 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 590fa0a..ce452e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,8 +17,16 @@ qt4-x11 (4:4.7.1-1) UNRELEASED; urgency=low
     - 22_use___GLIBC__.diff: use __GLIBC__ instead of Q_OS_LINUX for GLIBC
       functions
     - 50_kfreebsd_Q_OS.diff: define Q_OS_FREEBSD_KERNEL for kFreeBSD
-
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 06 Oct 2010 13:03:12 +0200
+  * Add a new patch 01_debian_append_qt4_suffix.diff, which contains all the
+    changes for appending the -qt4 suffix to various tools; it is the result
+    of the merge of the following patches (which are removed, as obsolete):
+    - 01_qmake_for_debian.diff
+    - 02_launch_assistant-qt4.diff
+    - 03_launch_moc-qt4.diff
+    - 04_launch_uic-qt4.diff
+    - 05_append_qt4_target.diff
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 06 Oct 2010 14:55:15 +0200
 
 qt4-x11 (4:4.7.0~rc1-1) experimental; urgency=low
 
diff --git a/debian/patches/05_append_qt4_target.diff b/debian/patches/01_debian_append_qt4_suffix.diff
similarity index 73%
rename from debian/patches/05_append_qt4_target.diff
rename to debian/patches/01_debian_append_qt4_suffix.diff
index a593a9c..5d56a2d 100644
--- a/debian/patches/05_append_qt4_target.diff
+++ b/debian/patches/01_debian_append_qt4_suffix.diff
@@ -1,4 +1,11 @@
-author: Fathi Boudra <fabo at debian.org>
+Author: Brian Nelson <pyro at debian.org>
+Author: Fathi Boudra <fabo at debian.org>
+Description: Append a -qt4 suffix to qmake, moc, uic, assistant.
+ To allow co-installation of the development tools of Qt4 with the Qt3 ones,
+ we append a -qt4 suffix to the executable names of the qmake, moc, uic,
+ and assistant tools.
+Last-Update: 2010-10-06
+Forwarded: not-needed
 
 --- a/config.tests/unix/compile.test
 +++ b/config.tests/unix/compile.test
@@ -57,7 +64,7 @@ author: Fathi Boudra <fabo at debian.org>
      if [ "$VERBOSE" = "yes" ]; then
 --- a/configure
 +++ b/configure
-@@ -4582,7 +4582,7 @@ END {
+@@ -4474,7 +4474,7 @@ END {
  }
  
  # build qmake
@@ -66,7 +73,7 @@ author: Fathi Boudra <fabo at debian.org>
      echo "Creating qmake. Please wait..."
  
      OLD_QCONFIG_H=
-@@ -8000,8 +8000,8 @@ QMAKE_ABSOLUTE_SOURCE_ROOT = \$\$QT_SOUR
+@@ -7759,8 +7759,8 @@ QMAKE_ABSOLUTE_SOURCE_ROOT = \$\$QT_SOUR
  QMAKE_MOC_SRC    = \$\$QT_BUILD_TREE/src/moc
  
  #local paths that cannot be queried from the QT_INSTALL_* properties while building QTDIR
@@ -77,7 +84,7 @@ author: Fathi Boudra <fabo at debian.org>
  QMAKE_UIC3       = \$\$QT_BUILD_TREE/bin/uic3
  QMAKE_RCC        = \$\$QT_BUILD_TREE/bin/rcc
  QMAKE_QDBUSXML2CPP = \$\$QT_BUILD_TREE/bin/qdbusxml2cpp
-@@ -8397,11 +8397,11 @@ EXEC=""
+@@ -8150,11 +8150,11 @@ EXEC=""
  #-------------------------------------------------------------------------------
  
  echo "Finding project files. Please wait..."
@@ -91,7 +98,7 @@ author: Fathi Boudra <fabo at debian.org>
  fi
  
  # .projects      -> projects to process
-@@ -8580,7 +8580,7 @@ for file in .projects .projects.3; do
+@@ -8331,7 +8331,7 @@ for file in .projects .projects.3; do
          QMAKE_SPEC_ARGS="-spec $SPEC"
          echo $ECHO_N "  for $a$ECHO_C"
  
@@ -174,7 +181,7 @@ author: Fathi Boudra <fabo at debian.org>
 --- a/tools/assistant/tools/assistant/assistant.pro
 +++ b/tools/assistant/tools/assistant/assistant.pro
 @@ -1,7 +1,7 @@
- include(../../../shared/fontpanel/fontpanel.pri)
+ include($$QT_SOURCE_TREE/tools/shared/fontpanel/fontpanel.pri)
  TEMPLATE = app
  LANGUAGE = C++
 -TARGET = assistant
@@ -191,8 +198,8 @@ author: Fathi Boudra <fabo at debian.org>
 -TARGET = designer
 +TARGET = designer-qt4
  
- include(../../../shared/fontpanel/fontpanel.pri)
- include(../../../shared/qttoolbardialog/qttoolbardialog.pri)
+ include($$QT_SOURCE_TREE/tools/shared/fontpanel/fontpanel.pri)
+ include($$QT_SOURCE_TREE/tools/shared/qttoolbardialog/qttoolbardialog.pri)
 --- a/tools/linguist/linguist/linguist.pro
 +++ b/tools/linguist/linguist/linguist.pro
 @@ -69,7 +69,7 @@ HEADERS += \
@@ -217,13 +224,15 @@ author: Fathi Boudra <fabo at debian.org>
  target.path=$$[QT_INSTALL_BINS]
 --- a/translations/translations.pri
 +++ b/translations/translations.pri
-@@ -1,5 +1,5 @@
- qtPrepareTool(LCONVERT, lconvert)
+@@ -8,7 +8,7 @@ defineReplace(prependAll) {
+     return ($$result)
+ }
+ 
 -qtPrepareTool(LUPDATE, lupdate)
 +qtPrepareTool(LUPDATE, lupdate-qt4)
  LUPDATE += -locations relative -no-ui-lines
  
- TS_TARGETS =
+ ###### Qt Libraries
 --- a/translations/translations.pro
 +++ b/translations/translations.pro
 @@ -1,6 +1,6 @@
@@ -263,3 +272,60 @@ author: Fathi Boudra <fabo at debian.org>
  
  isEmpty(UI_DIR):UI_DIR = .
  isEmpty(UI_SOURCES_DIR):UI_SOURCES_DIR = $$UI_DIR
+--- a/mkspecs/common/linux.conf
++++ b/mkspecs/common/linux.conf
+@@ -35,8 +35,8 @@ QMAKE_LIBS_OPENGL_ES2 = -lGLESv2
+ QMAKE_LIBS_OPENVG     = -lOpenVG
+ QMAKE_LIBS_THREAD     = -lpthread
+ 
+-QMAKE_MOC             = $$[QT_INSTALL_BINS]/moc
+-QMAKE_UIC             = $$[QT_INSTALL_BINS]/uic
++QMAKE_MOC             = $$[QT_INSTALL_BINS]/moc-qt4
++QMAKE_UIC             = $$[QT_INSTALL_BINS]/uic-qt4
+ 
+ QMAKE_AR              = ar cqs
+ QMAKE_OBJCOPY         = objcopy
+--- a/demos/qtdemo/menumanager.cpp
++++ b/demos/qtdemo/menumanager.cpp
+@@ -297,7 +297,7 @@ void MenuManager::showDocInAssistant(con
+     if (this->assistantProcess.state() != QProcess::Running){
+         QString app = QLibraryInfo::location(QLibraryInfo::BinariesPath) + QDir::separator();
+ #if !defined(Q_OS_MAC)
+-        app += QLatin1String("assistant");
++        app += QLatin1String("assistant-qt4");
+ #else
+         app += QLatin1String("Assistant.app/Contents/MacOS/Assistant");
+ #endif
+--- a/tools/designer/src/designer/assistantclient.cpp
++++ b/tools/designer/src/designer/assistantclient.cpp
+@@ -114,7 +114,7 @@ QString AssistantClient::binary()
+ {
+     QString app = QLibraryInfo::location(QLibraryInfo::BinariesPath) + QDir::separator();
+ #if !defined(Q_OS_MAC)
+-    app += QLatin1String("assistant");
++    app += QLatin1String("assistant-qt4");
+ #else
+     app += QLatin1String("Assistant.app/Contents/MacOS/Assistant");    
+ #endif
+--- a/tools/designer/src/lib/shared/qdesigner_utils.cpp
++++ b/tools/designer/src/lib/shared/qdesigner_utils.cpp
+@@ -668,7 +668,7 @@ namespace qdesigner_internal
+         binary += QDir::separator();
+         switch (mode) {
+         case UIC_GenerateCode:
+-            binary += QLatin1String("uic");
++            binary += QLatin1String("uic-qt4");
+             break;
+         case UIC_ConvertV3:
+             binary += QLatin1String("uic3");
+--- a/tools/qdbus/qdbuscpp2xml/qdbuscpp2xml.cpp
++++ b/tools/qdbus/qdbuscpp2xml/qdbuscpp2xml.cpp
+@@ -396,7 +396,7 @@ int main(int argc, char **argv)
+         else {
+             // run moc on this file
+             QProcess proc;
+-            proc.start(QLibraryInfo::location(QLibraryInfo::BinariesPath) + QLatin1String("/moc"), QStringList() << QFile::decodeName(argv[i]), QIODevice::ReadOnly | QIODevice::Text);
++            proc.start(QLibraryInfo::location(QLibraryInfo::BinariesPath) + QLatin1String("/moc-qt4"), QStringList() << QFile::decodeName(argv[i]), QIODevice::ReadOnly | QIODevice::Text);
+ 
+             if (!proc.waitForStarted()) {
+                 fprintf(stderr, PROGRAMNAME ": could not execute moc! Aborting.\n");
diff --git a/debian/patches/01_qmake_for_debian.diff b/debian/patches/01_qmake_for_debian.diff
deleted file mode 100644
index a0db3a1..0000000
--- a/debian/patches/01_qmake_for_debian.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-author: Brian Nelson <pyro at debian.org>
-
-Ensures qmake generates Makefiles that use the -qt4 tools.
-
---- a/mkspecs/common/linux.conf
-+++ b/mkspecs/common/linux.conf
-@@ -35,8 +35,8 @@ QMAKE_LIBS_OPENGL_ES2 = -lGLESv2
- QMAKE_LIBS_OPENVG     = -lOpenVG
- QMAKE_LIBS_THREAD     = -lpthread
- 
--QMAKE_MOC             = $$[QT_INSTALL_BINS]/moc
--QMAKE_UIC             = $$[QT_INSTALL_BINS]/uic
-+QMAKE_MOC             = $$[QT_INSTALL_BINS]/moc-qt4
-+QMAKE_UIC             = $$[QT_INSTALL_BINS]/uic-qt4
- 
- QMAKE_AR              = ar cqs
- QMAKE_OBJCOPY         = objcopy
diff --git a/debian/patches/02_launch_assistant-qt4.diff b/debian/patches/02_launch_assistant-qt4.diff
deleted file mode 100644
index 2d040cf..0000000
--- a/debian/patches/02_launch_assistant-qt4.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: launch assistant-qt4 explicitely (Debian naming scheme)
-Author: Fathi Boudra <fabo at debian.org>
-
---- a/demos/qtdemo/menumanager.cpp
-+++ b/demos/qtdemo/menumanager.cpp
-@@ -297,7 +297,7 @@ void MenuManager::showDocInAssistant(con
-     if (this->assistantProcess.state() != QProcess::Running){
-         QString app = QLibraryInfo::location(QLibraryInfo::BinariesPath) + QDir::separator();
- #if !defined(Q_OS_MAC)
--        app += QLatin1String("assistant");
-+        app += QLatin1String("assistant-qt4");
- #else
-         app += QLatin1String("Assistant.app/Contents/MacOS/Assistant");
- #endif
---- a/tools/designer/src/designer/assistantclient.cpp
-+++ b/tools/designer/src/designer/assistantclient.cpp
-@@ -114,7 +114,7 @@ QString AssistantClient::binary()
- {
-     QString app = QLibraryInfo::location(QLibraryInfo::BinariesPath) + QDir::separator();
- #if !defined(Q_OS_MAC)
--    app += QLatin1String("assistant");
-+    app += QLatin1String("assistant-qt4");
- #else
-     app += QLatin1String("Assistant.app/Contents/MacOS/Assistant");    
- #endif
diff --git a/debian/patches/03_launch_moc-qt4.diff b/debian/patches/03_launch_moc-qt4.diff
deleted file mode 100644
index 01162e8..0000000
--- a/debian/patches/03_launch_moc-qt4.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-author: Brian Nelson <pyro at debian.org>
-
-Ensure the Qt4 version of moc is launched.
-
---- a/tools/qdbus/qdbuscpp2xml/qdbuscpp2xml.cpp
-+++ b/tools/qdbus/qdbuscpp2xml/qdbuscpp2xml.cpp
-@@ -396,7 +396,7 @@ int main(int argc, char **argv)
-         else {
-             // run moc on this file
-             QProcess proc;
--            proc.start(QLibraryInfo::location(QLibraryInfo::BinariesPath) + QLatin1String("/moc"), QStringList() << QFile::decodeName(argv[i]), QIODevice::ReadOnly | QIODevice::Text);
-+            proc.start(QLibraryInfo::location(QLibraryInfo::BinariesPath) + QLatin1String("/moc-qt4"), QStringList() << QFile::decodeName(argv[i]), QIODevice::ReadOnly | QIODevice::Text);
- 
-             if (!proc.waitForStarted()) {
-                 fprintf(stderr, PROGRAMNAME ": could not execute moc! Aborting.\n");
diff --git a/debian/patches/04_launch_uic-qt4.diff b/debian/patches/04_launch_uic-qt4.diff
deleted file mode 100644
index 33ad5ec..0000000
--- a/debian/patches/04_launch_uic-qt4.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-author: Fathi Boudra <fabo at debian.org>
-
---- a/tools/designer/src/lib/shared/qdesigner_utils.cpp
-+++ b/tools/designer/src/lib/shared/qdesigner_utils.cpp
-@@ -668,7 +668,7 @@ namespace qdesigner_internal
-         binary += QDir::separator();
-         switch (mode) {
-         case UIC_GenerateCode:
--            binary += QLatin1String("uic");
-+            binary += QLatin1String("uic-qt4");
-             break;
-         case UIC_ConvertV3:
-             binary += QLatin1String("uic3");
diff --git a/debian/patches/series b/debian/patches/series
index 17ca702..c22c0bd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,11 +6,7 @@
 0225-invalidate-tabbar-geometry-on-refresh.patch
 
 # debian patches
-01_qmake_for_debian.diff
-02_launch_assistant-qt4.diff
-03_launch_moc-qt4.diff
-04_launch_uic-qt4.diff
-05_append_qt4_target.diff
+01_debian_append_qt4_suffix.diff
 07_trust_dpkg-arch_over_uname-m.diff
 08_configure_quilt_compat.diff
 09_qmake_lflags_as-needed.diff

-- 
Qt 4 packaging



More information about the pkg-kde-commits mailing list