From fa64775c1af42c6daadf670bd58800a454afa723 Mon Sep 17 00:00:00 2001 From: Thyagarajan Balakrishnan Date: Thu, 8 Mar 2012 17:28:08 +0200 Subject: [PATCH] Fixes: NB#296154 - reopened - proprietary headers to LGPL RevBy: Marek --- debian/changelog | 3 +- .../applauncherd-token-test.pro | 22 ++++++++------- .../debian/copyright | 28 ++++++++++++++----- 3 files changed, 35 insertions(+), 18 deletions(-) diff --git a/debian/changelog b/debian/changelog index 31df573..be2e25f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,8 @@ -applauncherd (3.0.2) unstable; urgency=low +applauncherd (3.0.2) stable; urgency=low * disabling xsession/crash-reporter-daemon in performance test (probably breaks test at random cases) * Changes: Fixes test test_invoker_signal_forward (extra warnings has appeared in test application) + * Fixes: NB#296154 - reopened - proprietary headers to LGPL -- Marek Ruszczak Thu, 23 Feb 2012 16:13:38 +0200 diff --git a/tests/harmattan/testapps/applauncherd-token-test-1.1/applauncherd-token-test.pro b/tests/harmattan/testapps/applauncherd-token-test-1.1/applauncherd-token-test.pro index b2d6229..b87353a 100644 --- a/tests/harmattan/testapps/applauncherd-token-test-1.1/applauncherd-token-test.pro +++ b/tests/harmattan/testapps/applauncherd-token-test-1.1/applauncherd-token-test.pro @@ -1,17 +1,19 @@ -## This file is part of test package applauncherd-token-test -# +## # Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). # All rights reserved. +# Contact: directui@nokia.com +# +# This file is part of applauncherd +# +# If you have questions regarding the use of this file, please contact +# Nokia at directui@nokia.com. # -# Contact: Marek Ruszczak +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License version 2.1 as published by the Free Software Foundation +# and appearing in the file LICENSE.LGPL included in the packaging +# of this file. # -# This software, including documentation, is protected by copyright -# controlled by Nokia Corporation. All rights are reserved. Copying, -# including reproducing, storing, adapting or translating, any or all -# of this material requires the prior written consent of Nokia -# Corporation. This material also contains confidential information -# which may not be disclosed to others without the prior written -# consent of Nokia. ## QMAKEVERSION = $$[QMAKE_VERSION] diff --git a/tests/harmattan/testapps/applauncherd-token-test-1.1/debian/copyright b/tests/harmattan/testapps/applauncherd-token-test-1.1/debian/copyright index 5aad6fe..f9301c6 100644 --- a/tests/harmattan/testapps/applauncherd-token-test-1.1/debian/copyright +++ b/tests/harmattan/testapps/applauncherd-token-test-1.1/debian/copyright @@ -7,10 +7,24 @@ Copyright: Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. -This software, including documentation, is protected by copyright -controlled by Nokia Corporation. All rights are reserved. Copying, -including reproducing, storing, adapting or translating, any or all -of this material requires the prior written consent of Nokia -Corporation. This material also contains confidential information -which may not be disclosed to others without the prior written -consent of Nokia. +License: + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301 USA + +The Debian packaging is copyright 2011 Nokia Corporation and/or its subsidiary(-ies), and is licensed under the LGPL version 2.1. + +# Please also look if there are files or directories which have a +# different copyright/license attached and list them here.