[med-svn] [plink2] 01/06: Improved d/NEWS, d/README and d/TODO

[Dylan Aïssi]

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

bob.dybian-guest pushed a commit to branch master
in repository plink2.

commit b7addd8f3d80855ed4b03fc14980675d38150855
Author: Dylan Aïssi <bob.dybian at gmail.com>
Date:   Mon Dec 22 15:43:14 2014 +0100

    Improved d/NEWS, d/README and d/TODO
---
 debian/NEWS.Debian   | 40 +++++++++++++---------------------------
 debian/README.Debian | 51 ++++++++++++++++++++-------------------------------
 debian/TODO.Debian   |  3 ++-
 3 files changed, 35 insertions(+), 59 deletions(-)

diff --git a/debian/NEWS.Debian b/debian/NEWS.Debian
index 73ab1d5..d924493 100644
--- a/debian/NEWS.Debian
+++ b/debian/NEWS.Debian
@@ -1,39 +1,25 @@
-Name conflict with plink from ssh clone putty
+Name conflict with plink1, plink2 and plink from ssh clone putty
 =============================================
 
 We are facing a name clash in the Free Software universe and we have
-to circumvent.
+to circumvent. To summarize, we have:
 
-  1. The plink executable will be copied to
-        /usr/lib/plink/plink
-  2. A symlink
+  1. The plink1 executable
+        /usr/bin/plink1
+  2. A symbolic link to the plink1 executable
         /usr/bin/p-link
-     points to this location.
+  3. The plink2 executable
+        /usr/bin/plink2
+  4. The plink executable (from putty)
+        /usr/bin/plink
 
-So if you want to use plink with its original name just do the
-following:  Set the PATH variable like
+So if you want to use plink2 with its original name just set
+a symlink into a directory which is normally in your PATH anyway like
 
-  export PATH="/usr/lib/plink:$PATH"
-
-or alternatively set a symlink into a directory which is normally in
-your PATH anyway like
-
-  ln -s /usr/lib/plink/plink /usr/local/bin/plink
+  ln -s /usr/bin/plink2 /usr/local/bin/plink
 
 if /usr/local/bin is in your PATH.  This makes sure that scripts you
 are using will find the correct plink executable.
 
  -- Andreas Tille <tille at debian.org>  Tue, 31 Mar 2009 22:28:25 +0200
-
-
-=============================================
-Name conflict with first plink and plink from ssh clone putty
-=============================================
-
-  1. The plink2 executable will be copied to
-        /usr/lib/plink2/plink
-  2. A symlink
-        /usr/bin/p-link2
-     points to this location.
-
- -- Dylan Aïssi <bob.dybian at gmail.com>  Thu, 30 Oct 2014 06:00:00 +0000
+ -- Dylan Aïssi <bob.dybian at gmail.com>  Thu, 22 Dec 2014 06:00:00 +0000
diff --git a/debian/README.Debian b/debian/README.Debian
index 7b38b7d..2301a7d 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -11,44 +11,33 @@ Debian-Med.alioth.debian.org community has brought ot Debian,
 e.g. r-cran-qtl and general packages for bioinformatics research.
 
 
-Name conflict with plink from ssh clone putty
+Name conflict with plink1, plink2 and plink from ssh clone putty
 =============================================
 
-At http://bugs.debian.org/503367 you can read the full discussion
-about a name clash between one component of the frequently used
-ssh software putty and plink.  The short story is: We are facing a
-name clash in the Free Software universe and we have to circumvent
-this somehow.  Following the arguing in the bug discussion the
-plink package has to do the name change.  So we found the following
-solution:
-
-  1. The plink executable will be copied to
-        /usr/lib/plink/plink
-  2. A symlink
+At http://bugs.debian.org/503367 and http://bugs.debian.org/771154#25
+you can read the full discussion about a name clash between one
+component of the frequently used ssh software putty and plink. 
+The short story is: We are facing a name clash in the Free Software
+universe and we have to circumvent this somehow.  Following the
+arguing in the bug discussion the plink package has to do the name
+change.  To summarize, we have:
+
+  1. The plink1 executable
+        /usr/bin/plink1
+  2. A symbolic link to the plink1 executable
         /usr/bin/p-link
-     points to this location.
-
-So if you want to use plink with its original name just do the
-following:  Set the PATH variable like
-
-  export PATH="/usr/lib/plink:$PATH"
+  3. The plink2 executable
+        /usr/bin/plink2
+  4. The plink executable (from putty)
+        /usr/bin/plink
 
-or alternatively set a symlink into a directory which is normally in
-your PATH anyway like
+So if you want to use plink2 with its original name just set
+a symlink into a directory which is normally in your PATH anyway like
 
-  ln -s /usr/lib/plink/plink /usr/local/bin/plink
+  ln -s /usr/bin/plink2 /usr/local/bin/plink
 
 if /usr/local/bin is in your PATH.  This makes sure that scripts you
 are using will find the correct plink executable.
 
  -- Andreas Tille <tille at debian.org>  Tue, 31 Mar 2009 22:28:25 +0200
- 
-
-=============================================
-Name conflict with first plink and plink from ssh clone putty
-=============================================
-
-  1. The plink2 executable will be copied to
-        /usr/bin/plink2
-
- -- Dylan Aïssi <bob.dybian at gmail.com>  Thu, 30 Oct 2014 06:00:00 +0000
+ -- Dylan Aïssi <bob.dybian at gmail.com>  Thu, 22 Dec 2014 06:00:00 +0000
diff --git a/debian/TODO.Debian b/debian/TODO.Debian
index 6dd11c2..2067f06 100644
--- a/debian/TODO.Debian
+++ b/debian/TODO.Debian
@@ -1 +1,2 @@
--Change debian/* license from GPL2 to GPL3 ?
+-Change debian/* license from GPL2 to GPL3 to be consistent with upstream license ???
+-Update metadata with the new paper about plink2 when it will be available in a journal

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/plink2.git