[neon/qt6/qt6-scxml/Neon/release] debian: Update d/copyright.

Patrick Franz null at kde.org
Thu Dec 16 14:05:16 GMT 2021


Git commit 4ee8a897086d93b99b2d5bc0c7ee4b3e31dab11d by Patrick Franz.
Committed on 07/12/2021 at 10:14.
Pushed by jriddell into branch 'Neon/release'.

Update d/copyright.

M  +31   -8    debian/copyright
A  +31   -0    debian/source/lintian-overrides

https://invent.kde.org/neon/qt6/qt6-scxml/commit/4ee8a897086d93b99b2d5bc0c7ee4b3e31dab11d

diff --git a/debian/copyright b/debian/copyright
index 9d8019c..3bd0f4f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -30,13 +30,8 @@ Copyright: 2016-2021 The Qt Company Ltd.
            2018 Intel Corporation.
 License: GPL-3 with Qt-1.0 exception
 
-Files: src/scxml/doc/qtscxml-module-use.qdocinc
-       src/statemachine/doc/qtstatemachine-module-use.qdocinc
-       *.qdoc
-Copyright: 2016-2021 The Qt Company Ltd.
-License: GFDL-NIV-1.3
-
-Files: src/statemachine/doc/snippets/qml/statemachine/Button.qml
+Files: src/statemachine/doc/snippets/code/src_corelib_statemachine_qstatemachine.cpp
+       src/statemachine/doc/snippets/qml/statemachine/Button.qml
        src/statemachine/doc/snippets/statemachine/eventtest.cpp
        src/statemachine/doc/snippets/statemachine/main.cpp
        src/statemachine/doc/snippets/statemachine/main2.cpp
@@ -51,6 +46,12 @@ Files: src/statemachine/doc/snippets/qml/statemachine/Button.qml
 Copyright: 2016-2017 The Qt Company Ltd.
 License: BSD-3-clause
 
+Files: src/scxml/doc/qtscxml-module-use.qdocinc
+       src/statemachine/doc/qtstatemachine-module-use.qdocinc
+       *.qdoc
+Copyright: 2016-2021 The Qt Company Ltd.
+License: GFDL-NIV-1.3
+
 Files: src/statemachine/doc/snippets/qml/statemachine/basicstate.qml
        src/statemachine/doc/snippets/qml/statemachine/finalstate.qml
        src/statemachine/doc/snippets/qml/statemachine/guardcondition.qml
@@ -66,9 +67,16 @@ Files: src/statemachine/doc/snippets/qml/statemachine/basicstate.qml
 Copyright: 2014 Ford Motor Company
 License: BSD-3-clause
 
+Files: src/plugins/ecmascriptdatamodel/qscxmlecmascriptdatamodelplugin_p.h
+       src/plugins/ecmascriptdatamodel/qscxmlecmascriptdatamodelplugin.cpp
+       src/scxml/qscxmldatamodelplugin.cpp
+       src/scxml/qscxmldatamodelplugin_p.h
+Copyright: 2021 The Qt Company Ltd.
+License: LGPL-3 or GPL-2+
+
 Files: src/scxml/Qt5ScxmlConfigExtras.cmake.in
        src/scxml/Qt6ScxmlMacros.cmake
