diff -Nru qtbase-opensource-src-5.2.1+dfsg/debian/changelog qtbase-opensource-src-5.2.1+dfsg/debian/changelog --- qtbase-opensource-src-5.2.1+dfsg/debian/changelog 2014-02-24 16:26:58.000000000 +0000 +++ qtbase-opensource-src-5.2.1+dfsg/debian/changelog 2014-03-30 07:15:07.000000000 +0000 @@ -1,3 +1,19 @@ +qtbase-opensource-src (5.2.1+dfsg-2+rpi1) jessie-staging; urgency=medium + + * Disable neon. + + -- Peter Michael Green Sun, 30 Mar 2014 07:14:43 +0000 + +qtbase-opensource-src (5.2.1+dfsg-3) unstable; urgency=medium + + * Release to unstable. + * Add license to mark_private_symbols.sh and corresponding entry in + debian/copyright. + * Remove linux_no_perf.diff used to disable perf events on Linux/IA64. We no + longer have IA64 around. + + -- Lisandro Damián Nicanor Pérez Meyer Mon, 24 Mar 2014 20:05:31 -0300 + qtbase-opensource-src (5.2.1+dfsg-2) experimental; urgency=medium [ Pino Toscano ] diff -Nru qtbase-opensource-src-5.2.1+dfsg/debian/copyright qtbase-opensource-src-5.2.1+dfsg/debian/copyright --- qtbase-opensource-src-5.2.1+dfsg/debian/copyright 2014-02-24 16:26:33.000000000 +0000 +++ qtbase-opensource-src-5.2.1+dfsg/debian/copyright 2014-03-24 22:58:53.000000000 +0000 @@ -11,6 +11,10 @@ Copyright: 2012 Digia Plc and/or its subsidiary(-ies) License: BSD-3-clause +Files: debian/mark_private_symbols.sh +Copyright: 2013 Sune Vuorela +License: Expat + Files: debian/* Copyright: 2007-2013 Fathi Boudra 2007-2013 Sune Vuorela @@ -939,3 +943,19 @@ . On Debian systems, the complete text of the GFDL-1.3 license can be found in `/usr/share/common-licenses/GFDL-1.3`, + +License: Expat + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + . + The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. diff -Nru qtbase-opensource-src-5.2.1+dfsg/debian/mark_private_symbols.sh qtbase-opensource-src-5.2.1+dfsg/debian/mark_private_symbols.sh --- qtbase-opensource-src-5.2.1+dfsg/debian/mark_private_symbols.sh 2013-07-10 15:55:55.000000000 +0000 +++ qtbase-opensource-src-5.2.1+dfsg/debian/mark_private_symbols.sh 2014-03-24 22:58:53.000000000 +0000 @@ -1,4 +1,24 @@ #! /bin/sh +# Copyright (c) 2013 Sune Vuorela +# +# Permission is hereby granted, free of charge, to any person obtaining +# a copy of this software and associated documentation files (the +# "Software"), to deal in the Software without restriction, including +# without limitation the rights to use, copy, modify, merge, publish, +# distribute, sublicense, and/or sell copies of the Software, and to +# permit persons to whom the Software is furnished to do so, subject to +# the following conditions: +# +# The above copyright notice and this permission notice shall be included +# in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. PRIVATE_HEADERS=qtbase5-private-dev/usr/include diff -Nru qtbase-opensource-src-5.2.1+dfsg/debian/patches/linux_no_perf.diff qtbase-opensource-src-5.2.1+dfsg/debian/patches/linux_no_perf.diff --- qtbase-opensource-src-5.2.1+dfsg/debian/patches/linux_no_perf.diff 2013-08-12 17:41:34.000000000 +0000 +++ qtbase-opensource-src-5.2.1+dfsg/debian/patches/linux_no_perf.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -Author: Pino Toscano -Description: Disable perf events on Linux/ia64. - It seems ia64 does not have perf events compiled, so disable them. -Last-Update: 2013-08-11 -Forwarded: no - ---- a/src/testlib/qbenchmark_p.h -+++ b/src/testlib/qbenchmark_p.h -@@ -63,7 +63,7 @@ - #undef QTESTLIB_USE_VALGRIND - #endif - --#if defined(Q_OS_LINUX) && !defined(QT_LINUXBASE) && !defined(Q_OS_ANDROID) -+#if defined(Q_OS_LINUX) && !defined(QT_LINUXBASE) && !defined(Q_OS_ANDROID) && !defined(Q_PROCESSOR_IA64) - #define QTESTLIB_USE_PERF_EVENTS - #else - #undef QTESTLIB_USE_PERF_EVENTS diff -Nru qtbase-opensource-src-5.2.1+dfsg/debian/patches/series qtbase-opensource-src-5.2.1+dfsg/debian/patches/series --- qtbase-opensource-src-5.2.1+dfsg/debian/patches/series 2014-02-24 15:05:58.000000000 +0000 +++ qtbase-opensource-src-5.2.1+dfsg/debian/patches/series 2014-03-24 22:58:53.000000000 +0000 @@ -1,4 +1,3 @@ -linux_no_perf.diff hurd_opengl_incldir.diff fix_power_atomic_code.patch support_mips_atomic_on_pre-mips32_archs.patch diff -Nru qtbase-opensource-src-5.2.1+dfsg/debian/rules qtbase-opensource-src-5.2.1+dfsg/debian/rules --- qtbase-opensource-src-5.2.1+dfsg/debian/rules 2014-02-24 15:06:11.000000000 +0000 +++ qtbase-opensource-src-5.2.1+dfsg/debian/rules 2014-03-30 07:15:07.000000000 +0000 @@ -127,6 +127,7 @@ -accessibility \ -compile-examples \ -no-directfb \ + -no-neon \ $(extra_configure_opts) override_dh_auto_clean: