rpm/kst
SHA256
1
0
Fork 0
forked from pool/kst
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kst?expand=0&rev=8

Browse Source
This commit is contained in:
OBS User unknown 2008-03-13 18:03:06 +00:00 committed by Git OBS Bridge
parent 805d45526a
commit 3644d8d497
3 changed files with 671 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

601
kst-gplv3-relicense.diff Normal file
View File

@ -0,0 +1,601 @@
Index: src/extensions/js/kjsembed/tools/headers/qcanvas.h
===================================================================
--- src/extensions/js/kjsembed/tools/headers/qcanvas.h (revision 784997)
+++ src/extensions/js/kjsembed/tools/headers/qcanvas.h (revision 785267)
@@ -1,37 +1,40 @@
/**********************************************************************
-**
**
** Definition of QCanvas classes
**
** Created : 991211
**
-** Copyright (C) 1999-2002 Trolltech AS. All rights reserved.
+** Copyright (C) 1999-2008 Trolltech ASA. All rights reserved.
**
** This file is part of the canvas module of the Qt GUI Toolkit.
**
-** This file may be distributed under the terms of the Q Public License
-** as defined by Trolltech AS of Norway and appearing in the file
-** LICENSE.QPL included in the packaging of this file.
-**
-** This file may be distributed and/or modified under the terms of the
-** GNU General Public License version 2 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.
-**
-** Licensees holding valid Qt Enterprise Edition licenses may use this
-** file in accordance with the Qt Commercial License Agreement provided
-** with the Software.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-** information about Qt Commercial License Agreements.
-** See http://www.trolltech.com/qpl/ for QPL licensing information.
-** See http://www.trolltech.com/gpl/ for GPL licensing information.
-**
-** Contact info@trolltech.com if any conditions of this licensing are
-** not clear to you.
+** This file may be used under the terms of the GNU General
+** Public License versions 2.0 or 3.0 as published by the Free
+** Software Foundation and appearing in the files LICENSE.GPL2
+** and LICENSE.GPL3 included in the packaging of this file.
+** Alternatively you may (at your option) use any later version
+** of the GNU General Public License if such license has been
+** publicly approved by Trolltech ASA (or its successors, if any)
+** and the KDE Free Qt Foundation.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/.
+** If you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** This file may be used under the terms of the Q Public License as
+** defined by Trolltech ASA and appearing in the file LICENSE.QPL
+** included in the packaging of this file. Licensees holding valid Qt
+** Commercial licenses may use this file in accordance with the Qt
+** Commercial License Agreement provided with the Software.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted
+** herein.
**
**********************************************************************/
Index: src/extensions/js/kjsembed/tools/headers/qdir.h
===================================================================
--- src/extensions/js/kjsembed/tools/headers/qdir.h (revision 784997)
+++ src/extensions/js/kjsembed/tools/headers/qdir.h (revision 785267)
@@ -1,37 +1,40 @@
/****************************************************************************
-**
**
** Definition of QDir class
**
** Created : 950427
**
-** Copyright (C) 1992-2002 Trolltech AS. All rights reserved.
+** Copyright (C) 1992-2008 Trolltech ASA. All rights reserved.
**
** This file is part of the tools module of the Qt GUI Toolkit.
**
-** This file may be distributed under the terms of the Q Public License
-** as defined by Trolltech AS of Norway and appearing in the file
-** LICENSE.QPL included in the packaging of this file.
-**
-** This file may be distributed and/or modified under the terms of the
-** GNU General Public License version 2 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.
-**
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
-** Agreement provided with the Software.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-** information about Qt Commercial License Agreements.
-** See http://www.trolltech.com/qpl/ for QPL licensing information.
-** See http://www.trolltech.com/gpl/ for GPL licensing information.
-**
-** Contact info@trolltech.com if any conditions of this licensing are
-** not clear to you.
+** This file may be used under the terms of the GNU General
+** Public License versions 2.0 or 3.0 as published by the Free
+** Software Foundation and appearing in the files LICENSE.GPL2
+** and LICENSE.GPL3 included in the packaging of this file.
+** Alternatively you may (at your option) use any later version
+** of the GNU General Public License if such license has been
+** publicly approved by Trolltech ASA (or its successors, if any)
+** and the KDE Free Qt Foundation.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/.
+** If you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** This file may be used under the terms of the Q Public License as
+** defined by Trolltech ASA and appearing in the file LICENSE.QPL
+** included in the packaging of this file. Licensees holding valid Qt
+** Commercial licenses may use this file in accordance with the Qt
+** Commercial License Agreement provided with the Software.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted
+** herein.
**
**********************************************************************/
Index: src/extensions/js/kjsembed/tools/headers/qtimer.h
===================================================================
--- src/extensions/js/kjsembed/tools/headers/qtimer.h (revision 784997)
+++ src/extensions/js/kjsembed/tools/headers/qtimer.h (revision 785267)
@@ -1,37 +1,40 @@
/****************************************************************************
-**
**
** Definition of QTimer class
**
** Created : 931111
**
-** Copyright (C) 1992-2000 Trolltech AS. All rights reserved.
+** Copyright (C) 1992-2008 Trolltech ASA. All rights reserved.
**
** This file is part of the kernel module of the Qt GUI Toolkit.
**
-** This file may be distributed under the terms of the Q Public License
-** as defined by Trolltech AS of Norway and appearing in the file
-** LICENSE.QPL included in the packaging of this file.
-**
-** This file may be distributed and/or modified under the terms of the
-** GNU General Public License version 2 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.
-**
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
-** Agreement provided with the Software.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-** information about Qt Commercial License Agreements.
-** See http://www.trolltech.com/qpl/ for QPL licensing information.
-** See http://www.trolltech.com/gpl/ for GPL licensing information.
-**
-** Contact info@trolltech.com if any conditions of this licensing are
-** not clear to you.
+** This file may be used under the terms of the GNU General
+** Public License versions 2.0 or 3.0 as published by the Free
+** Software Foundation and appearing in the files LICENSE.GPL2
+** and LICENSE.GPL3 included in the packaging of this file.
+** Alternatively you may (at your option) use any later version
+** of the GNU General Public License if such license has been
+** publicly approved by Trolltech ASA (or its successors, if any)
+** and the KDE Free Qt Foundation.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/.
+** If you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** This file may be used under the terms of the Q Public License as
+** defined by Trolltech ASA and appearing in the file LICENSE.QPL
+** included in the packaging of this file. Licensees holding valid Qt
+** Commercial licenses may use this file in accordance with the Qt
+** Commercial License Agreement provided with the Software.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted
+** herein.
**
**********************************************************************/
Index: src/extensions/js/kjsembed/tools/headers/qpen.h
===================================================================
--- src/extensions/js/kjsembed/tools/headers/qpen.h (revision 784997)
+++ src/extensions/js/kjsembed/tools/headers/qpen.h (revision 785267)
@@ -1,37 +1,40 @@
/****************************************************************************
-**
**
** Definition of QPen class
**
** Created : 940112
**
-** Copyright (C) 1992-2000 Trolltech AS. All rights reserved.
+** Copyright (C) 1992-2008 Trolltech ASA. All rights reserved.
**
** This file is part of the kernel module of the Qt GUI Toolkit.
**
-** This file may be distributed under the terms of the Q Public License
-** as defined by Trolltech AS of Norway and appearing in the file
-** LICENSE.QPL included in the packaging of this file.
-**
-** This file may be distributed and/or modified under the terms of the
-** GNU General Public License version 2 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.
-**
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
-** Agreement provided with the Software.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-** information about Qt Commercial License Agreements.
-** See http://www.trolltech.com/qpl/ for QPL licensing information.
-** See http://www.trolltech.com/gpl/ for GPL licensing information.
-**
-** Contact info@trolltech.com if any conditions of this licensing are
-** not clear to you.
+** This file may be used under the terms of the GNU General
+** Public License versions 2.0 or 3.0 as published by the Free
+** Software Foundation and appearing in the files LICENSE.GPL2
+** and LICENSE.GPL3 included in the packaging of this file.
+** Alternatively you may (at your option) use any later version
+** of the GNU General Public License if such license has been
+** publicly approved by Trolltech ASA (or its successors, if any)
+** and the KDE Free Qt Foundation.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/.
+** If you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** This file may be used under the terms of the Q Public License as
+** defined by Trolltech ASA and appearing in the file LICENSE.QPL
+** included in the packaging of this file. Licensees holding valid Qt
+** Commercial licenses may use this file in accordance with the Qt
+** Commercial License Agreement provided with the Software.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted
+** herein.
**
**********************************************************************/
Index: src/extensions/js/kjsembed/tools/headers/qbrush.h
===================================================================
--- src/extensions/js/kjsembed/tools/headers/qbrush.h (revision 784997)
+++ src/extensions/js/kjsembed/tools/headers/qbrush.h (revision 785267)
@@ -1,37 +1,40 @@
/****************************************************************************
-**
**
** Definition of QBrush class
**
** Created : 940112
**
-** Copyright (C) 1992-2000 Trolltech AS. All rights reserved.
+** Copyright (C) 1992-2008 Trolltech ASA. All rights reserved.
**
** This file is part of the kernel module of the Qt GUI Toolkit.
**
-** This file may be distributed under the terms of the Q Public License
-** as defined by Trolltech AS of Norway and appearing in the file
-** LICENSE.QPL included in the packaging of this file.
-**
-** This file may be distributed and/or modified under the terms of the
-** GNU General Public License version 2 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.
-**
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
-** Agreement provided with the Software.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-** information about Qt Commercial License Agreements.
-** See http://www.trolltech.com/qpl/ for QPL licensing information.
-** See http://www.trolltech.com/gpl/ for GPL licensing information.
-**
-** Contact info@trolltech.com if any conditions of this licensing are
-** not clear to you.
+** This file may be used under the terms of the GNU General
+** Public License versions 2.0 or 3.0 as published by the Free
+** Software Foundation and appearing in the files LICENSE.GPL2
+** and LICENSE.GPL3 included in the packaging of this file.
+** Alternatively you may (at your option) use any later version
+** of the GNU General Public License if such license has been
+** publicly approved by Trolltech ASA (or its successors, if any)
+** and the KDE Free Qt Foundation.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/.
+** If you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** This file may be used under the terms of the Q Public License as
+** defined by Trolltech ASA and appearing in the file LICENSE.QPL
+** included in the packaging of this file. Licensees holding valid Qt
+** Commercial licenses may use this file in accordance with the Qt
+** Commercial License Agreement provided with the Software.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted
+** herein.
**
**********************************************************************/
Index: src/libkst/kstwaitcondition_unix.cpp
===================================================================
--- src/libkst/kstwaitcondition_unix.cpp (revision 784997)
+++ src/libkst/kstwaitcondition_unix.cpp (revision 785267)
@@ -5,33 +5,37 @@
**
** Created : 20010725
**
-** Copyright (C) 1992-2002 Trolltech AS. All rights reserved.
+** Copyright (C) 1992-2008 Trolltech ASA. All rights reserved.
**
** This file is part of the tools module of the Qt GUI Toolkit.
**
-** This file may be distributed under the terms of the Q Public License
-** as defined by Trolltech AS of Norway and appearing in the file
-** LICENSE.QPL included in the packaging of this file.
-**
-** This file may be distributed and/or modified under the terms of the
-** GNU General Public License version 2 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.
-**
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses for Unix/X11 or for Qt/Embedded may use this file in accordance
-** with the Qt Commercial License Agreement provided with the Software.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-** information about Qt Commercial License Agreements.
-** See http://www.trolltech.com/qpl/ for QPL licensing information.
-** See http://www.trolltech.com/gpl/ for GPL licensing information.
-**
-** Contact info@trolltech.com if any conditions of this licensing are
-** not clear to you.
+** This file may be used under the terms of the GNU General
+** Public License versions 2.0 or 3.0 as published by the Free
+** Software Foundation and appearing in the files LICENSE.GPL2
+** and LICENSE.GPL3 included in the packaging of this file.
+** Alternatively you may (at your option) use any later version
+** of the GNU General Public License if such license has been
+** publicly approved by Trolltech ASA (or its successors, if any)
+** and the KDE Free Qt Foundation.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/.
+** If you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** This file may be used under the terms of the Q Public License as
+** defined by Trolltech ASA and appearing in the file LICENSE.QPL
+** included in the packaging of this file. Licensees holding valid Qt
+** Commercial licenses may use this file in accordance with the Qt
+** Commercial License Agreement provided with the Software.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted
+** herein.
**
**********************************************************************/
Index: src/libkst/kstwaitcondition.h
===================================================================
--- src/libkst/kstwaitcondition.h (revision 784997)
+++ src/libkst/kstwaitcondition.h (revision 785267)
@@ -5,33 +5,35 @@
**
** Created : 931107
**
-** Copyright (C) 1992-2002 Trolltech AS. All rights reserved.
-**
** This file is part of the tools module of the Qt GUI Toolkit.
**
-** This file may be distributed under the terms of the Q Public License
-** as defined by Trolltech AS of Norway and appearing in the file
-** LICENSE.QPL included in the packaging of this file.
-**
-** This file may be distributed and/or modified under the terms of the
-** GNU General Public License version 2 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.
-**
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
-** Agreement provided with the Software.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-** information about Qt Commercial License Agreements.
-** See http://www.trolltech.com/qpl/ for QPL licensing information.
-** See http://www.trolltech.com/gpl/ for GPL licensing information.
-**
-** Contact info@trolltech.com if any conditions of this licensing are
-** not clear to you.
+** This file may be used under the terms of the GNU General
+** Public License versions 2.0 or 3.0 as published by the Free
+** Software Foundation and appearing in the files LICENSE.GPL2
+** and LICENSE.GPL3 included in the packaging of this file.
+** Alternatively you may (at your option) use any later version
+** of the GNU General Public License if such license has been
+** publicly approved by Trolltech ASA (or its successors, if any)
+** and the KDE Free Qt Foundation.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/.
+** If you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** This file may be used under the terms of the Q Public License as
+** defined by Trolltech ASA and appearing in the file LICENSE.QPL
+** included in the packaging of this file. Licensees holding valid Qt
+** Commercial licenses may use this file in accordance with the Qt
+** Commercial License Agreement provided with the Software.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted
+** herein.
**
**********************************************************************/
Index: src/extdate/kstextdatetime.cpp
===================================================================
--- src/extdate/kstextdatetime.cpp (revision 784997)
+++ src/extdate/kstextdatetime.cpp (revision 785267)
@@ -6,7 +6,7 @@
** This file may be distributed and/or modified under the terms of the
** GNU General Public License version 2 as published by the Free Software
** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.
+** packaging of this file, or (at your option) any later version.
**
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
Index: src/extdate/kstextdatetime.h
===================================================================
--- src/extdate/kstextdatetime.h (revision 784997)
+++ src/extdate/kstextdatetime.h (revision 785267)
@@ -6,7 +6,7 @@
** This file may be distributed and/or modified under the terms of the
** GNU General Public License version 2 as published by the Free Software
** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.
+** packaging of this file, or (at your option) any later version.
**
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
Index: src/extdate/kstextdatetimeedit.cpp
===================================================================
--- src/extdate/kstextdatetimeedit.cpp (revision 784997)
+++ src/extdate/kstextdatetimeedit.cpp (revision 785267)
@@ -8,15 +8,35 @@
** Original qatetimeedit.cpp Copyright (C) 2000-2002 Trolltech AS. All rights reserved.
**>> ExtDate modifications (C) 2004 Jason Harris <jharris@30doradus.org>
**
-** This file may be distributed and/or modified under the terms of the
-** GNU General Public License version 2 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.
+** This file is part of the tools module of the Qt GUI Toolkit.
**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+** This file may be used under the terms of the GNU General
+** Public License versions 2.0 or 3.0 as published by the Free
+** Software Foundation and appearing in the files LICENSE.GPL2
+** and LICENSE.GPL3 included in the packaging of this file.
+** Alternatively you may (at your option) use any later version
+** of the GNU General Public License if such license has been
+** publicly approved by Trolltech ASA (or its successors, if any)
+** and the KDE Free Qt Foundation.
**
-** See http://www.trolltech.com/gpl/ for GPL licensing information.
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/.
+** If you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** This file may be used under the terms of the Q Public License as
+** defined by Trolltech ASA and appearing in the file LICENSE.QPL
+** included in the packaging of this file. Licensees holding valid Qt
+** Commercial licenses may use this file in accordance with the Qt
+** Commercial License Agreement provided with the Software.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted
+** herein.
**
**********************************************************************/
Index: src/extdate/kstextdatetimeedit.h
===================================================================
--- src/extdate/kstextdatetimeedit.h (revision 784997)
+++ src/extdate/kstextdatetimeedit.h (revision 785267)
@@ -10,15 +10,35 @@
** >> modifications to introduce ExtDate (C) 2004 Jason Harris <jharris@30doradus.org>
** >> ExtDate modifications are licensed under the GPL: http://www.gnu.org/licenses/gpl.html
**
-** This file may be distributed and/or modified under the terms of the
-** GNU General Public License version 2 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.
+** This file is part of the tools module of the Qt GUI Toolkit.
**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+** This file may be used under the terms of the GNU General
+** Public License versions 2.0 or 3.0 as published by the Free
+** Software Foundation and appearing in the files LICENSE.GPL2
+** and LICENSE.GPL3 included in the packaging of this file.
+** Alternatively you may (at your option) use any later version
+** of the GNU General Public License if such license has been
+** publicly approved by Trolltech ASA (or its successors, if any)
+** and the KDE Free Qt Foundation.
**
-** See http://www.trolltech.com/gpl/ for GPL licensing information.
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/.
+** If you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** This file may be used under the terms of the Q Public License as
+** defined by Trolltech ASA and appearing in the file LICENSE.QPL
+** included in the packaging of this file. Licensees holding valid Qt
+** Commercial licenses may use this file in accordance with the Qt
+** Commercial License Agreement provided with the Software.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted
+** herein.
**
**********************************************************************/

