[X2Go-Commits] [nx-libs] 01/01: nxcomp/README.on-retroactive-DXPC-license: Some layout and interpunctuation fixes.

git-admin at x2go.org git-admin at x2go.org
Tue Jun 2 17:37:06 CEST 2015


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch 3.5.0.x
in repository nx-libs.

commit 86937b86cbc9a00734d1a77140e557db2218225e
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Jun 2 17:35:44 2015 +0200

    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
---
 debian/changelog                                   |    5 +++++
 .../9900-dxpc-license-history.full+lite.patch      |    2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 30f81b1..cb4fb7f 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 676d0d2..4695b66 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:
 +=======

--
Alioth's /srv/git/code.x2go.org/nx-libs.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git


More information about the x2go-commits mailing list