Fixed License following Issue #11

PierreRaybaut · PierreRaybaut · commit 972ba9de9bce · 2015-08-28T08:31:02.000+02:00
diff --git a/LICENSE b/LICENSE
@@ -6,6 +6,7 @@ python-qwt License Agreement
 The essential part of the code was translated directly to Python from Qwt C++ 
 library and is thus licensed under the terms of the Qwt License 1.0 which is 
 derived from LGPL (see included 'QwtLicense' file for more details).
+Copyright (C) 2002 Uwe Rathmann
 
 [2] Software licensed under the terms of the MIT license
 
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -4,4 +4,5 @@ recursive-include doc *.py *.rst *.png *.ico
 include MANIFEST.in
 include LICENSE
 include README
-include CHANGELOG
+include CHANGELOG
+include QwtLicense 
diff --git a/README b/README
@@ -14,8 +14,9 @@ python-qwt
 
       The `qwt` Python package was partly (95%) translated from Qwt C++ library: 
       the associated code is licensed under the terms of the Qwt license 1.0 
-      (see qwt/QwtLicense). The rest of the code was wrote from scratch and is 
-      licensed under the terms of the MIT License (see qwt/LICENSE).
+      (see qwt/QwtLicense, Copyright (C) 2002 Uwe Rathmann). The rest of the 
+      code was wrote from scratch and is licensed under the terms of the MIT 
+      License (see qwt/LICENSE).
 
     Overview
 
diff --git a/qwt/__init__.py b/qwt/__init__.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 #
-# Licensed under the terms of the Qwt License
+# Licensed under the terms of the Qwt License, Copyright (C) 2002 Uwe Rathmann
 # (see qwt/LICENSE for details)
 
-__version__ = QWT_VERSION_STR = '6.1.2a4'
+__version__ = QWT_VERSION_STR = '6.1.2a5'
 
 import warnings
 
diff --git a/qwt/clipper.py b/qwt/clipper.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Licensed under the terms of the Qwt License
+# Licensed under the terms of the Qwt License, Copyright (C) 2002 Uwe Rathmann
 # (see qwt/LICENSE for details)
 
 from qwt.qt.QtGui import QPolygon, QPolygonF
diff --git a/qwt/color_map.py b/qwt/color_map.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Licensed under the terms of the Qwt License
+# Licensed under the terms of the Qwt License, Copyright (C) 2002 Uwe Rathmann
 # (see qwt/LICENSE for details)
 
 from qwt.qt.QtGui import QColor, qRed, qGreen, qBlue, qRgb, qRgba, qAlpha
diff --git a/qwt/column_symbol.py b/qwt/column_symbol.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Licensed under the terms of the Qwt License
+# Licensed under the terms of the Qwt License, Copyright (C) 2002 Uwe Rathmann
 # (see qwt/LICENSE for details)
 
 from qwt.interval import QwtInterval
diff --git a/qwt/curve_fitter.py b/qwt/curve_fitter.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Licensed under the terms of the Qwt License
+# Licensed under the terms of the Qwt License, Copyright (C) 2002 Uwe Rathmann
 # (see qwt/LICENSE for details)
 
 from qwt.spline import QwtSpline
diff --git a/qwt/dyngrid_layout.py b/qwt/dyngrid_layout.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Licensed under the terms of the Qwt License
+# Licensed under the terms of the Qwt License, Copyright (C) 2002 Uwe Rathmann
 # (see qwt/LICENSE for details)
 
 from qwt.qt.QtGui import QLayout
diff --git a/qwt/graphic.py b/qwt/graphic.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Licensed under the terms of the Qwt License
+# Licensed under the terms of the Qwt License, Copyright (C) 2002 Uwe Rathmann
 # (see qwt/LICENSE for details)
 
 from qwt.null_paintdevice import QwtNullPaintDevice
diff --git a/qwt/interval.py b/qwt/interval.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Licensed under the terms of the Qwt License
+# Licensed under the terms of the Qwt License, Copyright (C) 2002 Uwe Rathmann
 # (see qwt/LICENSE for details)
 
 
diff --git a/qwt/legend.py b/qwt/legend.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Licensed under the terms of the Qwt License
+# Licensed under the terms of the Qwt License, Copyright (C) 2002 Uwe Rathmann
 # (see qwt/LICENSE for details)
 
 from qwt.legend_data import QwtLegendData
diff --git a/qwt/legend_data.py b/qwt/legend_data.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Licensed under the terms of the Qwt License
+# Licensed under the terms of the Qwt License, Copyright (C) 2002 Uwe Rathmann
 # (see qwt/LICENSE for details)
 
 from qwt.text import QwtText
diff --git a/qwt/legend_label.py b/qwt/legend_label.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Licensed under the terms of the Qwt License
+# Licensed under the terms of the Qwt License, Copyright (C) 2002 Uwe Rathmann
 # (see qwt/LICENSE for details)
 
 from qwt.text import QwtTextLabel
diff --git a/qwt/math.py b/qwt/math.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Licensed under the terms of the Qwt License
+# Licensed under the terms of the Qwt License, Copyright (C) 2002 Uwe Rathmann
 # (see qwt/LICENSE for details)
 
 from qwt.qt.QtCore import qFuzzyCompare
diff --git a/qwt/null_paintdevice.py b/qwt/null_paintdevice.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Licensed under the terms of the Qwt License
+# Licensed under the terms of the Qwt License, Copyright (C) 2002 Uwe Rathmann
 # (see qwt/LICENSE for details)
 
 from qwt.qt.QtGui import QPaintEngine, QPainterPath, QPaintDevice
diff --git a/qwt/painter.py b/qwt/painter.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Licensed under the terms of the Qwt License
+# Licensed under the terms of the Qwt License, Copyright (C) 2002 Uwe Rathmann
 # (see qwt/LICENSE for details)
 
 from qwt.clipper import QwtClipper
diff --git a/qwt/painter_command.py b/qwt/painter_command.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Licensed under the terms of the Qwt License
+# Licensed under the terms of the Qwt License, Copyright (C) 2002 Uwe Rathmann
 # (see qwt/LICENSE for details)
 
 from qwt.qt.QtGui import QPainterPath, QPaintEngine
diff --git a/qwt/pixel_matrix.py b/qwt/pixel_matrix.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Licensed under the terms of the Qwt License
+# Licensed under the terms of the Qwt License, Copyright (C) 2002 Uwe Rathmann
 # (see qwt/LICENSE for details)
 
 from qwt.qt.QtCore import QBitArray
