Skip to content

Commit 1b92c69

Browse files
committed
Update copyright file.
Changes: - Remove unused Files paragraph for the python plugin_installer - Fix qwtpolar-1.0 typo - Remove unused License paragraph for Apache-2.0 - Add License paragraph for Zlib
1 parent e04570c commit 1b92c69

File tree

1 file changed

+16
-36
lines changed

1 file changed

+16
-36
lines changed

debian/copyright

+16-36
Original file line numberDiff line numberDiff line change
@@ -658,35 +658,13 @@ Files: python/plugins/fTools/*
658658
Copyright: 2009 Carson J.Q. Farmer
659659
License: MIT
660660

661-
Files: python/plugins/plugin_installer
662-
Copyright: 2007 Matthew T. Perry
663-
2008-2009 Borys Jurgiel
664-
License: MIT
665-
666661
Files: src/app/gps/qwtpolar-0.1/*
667-
src/app/gps/qwtpolor-1.0/*
662+
src/app/gps/qwtpolar-1.0/*
668663
Copyright: 2008 Uwe Rathmann
669664
Comment: This library is free software; you can redistribute it and/or
670665
modify it under the terms of the Qwt License, Version 1.0
671666
License: QWT-1.0
672667

673-
License: Apache-2.0
674-
Licensed under the Apache License, Version 2.0 (the "License");
675-
you may not use this file except in compliance with the License.
676-
You may obtain a copy of the License at
677-
.
678-
http://www.apache.org/licenses/LICENSE-2.0
679-
.
680-
Unless required by applicable law or agreed to in writing, software
681-
distributed under the License is distributed on an "AS IS" BASIS,
682-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
683-
.
684-
See the License for the specific language governing permissions and
685-
limitations under the License.
686-
.
687-
On Debian systems, the complete text of the Apache License version 2
688-
an be found in the `/usr/share/common-licenses/Apache-2.0' file.
689-
690668
License: Apache-Style-Software-License-Version-1.1
691669
Apache-Style Software License for ColorBrewer software and ColorBrewer
692670
Color Schemes
@@ -1816,19 +1794,21 @@ License: QWT-1.0
18161794
the Qwt project (http://qwt.sf.net).
18171795

18181796
License: Zlib
1819-
This software is provided 'as-is', without any express or implied
1820-
warranty. In no event will the authors be held liable for any damages
1821-
arising from the use of this software.
1797+
This software is provided 'as-is', without any express or implied warranty. In
1798+
no event will the authors be held liable for any damages arising from the use
1799+
of this software.
18221800
.
18231801
Permission is granted to anyone to use this software for any purpose,
1824-
including commercial applications, and to alter it and redistribute it
1825-
freely, subject to the following restrictions:
1826-
.
1827-
1. The origin of this software must not be misrepresented; you must not
1828-
claim that you wrote the original software. If you use this software
1829-
in a product, an acknowledgment in the product documentation would be
1830-
appreciated but is not required.
1831-
2. Altered source versions must be plainly marked as such, and must not be
1832-
misrepresented as being the original software.
1833-
3. This notice may not be removed or altered from any source distribution.
1802+
including commercial applications, and to alter it and redistribute it freely,
1803+
subject to the following restrictions:
1804+
.
1805+
1. The origin of this software must not be misrepresented; you must not
1806+
claim that you wrote the original software. If you use this software in
1807+
a product, an acknowledgment in the product documentation would be
1808+
appreciated but is not required.
1809+
.
1810+
2. Altered source versions must be plainly marked as such, and must not be
1811+
misrepresented as being the original software.
1812+
.
1813+
3. This notice may not be removed or altered from any source distribution.
18341814

0 commit comments

Comments
 (0)