Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Brug EUPL v1.2 og CC BY 4.0 #14

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 1 addition & 22 deletions CODE_LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,24 +1,3 @@
Copyright (c) 2017-2020 Datalogisk Kantineforening

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:

1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.

2. Neither the name of the copyright holder nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Source Code licensed under the [EUPL v1.2](https://eupl.eu/1.2/en/)
7 changes: 4 additions & 3 deletions CONTENT_LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
This work by Datalogisk Kantineforening is licensed under a [Creative
Commons Attribution 4.0 International
License](http://creativecommons.org/licenses/by/4.0/).
Copyright (c) 2017-2020 Datalogisk Kantineforening

Content licensed under a [Creative Commons Attribution 4.0
International License](http://creativecommons.org/licenses/by/4.0/).
4 changes: 4 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# Copyright (c) 2017-2020 Datalogisk Kantineforening

# Licensed under the EUPL v1.2: https://eupl.eu/1.2/en/

.PHONY: all clean

mkfilepath := $(abspath $(lastword $(MAKEFILE_LIST)))
Expand Down
7 changes: 7 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,10 @@ Vi kan anbefale at lave en hale-anmodning, og vente på jul.

Du skal blot køre `make`. Se evt. [`Makefile`](Makefile) og
[`latexrun`](latexrun), hvis du vil have styr på hvad `make` gør her.

## Licens

Kildeteksten er licenseret i henhold til [EUPL
v1.2](https://eupl.eu/1.2/da/). Indholdet er licenseret i henhold til
[Creative Commons Attribution 4.0 International
License](https://creativecommons.org/licenses/by/4.0/).
25 changes: 24 additions & 1 deletion vedtaegter.tex
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
% vim: spell spelllang=da_dk

% Copyright (c) 2017-2020 Datalogisk Kantineforening

% Source Code licensed under the EUPL v1.2: https://eupl.eu/1.2/en/

% Content licensed under a Creative Commons Attribution 4.0
% International License: https://creativecommons.org/licenses/by/4.0/

\documentclass[a4paper, 10pt]{article}

% Tekstindkodning og orddeling
Expand All @@ -19,6 +26,9 @@
\usepackage{mathpazo}
\linespread{1.05}

\usepackage[hidelinks, pdftex]{hyperref}
\usepackage{url}

\renewcommand\thesection{\textsection\arabic{section}}

% Fint hoved og fod
Expand Down Expand Up @@ -392,7 +402,7 @@ \subsection*{Afvikling af kantinens aktiviteter}

\end{enumerate}

\vspace{\fill}
\pagebreak

\noindent \emph{Ovenstående vedtægter er vedtaget den 20. marts 1974
på den stiftende generalforsamling og ændret 25. februar 1975, 2.
Expand All @@ -402,6 +412,19 @@ \subsection*{Afvikling af kantinens aktiviteter}

\bigskip

\noindent Vedtægterne er nedskrævet i \LaTeX, med kildetekst
offentligt tilgængelig på
\url{https://github.com/kantinen/vedtaegter/}.

\smallskip

\noindent Kildeteksten er licenseret i henhold til EUPL
v1.2\footnote{\url{https://eupl.eu/1.2/da/}}. Indholdet er licenseret
i henhold til Creative Commons Attribution 4.0 International
License\footnote{\url{https://creativecommons.org/licenses/by/4.0/}}.

\bigskip

\noindent Således vedtaget \vedtagsdato{}.

\end{document}