aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-06-02 17:35:44 +0200
committerMihai Moldovan <ionic@ionic.de>2015-06-02 17:35:44 +0200
commit86937b86cbc9a00734d1a77140e557db2218225e (patch)
tree4486ab717df20c66d7aca20264b21d724dda38f7
parentf9303c1c7df9272618f70532c2dd17ed689310c5 (diff)
downloadnx-libs-86937b86cbc9a00734d1a77140e557db2218225e.tar.gz
nx-libs-86937b86cbc9a00734d1a77140e557db2218225e.tar.bz2
nx-libs-86937b86cbc9a00734d1a77140e557db2218225e.zip
nxcomp/README.on-retroactive-DXPC-license: Some layout and interpunctuation fixes.
Backported from Arctica GH 3.6.x branch. Affects: - 9900-dxpc-license-history.full+lite.patch
-rw-r--r--debian/changelog5
-rw-r--r--debian/patches/9900-dxpc-license-history.full+lite.patch2
2 files changed, 6 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 30f81b1a2..cb4fb7f13 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -196,6 +196,11 @@ nx-libs (2:3.5.0.32-0x2go1) UNRELEASED; urgency=low
* Add 9900-dxpc-license-history.full+lite.patch. Document license history of
DXPC (where nxcomp got forked from).
Backported from Arctica GH 3.6.x branch.
+ * nxcomp/README.on-retroactive-DXPC-license: Some layout and
+ interpunctuation fixes.
+ Backported from Arctica GH 3.6.x branch.
+ Affects:
+ - 9900-dxpc-license-history.full+lite.patch
[ Nito Martinez ]
* nxcomp: fix DEBUG, TEST, DUMP, FLUSH, TOKEN, PING, MIXED et al builds.
diff --git a/debian/patches/9900-dxpc-license-history.full+lite.patch b/debian/patches/9900-dxpc-license-history.full+lite.patch
index 676d0d26f..4695b6612 100644
--- a/debian/patches/9900-dxpc-license-history.full+lite.patch
+++ b/debian/patches/9900-dxpc-license-history.full+lite.patch
@@ -3972,11 +3972,11 @@ index 0000000..d7fc8c5
+contacted and persuaded to re-license under GPL-compatible
+terms.
+"""
++
+The issue has been settled by asking all recent maintainers (i.e.,
+copyright holders) of DXPC, to agree on considering the BSD-2-clause
+license (as introduced in DXPC 3.8.1) retro-actively as the license of
+all pre-3.8.1 DXPC releases.
-+"""
+
+STEP 2:
+=======