[med-svn] [staden] 01/03: Solve name space conflict with spin package

[Andreas Tille]

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

tille pushed a commit to branch master
in repository staden.

commit f44bdde87d2a3ffcee622867a14dee4717724b1e
Author: Andreas Tille <tille at debian.org>
Date:   Thu Jul 14 20:49:08 2016 +0200

    Solve name space conflict with spin package
---
 debian/README.Debian | 37 ++++++++++++++++++++++++++++++++++++-
 debian/changelog     |  2 ++
 debian/control       |  1 +
 debian/rules         |  6 ++++++
 debian/staden.links  |  3 ++-
 5 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/debian/README.Debian b/debian/README.Debian
index 59fd248..3ccadc2 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -26,4 +26,39 @@ SVN only.
            I somehow suspect that /share/EMBOSS needs to be dropped
 
 
- -- Andreas Tille <tille at debian.org>  Mon, 21 Apr 2014 22:34:28 +0200
+Name conflict with spin (bug #826684)
+=====================================
+
+At http://bugs.debian.org/826684 between the one executable of
+staden and the package spin.
+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 spin executable
+        /usr/lib/staden/bin/spin
+     where all executables of the staden package reside anyway
+  2. The wrapper that was provided in /usr/bin/spin is removed
+     in favour of
+        /usr/lib/debian-med/bin/spin
+
+If you want to use spin right from the cpmman line just set the
+PATH variable like
+
+  export PATH=/usr/lib/debian-med/bin:$PATH
+
+If a user creates a file
+
+    ${HOME}/.blends
+
+with the content
+
+# Add Blend names here which should prepend its bin dir to PATH
+debian-med
+
+the med-config package automatically adds this PATH to the users
+environment (when using bash).
+
+
+ -- Andreas Tille <tille at debian.org>  Thu, 14 Jul 2016 20:04:52 +0200
diff --git a/debian/changelog b/debian/changelog
index dcc6934..642dbb4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ staden (2.0.0+b11-1) UNRELEASED; urgency=medium
     Closes: #825461
   * Fix implicit declarations
   * Adapt watch file to new file name scheme
+  * Move spin away from /usr/bin/spin to solve conflict with spin package
+    Closes: #826684
 
  -- Andreas Tille <tille at debian.org>  Thu, 14 Jul 2016 20:04:52 +0200
 
diff --git a/debian/control b/debian/control
index 9da4dd8..fafe012 100644
--- a/debian/control
+++ b/debian/control
@@ -30,6 +30,7 @@ Depends: ${misc:Depends},
          staden-common (= ${source:Version}),
          staden-io-lib-utils,
          tklib
+Recommends: med-config (>= 2.1)
 Description: DNA sequence assembly (Gap4/Gap5), editing and analysis tools
  Staden is a fully developed set of DNA sequence assembly (Gap4 and
  Gap5), editing and analysis tools (Spin).
diff --git a/debian/rules b/debian/rules
index eaa37dd..f44f0a0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -42,6 +42,12 @@ override_dh_auto_clean:
 	rm -f Makefile shlib.conf staden_config.h system.mk
 	find -name debian -prune -o -name .dir -exec rm '{}' ';'
 
+override_dh_installman:
+	dh_installman
+	# due to a file name conflict spin.1 is moved outof the way #826684
+	mkdir -p debian/staden/usr/lib/debian-med/share/man/man1/
+	mv debian/staden/usr/share/man/man1/spin.1 debian/staden/usr/lib/debian-med/share/man/man1/
+
 override_dh_fixperms:
 	dh_fixperms
 	# scripts should be executable
diff --git a/debian/staden.links b/debian/staden.links
index 564c08a..a3257ec 100644
--- a/debian/staden.links
+++ b/debian/staden.links
@@ -1,4 +1,5 @@
 usr/bin/gap4		usr/bin/gap5
 usr/bin/gap4		usr/bin/pregap4
-usr/bin/gap4		usr/bin/spin
+# due to a file name conflict spin is moved outof the way #826684
+usr/bin/gap4		usr/lib/debian-med/bin/spin
 usr/bin/gap4		usr/bin/trev

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