-Copyright: 2016 Klarälvdalens Datakonsult AB (KDAB)  delet
+Copyright: 2016 Klarälvdalens Datakonsult AB (KDAB)
 License: LGPL-3 or GPL-2
 
 Files: tests/3rdparty/scion-tests/*
@@ -88,6 +96,21 @@ License: GPL-2
  On Debian systems, the complete text of the GNU General Public
  License version 2 can be found in /usr/share/common-licenses/GPL-2.
 
+License: GPL-2+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This program 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 General Public License for more details.
+ .
+ On Debian GNU/Linux systems, the complete text of the GNU General
+ Public License version 2 can be found in
+ `/usr/share/common-licenses/GPL-2'.
+
 License: GPL-3 with Qt-1.0 exception
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License version 3 as
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
new file mode 100644
index 0000000..595a462
--- /dev/null
+++ b/debian/source/lintian-overrides
@@ -0,0 +1,31 @@
+# Lintian gives a false positive for the globbing order.
+# See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=970274
+qt6-scxml source: globbing-patterns-out-of-order examples/* *.qdoc examples/scxml/calculator-qml/doc/src/calculator-qml.qdoc
+qt6-scxml source: globbing-patterns-out-of-order examples/* *.qdoc examples/scxml/calculator-widgets/doc/src/calculator.qdoc
+qt6-scxml source: globbing-patterns-out-of-order examples/* *.qdoc examples/scxml/ftpclient/doc/src/ftpclient.qdoc
+qt6-scxml source: globbing-patterns-out-of-order examples/* *.qdoc examples/scxml/invoke-dynamic/doc/src/invoke-dynamic.qdoc
+qt6-scxml source: globbing-patterns-out-of-order examples/* *.qdoc examples/scxml/invoke-static/doc/src/invoke-static.qdoc
+qt6-scxml source: globbing-patterns-out-of-order examples/* *.qdoc examples/scxml/mediaplayer-qml-cppdatamodel/doc/src/mediaplayer-qml-cppdatamodel.qdoc
+qt6-scxml source: globbing-patterns-out-of-order examples/* *.qdoc examples/scxml/mediaplayer-qml-dynamic/doc/src/mediaplayer-qml-dynamic.qdoc
+qt6-scxml source: globbing-patterns-out-of-order examples/* *.qdoc examples/scxml/mediaplayer-qml-static/doc/src/mediaplayer-qml-static.qdoc
+qt6-scxml source: globbing-patterns-out-of-order examples/* *.qdoc examples/scxml/mediaplayer-widgets-dynamic/doc/src/mediaplayer-widgets-dynamic.qdoc
+qt6-scxml source: globbing-patterns-out-of-order examples/* *.qdoc examples/scxml/mediaplayer-widgets-static/doc/src/mediaplayer-widgets-static.qdoc
+qt6-scxml source: globbing-patterns-out-of-order examples/* *.qdoc examples/scxml/pinball/doc/src/pinball.qdoc
+qt6-scxml source: globbing-patterns-out-of-order examples/* *.qdoc examples/scxml/sudoku/doc/src/sudoku.qdoc
+qt6-scxml source: globbing-patterns-out-of-order examples/* *.qdoc examples/scxml/trafficlight-qml-dynamic/doc/src/trafficlight-qml-dynamic.qdoc
+qt6-scxml source: globbing-patterns-out-of-order examples/* *.qdoc examples/scxml/trafficlight-qml-simple/doc/src/trafficlight-qml-simple.qdoc
+qt6-scxml source: globbing-patterns-out-of-order examples/* *.qdoc examples/scxml/trafficlight-qml-static/doc/src/trafficlight-qml-static.qdoc
+qt6-scxml source: globbing-patterns-out-of-order examples/* *.qdoc examples/scxml/trafficlight-widgets-dynamic/doc/src/trafficlight-widgets-dynamic.qdoc
+qt6-scxml source: globbing-patterns-out-of-order examples/* *.qdoc examples/scxml/trafficlight-widgets-static/doc/src/trafficlight-widgets-static.qdoc
+qt6-scxml source: globbing-patterns-out-of-order examples/* *.qdoc examples/statemachine/doc/src/animatedtiles.qdoc
+qt6-scxml source: globbing-patterns-out-of-order examples/* *.qdoc examples/statemachine/doc/src/eventtransitions.qdoc
+qt6-scxml source: globbing-patterns-out-of-order examples/* *.qdoc examples/statemachine/doc/src/factorial.qdoc
+qt6-scxml source: globbing-patterns-out-of-order examples/* *.qdoc examples/statemachine/doc/src/moveblocks.qdoc
+qt6-scxml source: globbing-patterns-out-of-order examples/* *.qdoc examples/statemachine/doc/src/padnavigator.qdoc
+qt6-scxml source: globbing-patterns-out-of-order examples/* *.qdoc examples/statemachine/doc/src/pingpong.qdoc
+qt6-scxml source: globbing-patterns-out-of-order examples/* *.qdoc examples/statemachine/doc/src/rogue.qdoc
+qt6-scxml source: globbing-patterns-out-of-order examples/* *.qdoc examples/statemachine/doc/src/states.qdoc
+qt6-scxml source: globbing-patterns-out-of-order examples/* *.qdoc examples/statemachine/doc/src/stickman.qdoc
+qt6-scxml source: globbing-patterns-out-of-order examples/* *.qdoc examples/statemachine/doc/src/sub-attaq.qdoc
+qt6-scxml source: globbing-patterns-out-of-order examples/* *.qdoc examples/statemachine/doc/src/trafficlight.qdoc
+qt6-scxml source: globbing-patterns-out-of-order examples/* *.qdoc examples/statemachine/doc/src/twowaybutton.qdoc



More information about the Neon-commits mailing list