[SCM] qtbase packaging branch, experimental, updated. debian/5.2.0+dfsg-2-5-g2fa0031

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=2fa0031

The following commit has been merged in the experimental branch:
commit 2fa0031838725465d901cb5b68b2b179360600cc
Author: Pino Toscano <pino at debian.org>
Date:   Sat Dec 21 02:05:18 2013 +0100

    get rid of our glibc-g++ qmake mkspec
    
    it was a mistake with Qt4 (3?) already, and it is no more working with
    non-Linux OSes;
    as a consequence, error out for OSes with no qmake mkspec explicitly
    set in rules
---
 debian/changelog | 3 +++
 debian/rules     | 8 +-------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f7e6288..25f2f02 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,9 @@ qtbase-opensource-src (5.2.0+dfsg-3) UNRELEASED; urgency=low
   * Initial support for GNU/kFreeBSD:
     - provide qmake mkspec, and use LD_LIBRARY_PATH; patch gnukfreebsd.diff
     - rules: use the gnukfreebsd-g++ when configure'ing
+  * Get rid of our glibc-g++ qmake mkspec: it was a mistake with Qt4 (3?)
+    already, and it is no more working with non-Linux OSes; as a consequence,
+    error out for OSes with no qmake mkspec explicitly set in rules.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 20 Dec 2013 21:31:31 +0100
 
diff --git a/debian/rules b/debian/rules
index ecd5029..209ab66 100755
--- a/debian/rules
+++ b/debian/rules
@@ -78,18 +78,13 @@ else ifeq ($(DEB_HOST_ARCH_OS),hurd)
 else ifeq ($(DEB_HOST_ARCH_OS),kfreebsd)
 	platform_arg = gnukfreebsd-g++
 else
-	platform_arg = glibc-g++
+	$(error Unknown qmake mkspec for $(DEB_HOST_ARCH_OS))
 endif
 
 %:
 	dh $@ --parallel --with pkgkde_symbolshelper
 
 override_dh_auto_configure:
-	# Create mkspecs/glibc-g++ from mkspecs/linux-g++, needed by GNU/kFreeBSD
-	# we cannot use directly linux-g++ due to src/corelib/io/io.pri
-	rm -rf mkspecs/glibc-g++
-	cp -a mkspecs/linux-g++ mkspecs/glibc-g++
-
 	./configure -confirm-license \
 	            -prefix "/usr" \
 	            -bindir "/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/bin" \
@@ -155,7 +150,6 @@ override_dh_auto_clean:
 	  examples/tools/plugandpaint/plugins/ \
 	  examples/tools/styleplugin/styles/ \
 	  lib/ \
-	  mkspecs/glibc-g++/ \
 	  plugins/ \
 	;
 

-- 
qtbase packaging