Merge git://anonscm.debian.org/pkg-kde/qt/qtscript

Conflicts:
	debian/changelog

10 files changed, 274 insertions, 220 deletions

diff --git a/debian/changelog b/debian/changelog
index 68b74e3..a745c35 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,78 @@
+qtscript-opensource-src (5.3.2+dfsg-2) unstable; urgency=medium
+
+  * Upload to unstable.
+  * Update symbols files with buildds' logs.
+
+ -- Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org>  Sun, 21 Sep 2014 23:38:08 -0300
+
+qtscript-opensource-src (5.3.2+dfsg-1) experimental; urgency=medium
+
+  * New upstream release.
+  * Bump Qt build dependencies.
+
+ -- Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org>  Tue, 16 Sep 2014 22:07:20 -0300
+
+qtscript-opensource-src (5.3.1+dfsg-3) unstable; urgency=medium
+
+  * Bump qtbase's build dependencies to >= 5.3.1-2 to get qtbase-abi-5-3-1.
+  * Update symbols files with buildds' and mips64el's logs.
+
+ -- Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org>  Fri, 27 Jun 2014 23:59:44 -0300
+
+qtscript-opensource-src (5.3.1+dfsg-2) unstable; urgency=medium
+
+  * Bump Qt build dependencies.
+  * Update symbols files with buildds' logs.
+  * Mark new private symbols as such.
+
+ -- Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org>  Thu, 26 Jun 2014 23:43:47 -0300
+
+qtscript-opensource-src (5.3.1+dfsg-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Update symbols files with buildds' and mips64el's logs.
+  * Update symbols files with current log.
+
+ -- Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org>  Thu, 26 Jun 2014 20:23:08 -0300
+
+qtscript-opensource-src (5.3.0+dfsg-4) unstable; urgency=medium
+
+  * Update symbols files with buildds' logs.
+
+ -- Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org>  Thu, 19 Jun 2014 12:03:23 -0300
+
+qtscript-opensource-src (5.3.0+dfsg-3) unstable; urgency=medium
+
+  * Update symbols files with buildds' logs (Closes: #746899).
+
+ -- Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org>  Wed, 18 Jun 2014 11:16:00 -0300
+
+qtscript-opensource-src (5.3.0+dfsg-2) unstable; urgency=medium
+
+  * Upload to unstable.
+  * Development packages are now Arch: any and Multi-Arch: same.
+  * Search for private symbols at build time and produce a diff so as to be
+    able to get the changes from build logs.
+    - Modify mark_private_symbols.sh.
+    - Run mark_private_symbols.sh from debian/rules.
+  * Do not override dh_builddeb, xz is now the default compression method.
+
+ -- Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org>  Thu, 05 Jun 2014 23:15:25 -0300
+
+qtscript-opensource-src (5.3.0+dfsg-1) experimental; urgency=medium
+
+  * New upstream release.
+  * Add missing word in qtscript5-private-dev's description (Closes: #745300).
+    Thanks Pascal De Vuyst.
+  * Do not build qtscript5-doc anymore from this source, thus allowing us to
+    avoid a dependency on qttools and a circular dependency.
+    The package will be built from qttools itself.
+  * Bump the build dependency on qtbase to 5.3.0+dfsg~.
+  * Refresh s390x_jscore.diff.
+  * Move headers to their new multi-arch aware path.
+
+ -- Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org>  Wed, 21 May 2014 12:43:46 -0300
+
 qtscript-opensource-src (5.2.1+dfsg-3~dyson1) unstable; urgency=medium
 
   * Package for Dyson
@@ -8,14 +83,6 @@ qtscript-opensource-src (5.2.1+dfsg-3~dyson1) unstable; urgency=medium
 
  -- Igor Pashev <pashev.igor@gmail.com>  Mon, 28 Apr 2014 12:38:53 +0400
 
-qtscript-opensource-src (5.2.1+dfsg-3) UNRELEASED; urgency=medium
-
-  [ Lisandro Damián Nicanor Pérez Meyer ]
-  * Add missing word in qtscript5-private-dev's description (Closes: #745300).
-    Thanks Pascal De Vuyst.
-
- -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sun, 20 Apr 2014 22:27:08 -0300
-
 qtscript-opensource-src (5.2.1+dfsg-2) unstable; urgency=medium
 
   * Upload to unstable.
diff --git a/debian/control b/debian/control
index 707a22a..65213eb 100644
--- a/debian/control
+++ b/debian/control
@@ -11,10 +11,9 @@ Uploaders: Fathi Boudra <fabo@debian.org>,
 Build-Depends: debhelper (>= 9),
                dpkg-dev (>= 1.16.1),
                pkg-kde-tools (>= 0.15.8~),
-               qtbase5-private-dev (>= 5.2.1+dfsg~),
+               qtbase5-private-dev (>= 5.3.2+dfsg~),
                xauth,
                xvfb
-Build-Depends-Indep: libqt5sql5-sqlite, qttools5-dev-tools (>= 5.2.1~)
 Standards-Version: 3.9.5
 Homepage: http://qt-project.org/
 Vcs-Git: git://anonscm.debian.org/pkg-kde/qt/qtscript.git
@@ -50,6 +49,7 @@ Description: Qt 5 script tools module
 Package: qtscript5-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Pre-Depends: dpkg (>= 1.15.6~)
 Depends: libqt5script5 (= ${binary:Version}),
          libqt5scripttools5 (= ${binary:Version}),
@@ -64,6 +64,7 @@ Description: Qt 5 script development files
 
 Package: qtscript5-private-dev
 Architecture: any
+Multi-Arch: same
 Section: libdevel
 Pre-Depends: dpkg (>= 1.15.6~)
 Depends: qtscript5-dev (= ${binary:Version}), ${misc:Depends}
@@ -103,17 +104,6 @@ Description: Qt 5 script libraries debugging symbols
  .
  This package contains the debugging symbols for the Qt 5 script libraries.
 
-Package: qtscript5-doc
-Priority: extra
-Architecture: all
-Section: doc
-Depends: ${misc:Depends}
-Description: Qt 5 script documentation
- Qt is a cross-platform C++ application framework. Qt's primary feature
- is its rich set of widgets that provide standard GUI functionality.
- .
- This package contains the documentation for the Qt 5 script libraries.
-
 Package: qtscript5-doc-html
 Priority: extra
 Architecture: all
diff --git a/debian/copyright b/debian/copyright
index 96d57f3..924f5a4 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -8,6 +8,7 @@ License: LGPL-2.1 with Digia Qt LGPL Exception 1.1 or GPL-3
 
 Files: debian/mark_private_symbols.sh
 Copyright: 2013 Sune Vuorela <sune@debian.org>
+           2014 Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org>
 License: Expat
 
 Files: debian/*
diff --git a/debian/libqt5script5.symbols b/debian/libqt5script5.symbols
index 960eec9..b6b8657 100644
--- a/debian/libqt5script5.symbols
+++ b/debian/libqt5script5.symbols
@@ -1,4 +1,4 @@
-# SymbolsHelper-Confirmed: 5.2.0 armel armhf i386 ia64 powerpc ppc64 s390x sparc
+# SymbolsHelper-Confirmed: 5.3.2 powerpc ppc64el x32
 libQt5Script.so.5 libqt5script5 #MINVER#
 | libqt5script5 #MINVER#, qtscript-abi-5-2-0
  _Z14qScriptConnectP7QObjectPKcRK12QScriptValueS5_@Base 5.0.2
@@ -287,9 +287,6 @@ libQt5Script.so.5 libqt5script5 #MINVER#
  (subst)_ZN25QScriptEngineAgentPrivate18didReachBreakpointERKN5QTJSC17DebuggerCallFrameE{intptr_t}i@Base 5.0.2 1
  _ZN25QScriptEngineAgentPrivate6attachEv@Base 5.0.2 1
  _ZN25QScriptEngineAgentPrivate6detachEv@Base 5.0.2 1
- _ZN25QScriptExtensionInterfaceD0Ev@Base 5.0.2
- _ZN25QScriptExtensionInterfaceD1Ev@Base 5.0.2
- _ZN25QScriptExtensionInterfaceD2Ev@Base 5.0.2
  _ZN28QScriptClassPropertyIteratorC1ERK12QScriptValue@Base 5.0.2
  _ZN28QScriptClassPropertyIteratorC1ERK12QScriptValueR35QScriptClassPropertyIteratorPrivate@Base 5.0.2
  _ZN28QScriptClassPropertyIteratorC2ERK12QScriptValue@Base 5.0.2
@@ -428,13 +425,6 @@ libQt5Script.so.5 libqt5script5 #MINVER#
  _ZNK28QScriptClassPropertyIterator2idEv@Base 5.0.2
  _ZNK28QScriptClassPropertyIterator5flagsEv@Base 5.0.2
  _ZNK28QScriptClassPropertyIterator6objectEv@Base 5.0.2
- (optional=templinst|subst|arch=ia64 sparc)_ZSt13__adjust_heapIN5QListI7QStringE8iteratorE{qptrdiff}S1_EvT_T0_S5_T1_@Base 5.2.0
- (optional=templinst|arch=sparc)_ZSt13__heap_selectIN5QListI7QStringE8iteratorEEvT_S4_S4_@Base 5.2.0
- (optional=templinst|arch=ia64 sparc)_ZSt16__insertion_sortIN5QListI7QStringE8iteratorEEvT_S4_@Base 5.2.0
- (optional=templinst|arch=ia64 sparc)_ZSt16__introsort_loopIN5QListI7QStringE8iteratorEiEvT_S4_T0_@Base 5.2.0
- (optional=templinst|arch=ia64 sparc)_ZSt19__move_median_firstIN5QListI7QStringE8iteratorEEvT_S4_S4_@Base 5.2.0
- (optional=templinst|arch=ia64 sparc)_ZSt21__unguarded_partitionIN5QListI7QStringE8iteratorES1_ET_S4_S4_RKT0_@Base 5.2.0
- (optional=templinst|arch=ia64 sparc)_ZSt25__unguarded_linear_insertIN5QListI7QStringE8iteratorEEvT_@Base 5.2.0
  (optional=templinst|arch=ia64)_ZSt9make_heapIN5QListI7QStringE8iteratorEEvT_S4_@Base 5.2.0
  _ZTI12QScriptClass@Base 5.0.2
  _ZTI13QScriptEngine@Base 5.0.2
@@ -445,6 +435,7 @@ libQt5Script.so.5 libqt5script5 #MINVER#
  _ZTI25QScriptEngineAgentPrivate@Base 5.0.2 1
  _ZTI25QScriptExtensionInterface@Base 5.0.2
  _ZTI28QScriptClassPropertyIterator@Base 5.0.2
+ (optional=gccinternal)_ZTIN23QScriptDeclarativeClass6ObjectE@Base 5.3.0 1
  _ZTS12QScriptClass@Base 5.0.2
  _ZTS13QScriptEngine@Base 5.0.2
  _ZTS17QFactoryInterface@Base 5.0.2
@@ -454,6 +445,7 @@ libQt5Script.so.5 libqt5script5 #MINVER#
  _ZTS25QScriptEngineAgentPrivate@Base 5.0.2 1
  _ZTS25QScriptExtensionInterface@Base 5.0.2
  _ZTS28QScriptClassPropertyIterator@Base 5.0.2
+ (optional=gccinternal)_ZTSN23QScriptDeclarativeClass6ObjectE@Base 5.3.0 1
  _ZTV12QScriptClass@Base 5.0.2
  _ZTV13QScriptEngine@Base 5.0.2
  _ZTV17QFactoryInterface@Base 5.0.2
@@ -463,6 +455,7 @@ libQt5Script.so.5 libqt5script5 #MINVER#
  _ZTV25QScriptEngineAgentPrivate@Base 5.0.2 1
  _ZTV25QScriptExtensionInterface@Base 5.0.2
  _ZTV28QScriptClassPropertyIterator@Base 5.0.2
+ (optional=gccinternal)_ZTVN23QScriptDeclarativeClass6ObjectE@Base 5.3.0 1
  _ZlsR11QDataStreamRK18QScriptContextInfo@Base 5.0.2
  _ZrsR11QDataStreamR18QScriptContextInfo@Base 5.0.2
  (c++)"non-virtual thunk to QScriptExtensionPlugin::~QScriptExtensionPlugin()@Base" 5.0.2
diff --git a/debian/libqt5scripttools5.symbols b/debian/libqt5scripttools5.symbols
index 7c0d2d1..4e33f56 100644
--- a/debian/libqt5scripttools5.symbols
+++ b/debian/libqt5scripttools5.symbols
@@ -1,4 +1,4 @@
-# SymbolsHelper-Confirmed: 5.2.0 armel armhf i386 ia64 powerpc ppc64 s390x sparc
+# SymbolsHelper-Confirmed: 5.3.0 sparc
 libQt5ScriptTools.so.5 libqt5scripttools5 #MINVER#
 | libqt5scripttools5 #MINVER#, qtscript-abi-5-2-0
  _ZN21QScriptEngineDebugger11qt_metacallEN11QMetaObject4CallEiPPv@Base 5.0.2
@@ -25,31 +25,6 @@ libQt5ScriptTools.so.5 libqt5scripttools5 #MINVER#
  _ZNK21QScriptEngineDebugger5stateEv@Base 5.0.2
  _ZNK21QScriptEngineDebugger6actionENS_14DebuggerActionE@Base 5.0.2
  _ZNK21QScriptEngineDebugger6widgetENS_14DebuggerWidgetE@Base 5.0.2
- (optional=templinst|arch=ia64 sparc)_ZNSt17_Temporary_bufferIN5QListI7QStringE8iteratorES1_EC1ES3_S3_@Base 5.2.0
- (optional=templinst|arch=ia64 sparc)_ZNSt17_Temporary_bufferIN5QListI7QStringE8iteratorES1_EC2ES3_S3_@Base 5.2.0
- (optional=templinst|arch=ia64 sparc)_ZSt11lower_boundIN5QListI7QStringE8iteratorES1_ET_S4_S4_RKT0_@Base 5.2.0
- (optional=templinst|arch=ia64 sparc)_ZSt11upper_boundIN5QListI7QStringE8iteratorES1_ET_S4_S4_RKT0_@Base 5.2.0
- (optional=templinst|arch=ia64 sparc)_ZSt12__move_mergeIN5QListI7QStringE8iteratorES3_PS1_ET1_T_S6_T0_S7_S5_@Base 5.2.0
- (optional=templinst|arch=ia64 sparc)_ZSt12__move_mergeIP7QStringS1_N5QListIS0_E8iteratorEET1_T_S6_T0_S7_S5_@Base 5.2.0
- (optional=templinst|subst|arch=ia64 sparc)_ZSt13__adjust_heapIN5QListI7QStringE8iteratorE{qptrdiff}S1_PFbRKS1_S5_EEvT_T0_S9_T1_T2_@Base 5.2.0
- (optional=templinst|arch=ia64 sparc)_ZSt16__insertion_sortIN5QListI7QStringE8iteratorEEvT_S4_@Base 5.2.0
- (optional=templinst|arch=ia64 sparc)_ZSt16__insertion_sortIN5QListI7QStringE8iteratorEPFbRKS1_S5_EEvT_S8_T0_@Base 5.2.0
- (optional=templinst|arch=ia64 sparc)_ZSt16__introsort_loopIN5QListI7QStringE8iteratorEiPFbRKS1_S5_EEvT_S8_T0_T1_@Base 5.2.0
- (optional=templinst|subst|arch=ia64 sparc)_ZSt16__merge_adaptiveIN5QListI7QStringE8iteratorE{qptrdiff}PS1_EvT_S5_S5_T0_S6_T1_S6_@Base 5.2.0
- (optional=templinst|subst|arch=ia64 sparc)_ZSt17__merge_sort_loopIN5QListI7QStringE8iteratorEPS1_{qptrdiff}EvT_S5_T0_T1_@Base 5.2.0
- (optional=templinst|subst|arch=ia64 sparc)_ZSt17__merge_sort_loopIP7QStringN5QListIS0_E8iteratorE{qptrdiff}EvT_S5_T0_T1_@Base 5.2.0
- (optional=templinst|subst|arch=ia64 sparc)_ZSt17__rotate_adaptiveIN5QListI7QStringE8iteratorEPS1_{qptrdiff}ET_S5_S5_S5_T1_S6_T0_S6_@Base 5.2.0
- (optional=templinst|arch=ia64 sparc)_ZSt19__move_median_firstIN5QListI7QStringE8iteratorEPFbRKS1_S5_EEvT_S8_S8_T0_@Base 5.2.0
- (optional=templinst|arch=ia64 sparc)_ZSt21__inplace_stable_sortIN5QListI7QStringE8iteratorEEvT_S4_@Base 5.2.0
- (optional=templinst|arch=ia64 sparc)_ZSt21__move_merge_adaptiveIP7QStringN5QListIS0_E8iteratorES4_EvT_S5_T0_S6_T1_@Base 5.2.0
- (optional=templinst|arch=ia64 sparc)_ZSt21__unguarded_partitionIN5QListI7QStringE8iteratorES1_PFbRKS1_S5_EET_S8_S8_RKT0_T1_@Base 5.2.0
- (optional=templinst|arch=ia64 sparc)_ZSt22__merge_without_bufferIN5QListI7QStringE8iteratorEiEvT_S4_S4_T0_S5_@Base 5.2.0
- (optional=templinst|subst|arch=ia64 sparc)_ZSt22__stable_sort_adaptiveIN5QListI7QStringE8iteratorEPS1_{qptrdiff}EvT_S5_T0_T1_@Base 5.2.0
- (optional=templinst|arch=ia64 sparc)_ZSt24__merge_sort_with_bufferIN5QListI7QStringE8iteratorEPS1_EvT_S5_T0_@Base 5.2.0
- (optional=templinst|arch=ia64 sparc)_ZSt25__unguarded_linear_insertIN5QListI7QStringE8iteratorEPFbRKS1_S5_EEvT_T0_@Base 5.2.0
- (optional=templinst|arch=ia64 sparc)_ZSt30__move_merge_adaptive_backwardIN5QListI7QStringE8iteratorEPS1_S3_EvT_S5_T0_S6_T1_@Base 5.2.0
- (optional=templinst|arch=ia64 sparc)_ZSt8__rotateIN5QListI7QStringE8iteratorEEvT_S4_S4_St26random_access_iterator_tag@Base 5.2.0
- (optional=templinst|arch=ia64 sparc)_ZSt9make_heapIN5QListI7QStringE8iteratorEPFbRKS1_S5_EEvT_S8_T0_@Base 5.2.0
  _ZTI21QScriptEngineDebugger@Base 5.0.2
  _ZTI25QAbstractItemModelPrivate@Base 5.0.2
  _ZTS21QScriptEngineDebugger@Base 5.0.2
diff --git a/debian/mark_private_symbols.sh b/debian/mark_private_symbols.sh
index 80f329b..9b13f2c 100755
--- a/debian/mark_private_symbols.sh
+++ b/debian/mark_private_symbols.sh
@@ -1,5 +1,6 @@
 #! /bin/sh
 # Copyright (c) 2013 Sune Vuorela <sune@debian.org>
+# Copyright (c) 2014 Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org>
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -20,7 +21,11 @@
 # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-PRIVATE_HEADERS=qtscript5-private-dev/usr/include
+# Usage:
+# Define DEBUG to see which symbols is being processed.
+# Define WRITERESULTS to actually mark the real symbols files.
+
+PRIVATE_HEADERS=debian/qtscript5-private-dev/usr/include
 
 error() {
 	echo $@
@@ -36,7 +41,16 @@ then
 	error "Private headers not found"
 fi
 
-grep -rh class ${PRIVATE_HEADERS} | 
+if [ ! -n "${WRITERESULTS}" ]
+then
+	# Create a backup copy of the original symbols file.
+	for symbols_file in `ls debian/*.symbols`
+	do
+		cp $symbols_file $symbols_file.mps
+	done
+fi
+
+grep -rh class ${PRIVATE_HEADERS} |
 	grep EXPORT | 
 	while read class export classname rest 
 	do
@@ -44,7 +58,20 @@ grep -rh class ${PRIVATE_HEADERS} |
 	done | 
 	while read privateclass 
 	do
-		debug marking ${privateclass} as private
-		sed -i "s/\(.*${privateclass}[^ ]* *[^ ]*\)$/\1 1/" *.symbols 
+		debug Marking ${privateclass} as private
+		if [ -n "${WRITERESULTS}" ]
+		then
+			sed -i "s/\(.*${privateclass}[^ ]* *[^ ]*\)$/\1 1/" debian/*.symbols
+		else
+			sed -i "s/\(.*${privateclass}[^ ]* *[^ ]*\)$/\1 1/" debian/*.symbols.mps
+		fi
 	done 
 
+if [ ! -n "${WRITERESULTS}" ]
+then
+	# Diff the symbols files and output it's differences.
+	for symbols_file in `ls debian/*.symbols`
+	do
+		diff -Nau $symbols_file $symbols_file.mps
+	done
+fi
diff --git a/debian/patches/s390x_jscore.diff b/debian/patches/s390x_jscore.diff
index 4020a3e..9f7999e 100644
--- a/debian/patches/s390x_jscore.diff
+++ b/debian/patches/s390x_jscore.diff
@@ -2,7 +2,7 @@ Description: Add support for s390/s390x architectures
 Author: Dan Horák <dan@danny.cz>
 Origin: vendor (http://trac.webkit.org/changeset?old_path=%2Ftrunk&old=71843+&new_path=%2Ftrunk&new=71844+)
 Forwarded: no
-Last-Update: 2013-12-14
+Last-Update: 2014-05-21
 
 ---
  src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h |   14 +++++++++++++-
@@ -10,7 +10,7 @@ Last-Update: 2013-12-14
 
 --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
 +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
-@@ -189,6 +189,19 @@
+@@ -189,6 +189,18 @@
  #define WTF_CPU_SPARC 1
  #endif
  
@@ -26,16 +26,15 @@ Last-Update: 2013-12-14
 +#define WTF_CPU_BIG_ENDIAN 1
 +#endif
 +
-+
  /* CPU(X86) - i386 / x86 32-bit */
  #if   defined(__i386__) \
      || defined(i386)     \
-@@ -896,7 +909,7 @@
+@@ -911,7 +923,7 @@
  #endif
  
  #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64)
--#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(MIPS64)
-+#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(MIPS64) || CPU(S390X)
+-#if (CPU(X86_64) && !CPU(X32) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(MIPS64) || CPU(AARCH64)
++#if (CPU(X86_64) && !CPU(X32) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(MIPS64) || CPU(AARCH64) || CPU(S390X)
  #define WTF_USE_JSVALUE64 1
  #elif CPU(ARM) || CPU(PPC64)
  #define WTF_USE_JSVALUE32 1
diff --git a/debian/qtscript5-dev.install b/debian/qtscript5-dev.install
index ed58c60..c29e1a2 100644
--- a/debian/qtscript5-dev.install
+++ b/debian/qtscript5-dev.install
@@ -1,43 +1,43 @@
-usr/include/qt5/QtScript/QScriptClass
-usr/include/qt5/QtScript/QScriptClassPropertyIterator
-usr/include/qt5/QtScript/QScriptContext
-usr/include/qt5/QtScript/QScriptContextInfo
-usr/include/qt5/QtScript/QScriptContextInfoList
-usr/include/qt5/QtScript/QScriptEngine
-usr/include/qt5/QtScript/QScriptEngineAgent
-usr/include/qt5/QtScript/QScriptExtensionInterface
-usr/include/qt5/QtScript/QScriptExtensionPlugin
-usr/include/qt5/QtScript/QScriptProgram
-usr/include/qt5/QtScript/QScriptString
-usr/include/qt5/QtScript/QScriptSyntaxCheckResult
-usr/include/qt5/QtScript/QScriptValue
-usr/include/qt5/QtScript/QScriptValueIterator
-usr/include/qt5/QtScript/QScriptValueList
-usr/include/qt5/QtScript/QScriptable
-usr/include/qt5/QtScript/QtScript
-usr/include/qt5/QtScript/QtScriptDepends
-usr/include/qt5/QtScript/QtScriptVersion
-usr/include/qt5/QtScript/qscriptable.h
-usr/include/qt5/QtScript/qscriptclass.h
-usr/include/qt5/QtScript/qscriptclasspropertyiterator.h
-usr/include/qt5/QtScript/qscriptcontext.h
-usr/include/qt5/QtScript/qscriptcontextinfo.h
-usr/include/qt5/QtScript/qscriptengine.h
-usr/include/qt5/QtScript/qscriptengineagent.h
-usr/include/qt5/QtScript/qscriptextensioninterface.h
-usr/include/qt5/QtScript/qscriptextensionplugin.h
-usr/include/qt5/QtScript/qscriptprogram.h
-usr/include/qt5/QtScript/qscriptstring.h
-usr/include/qt5/QtScript/qscriptvalue.h
-usr/include/qt5/QtScript/qscriptvalueiterator.h
-usr/include/qt5/QtScript/qtscriptglobal.h
-usr/include/qt5/QtScript/qtscriptversion.h
-usr/include/qt5/QtScriptTools/QScriptEngineDebugger
-usr/include/qt5/QtScriptTools/QtScriptTools
-usr/include/qt5/QtScriptTools/QtScriptToolsDepends
-usr/include/qt5/QtScriptTools/QtScriptToolsVersion
-usr/include/qt5/QtScriptTools/qscriptenginedebugger.h
-usr/include/qt5/QtScriptTools/qtscripttoolsversion.h
+usr/include/*/qt5/QtScript/QScriptClass
+usr/include/*/qt5/QtScript/QScriptClassPropertyIterator
+usr/include/*/qt5/QtScript/QScriptContext
+usr/include/*/qt5/QtScript/QScriptContextInfo
+usr/include/*/qt5/QtScript/QScriptContextInfoList
+usr/include/*/qt5/QtScript/QScriptEngine
+usr/include/*/qt5/QtScript/QScriptEngineAgent
+usr/include/*/qt5/QtScript/QScriptExtensionInterface
+usr/include/*/qt5/QtScript/QScriptExtensionPlugin
+usr/include/*/qt5/QtScript/QScriptProgram
+usr/include/*/qt5/QtScript/QScriptString
+usr/include/*/qt5/QtScript/QScriptSyntaxCheckResult
+usr/include/*/qt5/QtScript/QScriptValue
+usr/include/*/qt5/QtScript/QScriptValueIterator
+usr/include/*/qt5/QtScript/QScriptValueList
+usr/include/*/qt5/QtScript/QScriptable
+usr/include/*/qt5/QtScript/QtScript
+usr/include/*/qt5/QtScript/QtScriptDepends
+usr/include/*/qt5/QtScript/QtScriptVersion
+usr/include/*/qt5/QtScript/qscriptable.h
+usr/include/*/qt5/QtScript/qscriptclass.h
+usr/include/*/qt5/QtScript/qscriptclasspropertyiterator.h
+usr/include/*/qt5/QtScript/qscriptcontext.h
+usr/include/*/qt5/QtScript/qscriptcontextinfo.h
+usr/include/*/qt5/QtScript/qscriptengine.h
+usr/include/*/qt5/QtScript/qscriptengineagent.h
+usr/include/*/qt5/QtScript/qscriptextensioninterface.h
+usr/include/*/qt5/QtScript/qscriptextensionplugin.h
+usr/include/*/qt5/QtScript/qscriptprogram.h
+usr/include/*/qt5/QtScript/qscriptstring.h
+usr/include/*/qt5/QtScript/qscriptvalue.h
+usr/include/*/qt5/QtScript/qscriptvalueiterator.h
+usr/include/*/qt5/QtScript/qtscriptglobal.h
+usr/include/*/qt5/QtScript/qtscriptversion.h
+usr/include/*/qt5/QtScriptTools/QScriptEngineDebugger
+usr/include/*/qt5/QtScriptTools/QtScriptTools
+usr/include/*/qt5/QtScriptTools/QtScriptToolsDepends
+usr/include/*/qt5/QtScriptTools/QtScriptToolsVersion
+usr/include/*/qt5/QtScriptTools/qscriptenginedebugger.h
+usr/include/*/qt5/QtScriptTools/qtscripttoolsversion.h
 usr/lib/*/cmake/Qt5Script/Qt5ScriptConfig.cmake
 usr/lib/*/cmake/Qt5Script/Qt5ScriptConfigVersion.cmake
 usr/lib/*/cmake/Qt5ScriptTools/Qt5ScriptToolsConfig.cmake
diff --git a/debian/qtscript5-private-dev.install b/debian/qtscript5-private-dev.install
index a69a0a2..f128546 100644
--- a/debian/qtscript5-private-dev.install
+++ b/debian/qtscript5-private-dev.install
@@ -1,110 +1,110 @@
-usr/include/qt5/QtScript/*/QtScript/private/qscriptable_p.h
-usr/include/qt5/QtScript/*/QtScript/private/qscriptactivationobject_p.h
-usr/include/qt5/QtScript/*/QtScript/private/qscriptast_p.h
-usr/include/qt5/QtScript/*/QtScript/private/qscriptastfwd_p.h
-usr/include/qt5/QtScript/*/QtScript/private/qscriptastvisitor_p.h
-usr/include/qt5/QtScript/*/QtScript/private/qscriptclassobject_p.h
-usr/include/qt5/QtScript/*/QtScript/private/qscriptcontext_p.h
-usr/include/qt5/QtScript/*/QtScript/private/qscriptdeclarativeclass_p.h
-usr/include/qt5/QtScript/*/QtScript/private/qscriptdeclarativeobject_p.h
-usr/include/qt5/QtScript/*/QtScript/private/qscriptengine_p.h
-usr/include/qt5/QtScript/*/QtScript/private/qscriptengineagent_p.h
-usr/include/qt5/QtScript/*/QtScript/private/qscriptfunction_p.h
-usr/include/qt5/QtScript/*/QtScript/private/qscriptglobalobject_p.h
-usr/include/qt5/QtScript/*/QtScript/private/qscriptgrammar_p.h
-usr/include/qt5/QtScript/*/QtScript/private/qscriptlexer_p.h
-usr/include/qt5/QtScript/*/QtScript/private/qscriptobject_p.h
-usr/include/qt5/QtScript/*/QtScript/private/qscriptparser_p.h
-usr/include/qt5/QtScript/*/QtScript/private/qscriptprogram_p.h
-usr/include/qt5/QtScript/*/QtScript/private/qscriptqobject_p.h
-usr/include/qt5/QtScript/*/QtScript/private/qscriptstaticscopeobject_p.h
-usr/include/qt5/QtScript/*/QtScript/private/qscriptstring_p.h
-usr/include/qt5/QtScript/*/QtScript/private/qscriptsyntaxchecker_p.h
-usr/include/qt5/QtScript/*/QtScript/private/qscriptvalue_p.h
-usr/include/qt5/QtScript/*/QtScript/private/qscriptvariant_p.h
-usr/include/qt5/QtScriptTools/*/QtScriptTools/private/qscriptbreakpointdata_p.h
-usr/include/qt5/QtScriptTools/*/QtScriptTools/private/qscriptbreakpointsmodel_p.h
-usr/include/qt5/QtScriptTools/*/QtScriptTools/private/qscriptbreakpointswidget_p.h
-usr/include/qt5/QtScriptTools/*/QtScriptTools/private/qscriptbreakpointswidgetinterface_p.h
-usr/include/qt5/QtScriptTools/*/QtScriptTools/private/qscriptbreakpointswidgetinterface_p_p.h
-usr/include/qt5/QtScriptTools/*/QtScriptTools/private/qscriptcompletionproviderinterface_p.h
-usr/include/qt5/QtScriptTools/*/QtScriptTools/private/qscriptcompletiontask_p.h
-usr/include/qt5/QtScriptTools/*/QtScriptTools/private/qscriptcompletiontaskinterface_p.h
-usr/include/qt5/QtScriptTools/*/QtScriptTools/private/qscriptcompletiontaskinterface_p_p.h
-usr/include/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebugger_p.h
-usr/include/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggeragent_p.h
-usr/include/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggeragent_p_p.h
-usr/include/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggerbackend_p.h
-usr/include/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggerbackend_p_p.h
-usr/include/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggercodefinderwidget_p.h
-usr/include/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggercodefinderwidgetinterface_p.h
-usr/include/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggercodefinderwidgetinterface_p_p.h
-usr/include/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggercodeview_p.h
-usr/include/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggercodeviewinterface_p.h
-usr/include/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggercodeviewinterface_p_p.h
-usr/include/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggercodewidget_p.h
-usr/include/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggercodewidgetinterface_p.h
-usr/include/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggercodewidgetinterface_p_p.h
-usr/include/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggercommand_p.h
-usr/include/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggercommandexecutor_p.h
-usr/include/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggercommandschedulerfrontend_p.h
-usr/include/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggercommandschedulerinterface_p.h
-usr/include/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggercommandschedulerjob_p.h
-usr/include/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggercommandschedulerjob_p_p.h
-usr/include/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggerconsole_p.h
-usr/include/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggerconsolecommand_p.h
-usr/include/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggerconsolecommand_p_p.h
-usr/include/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggerconsolecommandgroupdata_p.h
-usr/include/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggerconsolecommandjob_p.h
-usr/include/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggerconsolecommandjob_p_p.h
-usr/include/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggerconsolecommandmanager_p.h
-usr/include/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggerconsoleglobalobject_p.h
-usr/include/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggerconsolehistorianinterface_p.h
-usr/include/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggerconsolewidget_p.h
-usr/include/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggerconsolewidgetinterface_p.h
-usr/include/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggerconsolewidgetinterface_p_p.h
-usr/include/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggerevent_p.h
-usr/include/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggereventhandlerinterface_p.h
-usr/include/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggerfrontend_p.h
-usr/include/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggerfrontend_p_p.h
-usr/include/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggerjob_p.h
-usr/include/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggerjob_p_p.h
-usr/include/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggerjobschedulerinterface_p.h
-usr/include/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggerlocalsmodel_p.h
-usr/include/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggerlocalswidget_p.h
-usr/include/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggerlocalswidgetinterface_p.h
-usr/include/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggerlocalswidgetinterface_p_p.h
-usr/include/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggerobjectsnapshotdelta_p.h
-usr/include/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggerresponse_p.h
-usr/include/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggerresponsehandlerinterface_p.h
-usr/include/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggerscriptedconsolecommand_p.h
-usr/include/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggerscriptsmodel_p.h
-usr/include/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggerscriptswidget_p.h
-usr/include/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggerscriptswidgetinterface_p.h
-usr/include/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggerscriptswidgetinterface_p_p.h
-usr/include/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggerstackmodel_p.h
-usr/include/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggerstackwidget_p.h
-usr/include/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggerstackwidgetinterface_p.h
-usr/include/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggerstackwidgetinterface_p_p.h
-usr/include/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggerstandardwidgetfactory_p.h
-usr/include/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggervalue_p.h
-usr/include/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggervalueproperty_p.h
-usr/include/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggerwidgetfactoryinterface_p.h
-usr/include/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebugoutputwidget_p.h
-usr/include/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebugoutputwidgetinterface_p.h
-usr/include/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebugoutputwidgetinterface_p_p.h
-usr/include/qt5/QtScriptTools/*/QtScriptTools/private/qscriptedit_p.h
-usr/include/qt5/QtScriptTools/*/QtScriptTools/private/qscriptenginedebuggerfrontend_p.h
-usr/include/qt5/QtScriptTools/*/QtScriptTools/private/qscripterrorlogwidget_p.h
-usr/include/qt5/QtScriptTools/*/QtScriptTools/private/qscripterrorlogwidgetinterface_p.h
-usr/include/qt5/QtScriptTools/*/QtScriptTools/private/qscripterrorlogwidgetinterface_p_p.h
-usr/include/qt5/QtScriptTools/*/QtScriptTools/private/qscriptmessagehandlerinterface_p.h
-usr/include/qt5/QtScriptTools/*/QtScriptTools/private/qscriptobjectsnapshot_p.h
-usr/include/qt5/QtScriptTools/*/QtScriptTools/private/qscriptscriptdata_p.h
-usr/include/qt5/QtScriptTools/*/QtScriptTools/private/qscriptstdmessagehandler_p.h
-usr/include/qt5/QtScriptTools/*/QtScriptTools/private/qscriptsyntaxhighlighter_p.h
-usr/include/qt5/QtScriptTools/*/QtScriptTools/private/qscripttooltipproviderinterface_p.h
-usr/include/qt5/QtScriptTools/*/QtScriptTools/private/qscriptvalueproperty_p.h
-usr/include/qt5/QtScriptTools/*/QtScriptTools/private/qscriptxmlparser_p.h
+usr/include/*/qt5/QtScript/*/QtScript/private/qscriptable_p.h
+usr/include/*/qt5/QtScript/*/QtScript/private/qscriptactivationobject_p.h
+usr/include/*/qt5/QtScript/*/QtScript/private/qscriptast_p.h
+usr/include/*/qt5/QtScript/*/QtScript/private/qscriptastfwd_p.h
+usr/include/*/qt5/QtScript/*/QtScript/private/qscriptastvisitor_p.h
+usr/include/*/qt5/QtScript/*/QtScript/private/qscriptclassobject_p.h
+usr/include/*/qt5/QtScript/*/QtScript/private/qscriptcontext_p.h
+usr/include/*/qt5/QtScript/*/QtScript/private/qscriptdeclarativeclass_p.h
+usr/include/*/qt5/QtScript/*/QtScript/private/qscriptdeclarativeobject_p.h
+usr/include/*/qt5/QtScript/*/QtScript/private/qscriptengine_p.h
+usr/include/*/qt5/QtScript/*/QtScript/private/qscriptengineagent_p.h
+usr/include/*/qt5/QtScript/*/QtScript/private/qscriptfunction_p.h
+usr/include/*/qt5/QtScript/*/QtScript/private/qscriptglobalobject_p.h
+usr/include/*/qt5/QtScript/*/QtScript/private/qscriptgrammar_p.h
+usr/include/*/qt5/QtScript/*/QtScript/private/qscriptlexer_p.h
+usr/include/*/qt5/QtScript/*/QtScript/private/qscriptobject_p.h
+usr/include/*/qt5/QtScript/*/QtScript/private/qscriptparser_p.h
+usr/include/*/qt5/QtScript/*/QtScript/private/qscriptprogram_p.h
+usr/include/*/qt5/QtScript/*/QtScript/private/qscriptqobject_p.h
+usr/include/*/qt5/QtScript/*/QtScript/private/qscriptstaticscopeobject_p.h
+usr/include/*/qt5/QtScript/*/QtScript/private/qscriptstring_p.h
+usr/include/*/qt5/QtScript/*/QtScript/private/qscriptsyntaxchecker_p.h
+usr/include/*/qt5/QtScript/*/QtScript/private/qscriptvalue_p.h
+usr/include/*/qt5/QtScript/*/QtScript/private/qscriptvariant_p.h
+usr/include/*/qt5/QtScriptTools/*/QtScriptTools/private/qscriptbreakpointdata_p.h
+usr/include/*/qt5/QtScriptTools/*/QtScriptTools/private/qscriptbreakpointsmodel_p.h
+usr/include/*/qt5/QtScriptTools/*/QtScriptTools/private/qscriptbreakpointswidget_p.h
+usr/include/*/qt5/QtScriptTools/*/QtScriptTools/private/qscriptbreakpointswidgetinterface_p.h
+usr/include/*/qt5/QtScriptTools/*/QtScriptTools/private/qscriptbreakpointswidgetinterface_p_p.h
+usr/include/*/qt5/QtScriptTools/*/QtScriptTools/private/qscriptcompletionproviderinterface_p.h
+usr/include/*/qt5/QtScriptTools/*/QtScriptTools/private/qscriptcompletiontask_p.h
+usr/include/*/qt5/QtScriptTools/*/QtScriptTools/private/qscriptcompletiontaskinterface_p.h
+usr/include/*/qt5/QtScriptTools/*/QtScriptTools/private/qscriptcompletiontaskinterface_p_p.h
+usr/include/*/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebugger_p.h
+usr/include/*/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggeragent_p.h
+usr/include/*/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggeragent_p_p.h
+usr/include/*/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggerbackend_p.h
+usr/include/*/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggerbackend_p_p.h
+usr/include/*/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggercodefinderwidget_p.h
+usr/include/*/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggercodefinderwidgetinterface_p.h
+usr/include/*/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggercodefinderwidgetinterface_p_p.h
+usr/include/*/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggercodeview_p.h
+usr/include/*/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggercodeviewinterface_p.h
+usr/include/*/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggercodeviewinterface_p_p.h
+usr/include/*/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggercodewidget_p.h
+usr/include/*/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggercodewidgetinterface_p.h
+usr/include/*/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggercodewidgetinterface_p_p.h
+usr/include/*/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggercommand_p.h
+usr/include/*/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggercommandexecutor_p.h
+usr/include/*/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggercommandschedulerfrontend_p.h
+usr/include/*/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggercommandschedulerinterface_p.h
+usr/include/*/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggercommandschedulerjob_p.h
+usr/include/*/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggercommandschedulerjob_p_p.h
+usr/include/*/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggerconsole_p.h
+usr/include/*/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggerconsolecommand_p.h
+usr/include/*/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggerconsolecommand_p_p.h
+usr/include/*/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggerconsolecommandgroupdata_p.h
+usr/include/*/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggerconsolecommandjob_p.h
+usr/include/*/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggerconsolecommandjob_p_p.h
+usr/include/*/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggerconsolecommandmanager_p.h
+usr/include/*/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggerconsoleglobalobject_p.h
+usr/include/*/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggerconsolehistorianinterface_p.h
+usr/include/*/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggerconsolewidget_p.h
+usr/include/*/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggerconsolewidgetinterface_p.h
+usr/include/*/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggerconsolewidgetinterface_p_p.h
+usr/include/*/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggerevent_p.h
+usr/include/*/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggereventhandlerinterface_p.h
+usr/include/*/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggerfrontend_p.h
+usr/include/*/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggerfrontend_p_p.h
+usr/include/*/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggerjob_p.h
+usr/include/*/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggerjob_p_p.h
+usr/include/*/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggerjobschedulerinterface_p.h
+usr/include/*/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggerlocalsmodel_p.h
+usr/include/*/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggerlocalswidget_p.h
+usr/include/*/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggerlocalswidgetinterface_p.h
+usr/include/*/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggerlocalswidgetinterface_p_p.h
+usr/include/*/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggerobjectsnapshotdelta_p.h
+usr/include/*/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggerresponse_p.h
+usr/include/*/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggerresponsehandlerinterface_p.h
+usr/include/*/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggerscriptedconsolecommand_p.h
+usr/include/*/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggerscriptsmodel_p.h
+usr/include/*/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggerscriptswidget_p.h
+usr/include/*/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggerscriptswidgetinterface_p.h
+usr/include/*/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggerscriptswidgetinterface_p_p.h
+usr/include/*/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggerstackmodel_p.h
+usr/include/*/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggerstackwidget_p.h
+usr/include/*/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggerstackwidgetinterface_p.h
+usr/include/*/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggerstackwidgetinterface_p_p.h
+usr/include/*/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggerstandardwidgetfactory_p.h
+usr/include/*/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggervalue_p.h
+usr/include/*/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggervalueproperty_p.h
+usr/include/*/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebuggerwidgetfactoryinterface_p.h
+usr/include/*/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebugoutputwidget_p.h
+usr/include/*/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebugoutputwidgetinterface_p.h
+usr/include/*/qt5/QtScriptTools/*/QtScriptTools/private/qscriptdebugoutputwidgetinterface_p_p.h
+usr/include/*/qt5/QtScriptTools/*/QtScriptTools/private/qscriptedit_p.h
+usr/include/*/qt5/QtScriptTools/*/QtScriptTools/private/qscriptenginedebuggerfrontend_p.h
+usr/include/*/qt5/QtScriptTools/*/QtScriptTools/private/qscripterrorlogwidget_p.h
+usr/include/*/qt5/QtScriptTools/*/QtScriptTools/private/qscripterrorlogwidgetinterface_p.h
+usr/include/*/qt5/QtScriptTools/*/QtScriptTools/private/qscripterrorlogwidgetinterface_p_p.h
+usr/include/*/qt5/QtScriptTools/*/QtScriptTools/private/qscriptmessagehandlerinterface_p.h
+usr/include/*/qt5/QtScriptTools/*/QtScriptTools/private/qscriptobjectsnapshot_p.h
+usr/include/*/qt5/QtScriptTools/*/QtScriptTools/private/qscriptscriptdata_p.h
+usr/include/*/qt5/QtScriptTools/*/QtScriptTools/private/qscriptstdmessagehandler_p.h
+usr/include/*/qt5/QtScriptTools/*/QtScriptTools/private/qscriptsyntaxhighlighter_p.h
+usr/include/*/qt5/QtScriptTools/*/QtScriptTools/private/qscripttooltipproviderinterface_p.h
+usr/include/*/qt5/QtScriptTools/*/QtScriptTools/private/qscriptvalueproperty_p.h
+usr/include/*/qt5/QtScriptTools/*/QtScriptTools/private/qscriptxmlparser_p.h
 usr/lib/*/qt5/mkspecs/modules/qt_lib_script_private.pri
 usr/lib/*/qt5/mkspecs/modules/qt_lib_scripttools_private.pri
diff --git a/debian/rules b/debian/rules
index 9df8774..cb0068b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,7 +16,7 @@ override_dh_auto_configure:
 	qmake QT_BUILD_PARTS+=tests
 
 override_dh_auto_build-indep:
-	 dh_auto_build -Smakefile -- docs
+	 dh_auto_build -Smakefile -- html_docs
 
 override_dh_auto_install-arch:
 	dh_auto_install
@@ -25,13 +25,15 @@ override_dh_auto_install-arch:
 	rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.la
 
 override_dh_auto_install-indep:
-	make INSTALL_ROOT=$(CURDIR)/debian/tmp install_docs
+	make INSTALL_ROOT=$(CURDIR)/debian/tmp install_html_docs
 
 override_dh_install:
 	dh_install --fail-missing -X.la
 
-override_dh_builddeb:
-	dh_builddeb -- -Zxz
+override_dh_makeshlibs:
+	dh_makeshlibs
+	# Check for private symbols not marked as such. Be verbose.
+	DEBUG=1 debian/mark_private_symbols.sh
 
 prune-nonfree:
 	rm -rfv tests/benchmarks/script/sunspider/*