diff --git a/qwt/plot.py b/qwt/plot.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Licensed under the terms of the Qwt License
+# Licensed under the terms of the Qwt License, Copyright (C) 2002 Uwe Rathmann
 # (see qwt/LICENSE for details)
 
 from qwt.qt.QtGui import (QWidget, QFont, QSizePolicy, QFrame, QApplication,
diff --git a/qwt/plot_canvas.py b/qwt/plot_canvas.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Licensed under the terms of the Qwt License
+# Licensed under the terms of the Qwt License, Copyright (C) 2002 Uwe Rathmann
 # (see qwt/LICENSE for details)
 
 from qwt.null_paintdevice import QwtNullPaintDevice
diff --git a/qwt/plot_curve.py b/qwt/plot_curve.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Licensed under the terms of the Qwt License
+# Licensed under the terms of the Qwt License, Copyright (C) 2002 Uwe Rathmann
 # (see qwt/LICENSE for details)
 
 from qwt.curve_fitter import QwtSplineCurveFitter
diff --git a/qwt/plot_directpainter.py b/qwt/plot_directpainter.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Licensed under the terms of the Qwt License
+# Licensed under the terms of the Qwt License, Copyright (C) 2002 Uwe Rathmann
 # (see qwt/LICENSE for details)
 
 from qwt.qt.QtGui import QPainter, QRegion
diff --git a/qwt/plot_grid.py b/qwt/plot_grid.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Licensed under the terms of the Qwt License
+# Licensed under the terms of the Qwt License, Copyright (C) 2002 Uwe Rathmann
 # (see qwt/LICENSE for details)
 
 from qwt.scale_div import QwtScaleDiv
diff --git a/qwt/plot_histogram.py b/qwt/plot_histogram.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Licensed under the terms of the Qwt License
+# Licensed under the terms of the Qwt License, Copyright (C) 2002 Uwe Rathmann
 # (see qwt/LICENSE for details)
 
 from qwt.plot_seriesitem import QwtPlotSeriesItem
diff --git a/qwt/plot_layout.py b/qwt/plot_layout.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Licensed under the terms of the Qwt License
+# Licensed under the terms of the Qwt License, Copyright (C) 2002 Uwe Rathmann
 # (see qwt/LICENSE for details)
 
 from qwt.text import QwtText
diff --git a/qwt/plot_marker.py b/qwt/plot_marker.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Licensed under the terms of the Qwt License
+# Licensed under the terms of the Qwt License, Copyright (C) 2002 Uwe Rathmann
 # (see qwt/LICENSE for details)
 
 from qwt.plot import QwtPlotItem
diff --git a/qwt/plot_renderer.py b/qwt/plot_renderer.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Licensed under the terms of the Qwt License
+# Licensed under the terms of the Qwt License, Copyright (C) 2002 Uwe Rathmann
 # (see qwt/LICENSE for details)
 
 from __future__ import division
diff --git a/qwt/plot_seriesitem.py b/qwt/plot_seriesitem.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Licensed under the terms of the Qwt License
+# Licensed under the terms of the Qwt License, Copyright (C) 2002 Uwe Rathmann
 # (see qwt/LICENSE for details)
 
 from qwt.plot import QwtPlotItem, QwtPlotItem_PrivateData
diff --git a/qwt/point_data.py b/qwt/point_data.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Licensed under the terms of the Qwt License
+# Licensed under the terms of the Qwt License, Copyright (C) 2002 Uwe Rathmann
 # (see qwt/LICENSE for details)
 
 from qwt.series_data import QwtSeriesData, qwtBoundingRect
diff --git a/qwt/point_mapper.py b/qwt/point_mapper.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Licensed under the terms of the Qwt License
+# Licensed under the terms of the Qwt License, Copyright (C) 2002 Uwe Rathmann
 # (see qwt/LICENSE for details)
 
 USE_THREADS = False  # QtConcurrent is not supported by PyQt
diff --git a/qwt/sample.py b/qwt/sample.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Licensed under the terms of the Qwt License
+# Licensed under the terms of the Qwt License, Copyright (C) 2002 Uwe Rathmann
 # (see qwt/LICENSE for details)
 
 from qwt.interval import QwtInterval
diff --git a/qwt/scale_div.py b/qwt/scale_div.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Licensed under the terms of the Qwt License
+# Licensed under the terms of the Qwt License, Copyright (C) 2002 Uwe Rathmann
 # (see qwt/LICENSE for details)
 
 from qwt.interval import QwtInterval
diff --git a/qwt/scale_draw.py b/qwt/scale_draw.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Licensed under the terms of the Qwt License
+# Licensed under the terms of the Qwt License, Copyright (C) 2002 Uwe Rathmann
 # (see qwt/LICENSE for details)
 
 from qwt.scale_div import QwtScaleDiv
diff --git a/qwt/scale_engine.py b/qwt/scale_engine.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Licensed under the terms of the Qwt License
+# Licensed under the terms of the Qwt License, Copyright (C) 2002 Uwe Rathmann
 # (see qwt/LICENSE for details)
 
 from __future__ import division
diff --git a/qwt/scale_map.py b/qwt/scale_map.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Licensed under the terms of the Qwt License
+# Licensed under the terms of the Qwt License, Copyright (C) 2002 Uwe Rathmann
 # (see qwt/LICENSE for details)
 
 from qwt.math import qwtFuzzyCompare
diff --git a/qwt/scale_widget.py b/qwt/scale_widget.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Licensed under the terms of the Qwt License
+# Licensed under the terms of the Qwt License, Copyright (C) 2002 Uwe Rathmann
 # (see qwt/LICENSE for details)
 
 from qwt.scale_draw import QwtScaleDraw
diff --git a/qwt/series_data.py b/qwt/series_data.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Licensed under the terms of the Qwt License
+# Licensed under the terms of the Qwt License, Copyright (C) 2002 Uwe Rathmann
 # (see qwt/LICENSE for details)
 
 from qwt.sample import QwtIntervalSample, QwtSetSample, QwtOHLCSample
diff --git a/qwt/series_store.py b/qwt/series_store.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Licensed under the terms of the Qwt License
+# Licensed under the terms of the Qwt License, Copyright (C) 2002 Uwe Rathmann
 # (see qwt/LICENSE for details)
 
 from qwt.qt.QtCore import QRectF
diff --git a/qwt/spline.py b/qwt/spline.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Licensed under the terms of the Qwt License
+# Licensed under the terms of the Qwt License, Copyright (C) 2002 Uwe Rathmann
 # (see qwt/LICENSE for details)
 
 from qwt.qt.QtGui import QPolygonF
diff --git a/qwt/symbol.py b/qwt/symbol.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Licensed under the terms of the Qwt License
+# Licensed under the terms of the Qwt License, Copyright (C) 2002 Uwe Rathmann
 # (see qwt/LICENSE for details)
 
 from qwt.graphic import QwtGraphic
diff --git a/qwt/text.py b/qwt/text.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Licensed under the terms of the Qwt License
+# Licensed under the terms of the Qwt License, Copyright (C) 2002 Uwe Rathmann
 # (see qwt/LICENSE for details)
 
 from qwt.painter import QwtPainter
diff --git a/qwt/text_engine.py b/qwt/text_engine.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Licensed under the terms of the Qwt License
+# Licensed under the terms of the Qwt License, Copyright (C) 2002 Uwe Rathmann
 # (see qwt/LICENSE for details)
 
 from qwt.painter import QwtPainter
diff --git a/qwt/transform.py b/qwt/transform.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Licensed under the terms of the Qwt License
+# Licensed under the terms of the Qwt License, Copyright (C) 2002 Uwe Rathmann
 # (see qwt/LICENSE for details)
 
 import numpy as np

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`	`1`	`# -- coding: utf-8 --`
`2`	`2`	`#`
`3`		`-# Licensed under the terms of the Qwt License`
	`3`	`+# Licensed under the terms of the Qwt License, Copyright (C) 2002 Uwe Rathmann`
`4`	`4`	`# (see qwt/LICENSE for details)`
`5`	`5`
`6`		`-__version__ = QWT_VERSION_STR = '6.1.2a4'`
	`6`	`+__version__ = QWT_VERSION_STR = '6.1.2a5'`
`7`	`7`
`8`	`8`	`import warnings`
`9`	`9`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`# -- coding: utf-8 --`
`2`	`2`	`#`
`3`		`-# Licensed under the terms of the Qwt License`
	`3`	`+# Licensed under the terms of the Qwt License, Copyright (C) 2002 Uwe Rathmann`
`4`	`4`	`# (see qwt/LICENSE for details)`
`5`	`5`
`6`	`6`	`from qwt.qt.QtGui import QPolygon, QPolygonF`