[med-svn] [plink1.9] 01/01: Remove d/NEWS.Debian, redundant with d/README.Debian

[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 plink1.9.

commit 7a28525d028d33002e4ef09527bb70046287adf4
Author: Dylan Aïssi <bob.dybian at gmail.com>
Date:   Mon Oct 24 22:48:53 2016 +0200

    Remove d/NEWS.Debian, redundant with d/README.Debian
---
 debian/NEWS.Debian   | 35 -----------------------------------
 debian/README.Debian | 42 +++++-------------------------------------
 debian/changelog     |  3 ++-
 debian/control       |  2 +-
 4 files changed, 8 insertions(+), 74 deletions(-)

diff --git a/debian/NEWS.Debian b/debian/NEWS.Debian
deleted file mode 100644
index 090b6db..0000000
--- a/debian/NEWS.Debian
+++ /dev/null
@@ -1,35 +0,0 @@
-Name conflict with plink1, plink1.9, plink2 and plink from ssh clone putty
-=============================================
-
-We are facing a name clash in the Free Software universe and we have
-to circumvent. To summarize, we have:
-
-  1. The plink1 executable
-        /usr/lib/debian-med/bin/plink
-  1.1 A symbolic link to the plink1 executable
-             /usr/bin/plink1
-             /usr/bin/p-link
-             /usr/lib/plink/plink
-
-  2. The plink1.9 executable
-        /usr/lib/debian-med/bin/plink1.9
-  2.1 A symbolic link to the plink1.9 executable
-             /usr/bin/plink1.9
-
-  3. The plink2 executable
-        /usr/lib/debian-med/bin/plink2
-  3.1 A symbolic link to the plink2 executable
-             /usr/bin/plink2
-
-  4. The plink executable (from putty)
-        /usr/bin/plink
-
-So if you want to use plink1 with its original name just do the
-following:  Set the PATH variable like
-
-  export PATH=/usr/lib/debian-med/bin:$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
- -- Dylan Aïssi <bob.dybian at gmail.com>  Thu, 22 Jan 2015 08:00:59 +0100
diff --git a/debian/README.Debian b/debian/README.Debian
index 5e42e05..8c514e8 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -1,53 +1,21 @@
-plink for Debian
-----------------
-
-plink is a very fine piece of software and the world should thank
-the authors for their efforts. plink knows how to interact
-with gplink and haploview. The packaging of the latter is already
-being prepared. The prior still seeks a maintainer.
-
-Users of plink may also be interested in other packages the that
-Debian-Med.alioth.debian.org community has brought ot Debian,
-e.g. r-cran-qtl and general packages for bioinformatics research.
-
-
-Name conflict with plink1, plink1.9, plink2 and plink from ssh clone putty
+Name conflict with plink1, plink1.9 and plink from ssh clone putty
 =============================================
 
-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:
+We are facing a name clash in the Free Software universe and we have
+to circumvent. To summarize, we have:
 
   1. The plink1 executable
         /usr/lib/debian-med/bin/plink
   1.1 A symbolic link to the plink1 executable
              /usr/bin/plink1
              /usr/bin/p-link
-             /usr/lib/plink/plink
 
   2. The plink1.9 executable
         /usr/lib/debian-med/bin/plink1.9
   2.1 A symbolic link to the plink1.9 executable
              /usr/bin/plink1.9
 
-  3. The plink2 executable
-        /usr/lib/debian-med/bin/plink2
-  3.1 A symbolic link to the plink2 executable
-             /usr/bin/plink2
-
-  4. The plink executable (from putty)
+  3. The plink executable (from putty)
         /usr/bin/plink
 
-So if you want to use plink1 with its original name just do the
-following:  Set the PATH variable like
-
-  export PATH=/usr/lib/debian-med/bin:$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
- -- Dylan Aïssi <bob.dybian at gmail.com>  Thu, 22 Jan 2015 08:00:59 +0100
+ -- Dylan Aïssi <bob.dybian at gmail.com>  Mon, 24 Oct 2016 22:47:36 +0200
diff --git a/debian/changelog b/debian/changelog
index 442def9..0b60b05 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ plink1.9 (1.90~b3.43-161010-1) UNRELEASED; urgency=medium
   * Update license of plink1.9 from GPL-3 to GPL-3+.
   * Install an upstream changelog.
   * Remove 03_Fix_FTBFS_GCC6.patch, fixed upstream.
+  * Remove d/NEWS.Debian, redundant with d/README.Debian.
 
- -- Dylan Aïssi <bob.dybian at gmail.com>  Sun, 23 Oct 2016 23:58:01 +0200
+ -- Dylan Aïssi <bob.dybian at gmail.com>  Mon, 24 Oct 2016 22:47:36 +0200
 
 plink1.9 (1.90~b3.40-160816-2) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 87c35d4..e159419 100644
--- a/debian/control
+++ b/debian/control
@@ -32,4 +32,4 @@ Description: whole-genome association analysis toolset
  .
  Please note: The executable was renamed to plink1.9
  because of a name clash.  Please read more about this
- in /usr/share/doc/README.Debian.
+ in /usr/share/doc/plink1.9/README.Debian.

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