diff --git a/changelog.upstream b/changelog.upstream index 803931a..4300542 100644 --- a/changelog.upstream +++ b/changelog.upstream @@ -1,3 +1,29 @@ +commit 811852656e5fdeae19c2a942207e4318c2f9b14d +Author: Patrick Schleizer +Date: Fri Mar 1 14:32:41 2019 +0000 + + add improved legal protections clauses + + The license for software created by Whonix is the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version with additional terms applicable per GNU GPL version 3 section 7. + + The additional terms are based on the Doom 3 license which is Debian refers to as `GPL-3+-with-id-software-additional-terms`, which is Debian DFSG [1] (The Debian Free Software Guidelines) approved and which is therefore suitable for Debian `main`. Whonix made applied minimal changes to it: + + * Rewrite `The Doom 3 BFG Edition GPL Source Code` to the more common `this program` which is used throughout the GPL. + * Added a "trump clause" [2], in other words, any conflicts or disputes between the additional terms and the GPLv3 shall be resolved in favor of the GPLv3 by adding `Notwithstanding any other provision of this License` (as mentioned in GPL FAQ [3]) at the beginning of the additional terms. + + [1] https://www.debian.org/social_contract#guidelines + [2] https://www.fsf.org/news/canonical-updated-licensing-terms + [3] https://www.gnu.org/licenses/gpl-faq.html#v3Notwithstanding + + For more considerations, see also: + https://www.whonix.org/wiki/Dev/Licensing + +commit 2298d0f6b0a7214ae4f6ecc7a56734905cdb9352 +Author: Patrick Schleizer +Date: Wed Nov 28 06:33:14 2018 +0000 + + bumped changelog version + commit 63b080f40bab38bdb1c91519b90c3988640970d9 Author: Patrick Schleizer Date: Mon Nov 19 06:27:52 2018 -0500 diff --git a/debian/changelog b/debian/changelog index a356e98..9262df7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +security-misc (3:2.0-1) unstable; urgency=medium + + * New upstream version (local package). + + -- Patrick Schleizer Tue, 12 Mar 2019 11:36:25 +0000 + security-misc (3:1.9-1) unstable; urgency=medium * New upstream version (local package).