[med-svn] [cd-hit] 01/01: Provide original names choosen by upstream

[Andreas Tille]

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

tille pushed a commit to branch master
in repository cd-hit.

commit 178c984407bfcc7c826c199b84c074a7a810b3c9
Author: Andreas Tille <tille at debian.org>
Date:   Fri Aug 12 13:10:20 2016 +0200

    Provide original names choosen by upstream
---
 debian/README.Debian | 12 +++++++++++-
 debian/links         | 17 ++++++++++++-----
 debian/rules         | 20 +++++---------------
 3 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/debian/README.Debian b/debian/README.Debian
index 355c93e..979fae8 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -5,5 +5,15 @@ Currently cd-hit is built with MPI support.  Please drop the Debian Med
 team a note (or file a bug report using `reportbug cd-hit`) and ask us for
 supporting an alternative package without MPI.
 
- -- Andreas Tille <tille at debian.org>  Thu, 26 Apr 2012 07:54:23 +0200
+Note: For some reason the Debian package contained renamed binaries of
+cd-hit, cd-hit-2d, cd-hit-454, cd-hit-est and cd-hit-est-2d in /usr/bin.
+This is in contrast to the provided documentation.  The current package
+contains both, the originally named and the renamed version.  The
+renamed binaries without the '-' will be removed at a later point of
+time.
+
+The renamed version do intentionally not get a manpage to raise awareness
+that something is to be done here.
+
+ -- Andreas Tille <tille at debian.org>  Thu, 11 Aug 2016 08:09:28 +0300
 
diff --git a/debian/links b/debian/links
index f625787..cccb2bf 100644
--- a/debian/links
+++ b/debian/links
@@ -1,10 +1,10 @@
-usr/lib/cd-hit/cd-hit			usr/bin/cdhit
-usr/lib/cd-hit/cd-hit-2d		usr/bin/cdhit-2d
+usr/lib/cd-hit/cd-hit			usr/bin/cd-hit
+usr/lib/cd-hit/cd-hit-2d		usr/bin/cd-hit-2d
 usr/lib/cd-hit/cd-hit-2d-para.pl	usr/bin/cd-hit-2d-para
-usr/lib/cd-hit/cd-hit-454		usr/bin/cdhit-454
+usr/lib/cd-hit/cd-hit-454		usr/bin/cd-hit-454
 usr/lib/cd-hit/cd-hit-div.pl		usr/bin/cd-hit-div
-usr/lib/cd-hit/cd-hit-est		usr/bin/cdhit-est
-usr/lib/cd-hit/cd-hit-est-2d		usr/bin/cdhit-est-2d
+usr/lib/cd-hit/cd-hit-est		usr/bin/cd-hit-est
+usr/lib/cd-hit/cd-hit-est-2d		usr/bin/cd-hit-est-2d
 usr/lib/cd-hit/cd-hit-para.pl		usr/bin/cd-hit-para
 usr/lib/cd-hit/clstr2tree.pl		usr/bin/clstr2tree
 usr/lib/cd-hit/clstr_merge_noorder.pl	usr/bin/clstr_merge_noorder
@@ -18,3 +18,10 @@ usr/lib/cd-hit/make_multi_seq.pl	usr/bin/make_multi_seq
 ## Too generic name, please point your PATH to /usr/lib/cd-hit
 # usr/lib/cd-hit/plot_2d.pl		usr/bin/plot_2d
 # usr/lib/cd-hit/plot_len1.pl		usr/bin/plot_len1
+#
+# Keep this for compatibility reasons for some time
+usr/bin/cd-hit			usr/bin/cdhit
+usr/bin/cd-hit-2d		usr/bin/cdhit-2d
+usr/bin/cd-hit-454		usr/bin/cdhit-454
+usr/bin/cd-hit-est		usr/bin/cdhit-est
+usr/bin/cd-hit-est-2d		usr/bin/cdhit-est-2d
diff --git a/debian/rules b/debian/rules
index a052855..8f718bb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,33 +25,23 @@ override_dh_installman:
 
 	help2man --no-info --no-discard-stderr --version-string='$(ver)' \
 	   --name='quickly group sequences' \
-	   $(CURDIR)/cd-hit	| \
-	   sed -e 's/^cd-\(hit \\-\)/cd\1/' -e 's/^.B cd-hit/.B cdhit/' \
-	   > $(mandir)/cdhit.1
+	   $(CURDIR)/cd-hit > $(mandir)/cd-hit.1
 
 	help2man --no-info --no-discard-stderr --version-string='$(ver)' \
 	   --name='quickly group sequences, optimised for 454 data' \
-	   $(CURDIR)/cd-hit-454	| \
-	   sed -e 's/^cd-\(hit \\-\)/cd\1/' -e 's/^.B cd-hit/.B cdhit/' \
-	   > $(mandir)/cdhit-454.1
+	   $(CURDIR)/cd-hit-454 > $(mandir)/cd-hit-454.1
 
 	help2man --no-info --no-discard-stderr --version-string='$(ver)' \
 	   --name='quickly group sequences in db1 or db2 format' \
-	   $(CURDIR)/cd-hit-2d	| \
-	   sed -e 's/^cd-\(hit-2d \\-\)/cd\1/' -e 's/^.B cd-hit/.B cdhit/' \
-	   	> $(mandir)/cdhit-2d.1
+	   $(CURDIR)/cd-hit-2d > $(mandir)/cd-hit-2d.1
 
 	help2man --no-info --no-discard-stderr --version-string='$(ver)' \
 	   --name='run CD-HIT algorithm on RNA/DNA sequences' \
-	   $(CURDIR)/cd-hit-est	| \
-	   sed -e 's/^cd-\(hit-est \\-\)/cd\1/' -e 's/^.B cd-hit/.B cdhit/' \
-		> $(mandir)/cdhit-est.1
+	   $(CURDIR)/cd-hit-est > $(mandir)/cd-hit-est.1
 
 	help2man --no-info --no-discard-stderr --version-string='$(ver)' \
 	   --name='run CD-HIT algorithm on RNA/DNA sequences in db1 or db2 format' \
-	   $(CURDIR)/cd-hit-est-2d	| \
-	   sed -e 's/^cd-\(hit-est-2d \\-\)/cd\1/' -e 's/^.B cd-hit/.B cdhit/' \
-		> $(mandir)/cdhit-est-2d.1
+	   $(CURDIR)/cd-hit-est-2d > $(mandir)/cd-hit-est-2d.1
 
 	help2man --no-info --no-discard-stderr --version-string='$(ver)' \
 	   --name='divide a big clustering job into pieces to run cd-hit-2d or cd-hit-est-2d jobs' \

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