[med-svn] [profit] 05/11: EMBOSS conflicts with profit .. the letter being unredistributable and hence not in our distribution.

[Andreas Tille]

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

tille pushed a commit to branch master
in repository profit.

commit 3a82d73cb9517889a4569fe755885294f2a745ce
Author: Steffen Moeller <moeller at debian.org>
Date:   Tue Sep 10 17:04:43 2013 +0000

    EMBOSS conflicts with profit .. the letter being unredistributable and hence not in our distribution.
---
 debian/README.Debian                         |  3 +++
 debian/control                               | 18 +++++++++++++++++-
 debian/{profit.dirs => profit-3d.dirs}       |  0
 debian/{profit.install => profit-3d.install} |  1 -
 debian/profit.links                          |  1 +
 debian/rules                                 |  4 ++++
 6 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/debian/README.Debian b/debian/README.Debian
index 72fe1e1..60f469c 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -1,6 +1,9 @@
 profit for Debian
 -----------------
 
+/usr/bin/profit sadly clashes with the emboss package, for a very
+different funtion.
+
 The license of ProFit does not allow a redistribution.
 
 The documentation is not built, since it demanded too much of LaTeX to be installed,
diff --git a/debian/control b/debian/control
index 2348f8e..074b58d 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Homepage: http://www.bioinf.org.uk/software/profit/
 Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/profit/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/profit/trunk/
 
-Package: profit
+Package: profit-3d
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, profit-data
 Description: Protein structure alignment
@@ -16,6 +16,22 @@ Description: Protein structure alignment
  program. It has many features including flexible specification of
  fitting zones and atoms, calculation of RMS over different zones or
  atoms, RMS-by-residue calculation, on-line help facility, etc.
+ .
+ The binary is named profit-3D because of a name clash with an
+ EMBOSS tool.
+
+Package: profit
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, profit-3d
+Conflicts: emboss
+Description: Protein structure alignment
+ ProFit is designed to be the ultimate protein least squares fitting
+ program. It has many features including flexible specification of
+ fitting zones and atoms, calculation of RMS over different zones or
+ atoms, RMS-by-residue calculation, on-line help facility, etc.
+ .
+ A symbolic link is provided to have the binary name back to how
+ it is historically correct.
 
 Package: profit-data
 Architecture: all
diff --git a/debian/profit.dirs b/debian/profit-3d.dirs
similarity index 100%
rename from debian/profit.dirs
rename to debian/profit-3d.dirs
diff --git a/debian/profit.install b/debian/profit-3d.install
similarity index 50%
rename from debian/profit.install
rename to debian/profit-3d.install
index e74c90d..68f0f43 100644
--- a/debian/profit.install
+++ b/debian/profit-3d.install
@@ -1,2 +1 @@
 src/profit usr/lib/profit/
-debian/bin/profit usr/bin/
diff --git a/debian/profit.links b/debian/profit.links
new file mode 100644
index 0000000..eae6ab6
--- /dev/null
+++ b/debian/profit.links
@@ -0,0 +1 @@
+usr/bin/profit-3D usr/bin/profit
diff --git a/debian/rules b/debian/rules
index 99bc6ec..1dc88cb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,3 +18,7 @@ override_dh_auto_build:
 override_dh_auto_clean:
 	$(MAKE) -C src clean
 
+override_dh_install:
+	dh_install
+	cp $(CURDIR)/src/profit $(CURDIR)/debian/profit-3d/usr/bin/profit-3D
+

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