[SCM] qtbase packaging branch, master, updated. fbc5780b4a02a2f8242f3c509ad6c8c541f46af1

[Fathi Boudra]

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

The following commit has been merged in the master branch:
commit fbc5780b4a02a2f8242f3c509ad6c8c541f46af1
Author: Fathi Boudra <fathi.boudra at linaro.org>
Date:   Sun Jan 6 11:19:36 2013 +0200

    Use -no-strip configure option to disable stripping
    Remove unused deprecated path
---
 .../patches/add_nostrip_for_debug_packages.patch   |   21 --------------------
 debian/rules                                       |    4 +-
 2 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/debian/patches/add_nostrip_for_debug_packages.patch b/debian/patches/add_nostrip_for_debug_packages.patch
deleted file mode 100644
index b1444de..0000000
--- a/debian/patches/add_nostrip_for_debug_packages.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-author: Fathi Boudra <fabo at debian.org>
-
-Qt is built in release mode and strip files by default.
-Set CONFIG+=nostrip to avoid the stripping and
-let dh_strip do it to generate debug packages.
-
----
- configure |    2 ++
- 1 file changed, 2 insertions(+)
-
---- a/configure
-+++ b/configure
-@@ -777,6 +777,8 @@ mkdir -p "$outpath/config.tests"
- rm -f "$outpath/config.tests/.qmake.cache"
- cp "$QMAKE_VARS_FILE" "$outpath/config.tests/.qmake.cache"
- 
-+QMakeVar add CONFIG nostrip
-+
- QMakeVar add styles "cde mac motif plastique cleanlooks windows"
- 
- # QTDIR may be set and point to an old or system-wide Qt installation
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index e69de29..0000000
diff --git a/debian/rules b/debian/rules
index f41abc9..4cd82e3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -127,6 +127,7 @@ endif
 	            -optimized-qmake \
 	            -dbus-linked \
 	            -reduce-relocations \
+		    -no-strip \
 	            -no-separate-debug-info \
 	            -qpa xcb \
 	            -xcb \
@@ -215,8 +216,7 @@ ifeq ($(vendor),Ubuntu)
 endif
 
 override_dh_auto_install:
-	# Disable stripping to allow debug packages to be built
-	dh_auto_install -Smakefile -- INSTALL_ROOT=$(CURDIR)/debian/tmp/ STRIP=echo
+	dh_auto_install -Smakefile -- INSTALL_ROOT=$(CURDIR)/debian/tmp/
 
 	# Fix wrong path in pkgconfig files
 	find $(CURDIR)/debian/tmp/usr/lib/*/pkgconfig -type f -name '*.pc' \

-- 
qtbase packaging