24
kst.changes
View File

@ -1,3 +1,27 @@
-------------------------------------------------------------------
Thu Mar 13 17:59:53 CET 2008 - dmueller@suse.de
- update to 1.5.0:
* Fast real-time display and manipulation of streaming data
* Quick zooming and scrolling via mouse and keyboard
* Extensible via plugins
* Built-in high-speed equation interpreter
* Multiple tabs or windows
* Graphical plot layout manager
* Javascript scripting
* Drag and drop
* Cut and paste
* Native power spectrum algorithm and histograms
* Image and matrix support, including waterfall plots
* Support for the most popular data formats including:
o ASCII, dirfile, CDF, netCDF, piolib, FITS, HEALPix, qimage
o Plugin design allows additional formats
* Time input
* Built-in ELOG functionality
* Command-line and RPC control mechanisms
* Printing, including to images, postscript, and PDF
- licensing fixes (bnc#369453)
-------------------------------------------------------------------
Wed Nov 28 14:44:48 CET 2007 - dmueller@suse.de

72
kst.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package kst (Version 1.4.0)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@ -10,11 +10,10 @@
# norootforbuild
Name: kst
BuildRequires: gsl-devel kdelibs3-devel readline-devel
%if %suse_version > 1000
BuildRequires: netcdf
%endif
%if %suse_version > 1020
BuildRequires: fdupes
%endif
@ -22,12 +21,13 @@ License: GPL v2 or later
Group: Productivity/Graphics/Visualization/Graph
Summary: Real-Time Data Viewing and Plotting Tool with Basic Data Analysis Functionality
Version: 1.4.0
Release: 52
Release: 87
Url: http://extragear.kde.org/apps/kst/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %name-%version.tar.bz2
Patch: FIXME.diff
Patch1: r703517.diff
Patch2: kst-gplv3-relicense.diff
Requires: %{name}-lang = %{version}
%description
@ -105,6 +105,7 @@ Authors:
%setup -q
%patch
%patch1
%patch2
. /etc/opt/kde3/common_options
update_admin --no-unsermake
@ -123,11 +124,9 @@ make DESTDIR=${RPM_BUILD_ROOT} install
%find_lang %name
kde_post_install
%post
%run_ldconfig
%post -p /sbin/ldconfig
%postun
%run_ldconfig
%postun -p /sbin/ldconfig
%clean
rm -rf ${RPM_BUILD_ROOT}
@ -163,41 +162,62 @@ rm -rf ${RPM_BUILD_ROOT}
/opt/kde3/share/config/colors
%changelog
* Wed Nov 28 2007 - dmueller@suse.de
* Thu Mar 13 2008 dmueller@suse.de
- update to 1.5.0:
* Fast real-time display and manipulation of streaming data
* Quick zooming and scrolling via mouse and keyboard
* Extensible via plugins
* Built-in high-speed equation interpreter
* Multiple tabs or windows
* Graphical plot layout manager
* Javascript scripting
* Drag and drop
* Cut and paste
* Native power spectrum algorithm and histograms
* Image and matrix support, including waterfall plots
* Support for the most popular data formats including:
o ASCII, dirfile, CDF, netCDF, piolib, FITS, HEALPix, qimage
o Plugin design allows additional formats
* Time input
* Built-in ELOG functionality
* Command-line and RPC control mechanisms
* Printing, including to images, postscript, and PDF
- licensing fixes (bnc#369453)
* Wed Nov 28 2007 dmueller@suse.de
- fix build against glibc 2.7
* Sat Aug 04 2007 - stbinner@suse.de
* Sat Aug 04 2007 stbinner@suse.de
- update to version 1.4: numerous bugfixes, see ChangeLog
* Thu Jun 21 2007 - stbinner@suse.de
* Thu Jun 21 2007 stbinner@suse.de
- fix invalid .desktop file
* Fri Jun 01 2007 - coolo@suse.de
* Fri Jun 01 2007 coolo@suse.de
- move kde_post_install
* Tue May 29 2007 - coolo@suse.de
* Tue May 29 2007 coolo@suse.de
- fix translations handling
* Wed May 23 2007 - stbinner@suse.de
* Wed May 23 2007 stbinner@suse.de
- use %%fupes
- add missing ldconfig run calls
* Fri Oct 20 2006 - stbinner@suse.de
* Fri Oct 20 2006 stbinner@suse.de
- update to version 1.3:1: numerous deadlock and crash fixes
* Wed Sep 20 2006 - stbinner@suse.de
* Wed Sep 20 2006 stbinner@suse.de
- update to version 1.3.0: no change log digest provided
* Wed Apr 19 2006 - stbinner@suse.de
* Wed Apr 19 2006 stbinner@suse.de
- don't use broken netcdf on distributions before 10.1
* Tue Mar 28 2006 - stbinner@suse.de
* Tue Mar 28 2006 stbinner@suse.de
- update to version 1.2.1
* countless bugfixes
* Mon Feb 20 2006 - stbinner@suse.de
* Mon Feb 20 2006 stbinner@suse.de
- cleanup BuildRequires: after gsl-devel dependency fix
* Wed Feb 15 2006 - stbinner@suse.de
* Wed Feb 15 2006 stbinner@suse.de
- update to version 1.2
* Wed Jan 25 2006 - mls@suse.de
* Wed Jan 25 2006 mls@suse.de
- converted neededforbuild to BuildRequires
* Sat Nov 12 2005 - dmueller@suse.de
* Sat Nov 12 2005 dmueller@suse.de
- fix build
* Thu Oct 27 2005 - stbinner@suse.de
* Thu Oct 27 2005 stbinner@suse.de
- update to version 1.1.1
* Mon Oct 10 2005 - stbinner@suse.de
* Mon Oct 10 2005 stbinner@suse.de
- fix include hints for Qt 3.3.5
* Wed Oct 05 2005 - stbinner@suse.de
* Wed Oct 05 2005 stbinner@suse.de
- fix some %%files entries for 64 bit
* Tue Oct 04 2005 - stbinner@suse.de
* Tue Oct 04 2005 stbinner@suse.de
- initial package (version 1.1.0)