use d/copyright and update

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/Makefile b/Makefile
index 84c94578265e75461a1700fd29c5142a8182df2c..47ad5c1545b1aa5f2fce654f3cb2b520aec5d690 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -43,8 +43,6 @@ wchardata.c:
 
 .PHONY: install
 install: vncterm vncterm.1 font.data
-       mkdir -p $(DESTDIR)/usr/share/doc/$(PACKAGE)
-       install -m 0644 copyright $(DESTDIR)/usr/share/doc/$(PACKAGE)
        mkdir -p $(DESTDIR)/usr/share/$(PACKAGE)
        install -m 0644 font.data $(DESTDIR)/usr/share/$(PACKAGE)
        mkdir -p $(DESTDIR)/usr/share/man/man1

diff --git a/copyright b/copyright
deleted file mode 100644 (file)
index 62ea05a..0000000
--- a/copyright
+++ /dev/null
@@ -1,20 +0,0 @@
-Copyright (C) 2007 Proxmox Server Solutions GmbH
-
-Copyright: vncterm is under GNU GPL, the GNU General Public License.
-
-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.
-
-You should have received a copy of the GNU General Public License along
-with this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-The complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.

diff --git a/debian/copyright b/debian/copyright
new file mode 100644 (file)
index 0000000..af59a74
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,43 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Source: git://git.proxmox.com/git/vncterm.git
+
+Files:
+ *
+Copyright: 2007 - 2023, Proxmox Support Team <support@proxmox.com>
+License: AGPL-3.0-or-later
+ This program is free software: you can redistribute it and/or modify it under
+ the terms of the GNU Affero General Public License as published by the Free
+ Software Foundation, either version 3 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 Affero General Public License for more
+ details.
+ .
+ You should have received a copy of the GNU Affero General Public License along
+ with this program. If not, see <https://www.gnu.org/licenses/>.
+Comment:
+ The authors take the provided option to use the LibVNC as GPL 2 *or later*,
+ and use it as GPL 3, allowing combination with our AGPLv3 code.
+
+Files:
+ LibVNCServer-*.tar*
+Copyright: 2001-2003, Johannes E. Schindelin
+           2001 - 2022, The LibVNC Authors
+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.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this package; if not, see &lt;https://www.gnu.org/licenses/&gt;.
+Comment:
+ On Debian systems, the full text of the GNU General Public License
+ version 2 can be found in the file '/usr/share/common-licenses/GPL-2'.