[SCM] Qt 4 packaging branch, experimental, updated. debian/4.7.4-1-31-gbe474c3

[Fathi Boudra]

The following commit has been merged in the experimental branch:
commit 18bfb4d22fde046dcc46550df09df81c3e856fdf
Author: Fathi Boudra <fabo at debian.org>
Date:   Tue Dec 27 18:13:25 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 |   15 +++++++++++++++
 debian/rules                                    |    4 ++++
 3 files changed, 24 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 008ef1b..cacbde1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,11 @@ qt4-x11 (4:4.8.0-0multiarch1) UNRELEASED; urgency=low
 
   * New upstream release.
 
+  [ 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>  Thu, 22 Dec 2011 17:50:13 +0200
 
 qt4-x11 (4:4.7.4-1) unstable; urgency=low
diff --git a/debian/patches/01_debian_append_qt4_suffix.diff b/debian/patches/01_debian_append_qt4_suffix.diff
index 5693c71..176ee73 100644
--- a/debian/patches/01_debian_append_qt4_suffix.diff
+++ b/debian/patches/01_debian_append_qt4_suffix.diff
@@ -1,5 +1,6 @@
 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:
@@ -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 +-
@@ -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 70c47b7..6974b98 100755
--- a/debian/rules
+++ b/debian/rules
@@ -61,7 +61,11 @@ ifeq ($(DEB_HOST_ARCH_OS),linux)
 	platform_arg = linux-g++
   endif
 else
+  ifeq ($(DEB_HOST_ARCH_OS),hurd)
+	platform_arg = hurd-g++
+  else
 	platform_arg = glibc-g++
+  endif
 endif
 
 ifneq ($(DEB_HOST_ARCH),ia64)

-- 
Qt 4 packaging