include new licenses from GNUnet

Makefile

@@ -1,10 +1,13 @@
-# This file is taken from the GNUnet project's website source code,
-# originally in the public domain.
 #
-# This file is re-distributed under the terms of CC0 1.0 (Public Domain).
-# You should have received a copy of CC0 1.0 along with this distribution.
-# If not, see <https://creativecommons.org/publicdomain/zero/1.0/>.
-# <https://creativecommons.org/publicdomain/zero/1.0/>
+# Copyright (C) 2019 Alexandros Theodotou <alex at zrythm dot org>
+# Copyright (C) 2017, 2018, 2019 GNUnet e.V.
+#
+# Copying and distribution of this file, with or without modification,
+# are permitted in any medium without royalty provided the copyright
+# notice and this notice are preserved.  This file is offered as-is,
+# without any warranty.
+#
+# ----
 
 # All: build HTML pages in all languages and compile the
 # TypeScript logic in web-common.

README.GNUnet

@@ -1,71 +0,0 @@
-==============
-GNUnet Website
-==============
-
-Sourcecode for https://gnunet.org created from the https://taler.net code base.
-
-Requires python3-jinja2, python3-babel, and gettext.
-
-The currently supported python3 version is python 3.7.
-
-Run "make" to build the HTML.
-If you experience a failure related to a python module, run
-"make" again.
-
-Expect it to show up in rendered/en/ and other language folders.
-
-Layout / how this comes to be
-=============================
-
-config.mk		local variables for values in the Makefile
-static/			contains images, css, PDFs, robots.txt, team-images
-static/navbar.css	CSS for the navigation bar (common/navigation.j2.inc)
-static/styles.css	CSS for the rest of the website
-template/		the flat namespace of html.j2 files
-dist/			3rd party content (bootstrap 4, font-awesome)
-common/			jinja2 templates.
-template.py		operates on template directory and produces
-			output in 'rendered/' directory
-
-The 'dist' and 'static' directories will be copied to the output
-directory ('rendered/') in the 'all' phase of make. robots.txt
-is copied to relevant folders.
-
-Developing with GNU Guix
-========================
-
-Creating an ad-hoc development environment containing all of the necessary
-software needed to build the HTML files can be easily done using the GNU 
-Guix functional package manager.
-
-This can be achieved with the following command:
-
-`guix environment --ad-hoc coreutils bash python python-babel python-jinja2 gettext-minimal make -- bash`
-
-After installing the packages, this will drop you into a bash environment
-from which you can proceed to run "make".
-
-Alternative Build Method: Docker
-================================
-
-Run "make docker" to generate the HTML using a docker container-image (which 
-will be built from the included ./Dockerfile).
-
-This could be useful if, for example, you are unable to install the required 
-packages on your system, because it will use the container to install and run
-all of the required packages.
-
-Additional Notes
-================
-
-Please use HTML codes, not international signs as found on your keyboard.
-
-This website has been tested with:
-* python 3.6.5 and jinja2 2.9.6.
-* python 3.7.1, Babel 2.6.0, py-jinja2 2.10 (pkgsrc, NetBSD 8.0)
-Since python development in collaborative environments with
-a whole range of possibilities in what your environment looks
-like, please state problems on the mailinglist instead of just
-fixing what *could* work for you.
-
-Thanks!

README.md

@@ -6,7 +6,8 @@ This project was forked from the GNUnet website source code,
 which was licensed under the GPLv3 and includes all Copyright notices of the
 original authors.
 
-The original README is preserved as README.GNUnet
+The original project can be found here:
+https://git.gnunet.org/www.git/
 
 # Building
 `make` will create the full bundle in `rendered`

i18nfix.py

@@ -1,11 +1,12 @@
 #!/usr/bin/env python3
 #
-# This file is taken from the GNUnet project's website source code,
-# originally in the public domain.
+# Copyright (C) 2019 Alexandros Theodotou <alex at zrythm dot org>
+# Copyright (C) 2017, 2018 GNUnet e.V.
 #
-# This file is re-distributed under the terms of CC0 1.0 (Public Domain).
-# You should have received a copy of CC0 1.0 along with this distribution.
-# If not, see <https://creativecommons.org/publicdomain/zero/1.0/>.
+# Copying and distribution of this file, with or without modification,
+# are permitted in any medium without royalty provided the copyright
+# notice and this notice are preserved.  This file is offered as-is,
+# without any warranty.
 
 """
 Extract translations from a Jinja2 template, stripping leading newlines.

make_sitemap.sh

@@ -1,5 +1,13 @@
 #!/bin/sh
 #
+# Copyright (C) 2019 Alexandros Theodotou <alex at zrythm dot org>
+# Copyright (C) 2018, 2019 GNUnet e.V.
+#
+# Copying and distribution of this file, with or without modification,
+# are permitted in any medium without royalty provided the copyright
+# notice and this notice are preserved.  This file is offered as-is,
+# without any warranty.
+#
 # This initial version builds on code from ssg4
 # copyright is as follows:
 # -----

template.py

@@ -1,12 +1,14 @@
 #!/usr/bin/env python3
 # coding: utf-8
 #
-# This file is taken from the GNUnet project's website source code,
-# originally in the public domain.
+# Copyright (C) 2019 Alexandros Theodotou <alex at zrythm dot org>
+# Copyright (C) 2017, 2018, 2019 GNUnet e.V.
+#
+# Copying and distribution of this file, with or without modification,
+# are permitted in any medium without royalty provided the copyright
+# notice and this notice are preserved.  This file is offered as-is,
+# without any warranty.
 #
-# This file is re-distributed under the terms of CC0 1.0 (Public Domain).
-# You should have received a copy of CC0 1.0 along with this distribution.
-# If not, see <https://creativecommons.org/publicdomain/zero/1.0/>.
 # ----
 #
 # This script runs the jinja2 templating engine on an input template-file