[SCM] Qt 4 packaging branch, experimental, updated. debian/4.7.3-1-22-gace9ec1

[Pino Toscano]

The following commit has been merged in the experimental branch:
commit fb87030139164639b0ff6f4d04c4c862e1e5ddeb
Author: Pino Toscano <pino at kde.org>
Date:   Tue Jun 14 18:08:21 2011 +0200

    Use the hurd-g++ mkspec when building on Hurd
    
    - add mkspecs/hurd-g++/qmake.conf in 01_debian_append_qt4_suffix.diff
    - update the platform_arg in debian/rules
---
 debian/changelog                                |    5 +++++
 debian/patches/01_debian_append_qt4_suffix.diff |   19 +++++++++++++++++--
 debian/rules                                    |    4 ++++
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c181ac0..8815562 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,11 @@ qt4-x11 (4:4.8~alpha+tp-0r1) UNRELEASED; urgency=low
     - use ts-all target. The ts target has been removed.
   * Update installed files: headers, translations, qmlplugindump.
 
+  [ Pino Toscano ]
+  * Use the hurd-g++ mkspec when building on Hurd:
+    - add mkspecs/hurd-g++/qmake.conf in 01_debian_append_qt4_suffix.diff
+    - update the platform_arg in debian/rules
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 10 Jun 2011 09:21:12 +0300
 
 qt4-x11 (4:4.7.3-2) UNRELEASED; urgency=low
diff --git a/debian/patches/01_debian_append_qt4_suffix.diff b/debian/patches/01_debian_append_qt4_suffix.diff
index f2c4c45..c1d76db 100644
--- a/debian/patches/01_debian_append_qt4_suffix.diff
+++ b/debian/patches/01_debian_append_qt4_suffix.diff
@@ -1,10 +1,11 @@
 Author: Brian Nelson <pyro at debian.org>
 Author: Fathi Boudra <fabo at debian.org>
+Author: Pino Toscano <pino at kde.org>
 Description: Append a -qt4 suffix to some tools.
  To allow co-installation of the development tools of Qt4 with the Qt3 ones,
  we append a -qt4 suffix to the executable names of some development tools:
  assistant, designer, linguist, lrelease, lupdate, moc, qmake, qtconfig, uic.
-Last-Update: 2011-03-03
+Last-Update: 2011-06-14
 Forwarded: not-needed
 
 ---
@@ -18,6 +19,7 @@ Forwarded: not-needed
  mkspecs/common/linux.conf                         |    4 ++--
  mkspecs/features/moc.prf                          |    2 +-
  mkspecs/features/uic.prf                          |    2 +-
+ mkspecs/hurd-g++/qmake.conf                       |    4 ++--
  projects.pro                                      |    2 +-
  qmake/Makefile.unix                               |    8 ++++----
  src/tools/moc/moc.pro                             |    2 +-
@@ -32,7 +34,7 @@ Forwarded: not-needed
  tools/qdbus/qdbuscpp2xml/qdbuscpp2xml.cpp         |    2 +-
  tools/qtconfig/qtconfig.pro                       |    2 +-
  translations/translations.pro                     |    6 +++---
- 24 files changed, 35 insertions(+), 35 deletions(-)
+ 25 files changed, 37 insertions(+), 37 deletions(-)
 
 --- a/config.tests/unix/compile.test
 +++ b/config.tests/unix/compile.test
@@ -348,3 +350,16 @@ Forwarded: not-needed
  
              if (!proc.waitForStarted()) {
                  fprintf(stderr, PROGRAMNAME ": could not execute moc! Aborting.
");
+--- a/mkspecs/hurd-g++/qmake.conf
++++ b/mkspecs/hurd-g++/qmake.conf
+@@ -42,8 +42,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/rules b/debian/rules
index 3ee383a..968a2aa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -57,7 +57,11 @@ ifeq ($(DEB_HOST_ARCH_OS),linux)
     endif # sparc64
   endif # amd64
 else
+  ifeq ($(DEB_HOST_ARCH_OS),hurd)
+	platform_arg = hurd-g++
+  else
 	platform_arg = glibc-g++
+  endif
 endif
 
 %:

-- 
Qt 4 packaging