[med-svn] r15268 - trunk/packages/seqan/trunk/debian

[Andreas Tille]

Author: tille
Date: 2013-11-24 18:46:29 +0000 (Sun, 24 Nov 2013)
New Revision: 15268

Modified:
   trunk/packages/seqan/trunk/debian/changelog
   trunk/packages/seqan/trunk/debian/rules
Log:
Need to rename /usr/bin/join to /usr/bin/seqan-join to avoid name clash with coreutils --> this needs to be discussed with upstream!


Modified: trunk/packages/seqan/trunk/debian/changelog
===================================================================
--- trunk/packages/seqan/trunk/debian/changelog	2013-11-24 16:30:34 UTC (rev 15267)
+++ trunk/packages/seqan/trunk/debian/changelog	2013-11-24 18:46:29 UTC (rev 15268)
@@ -18,7 +18,10 @@
      - DEP5
      - Add Upstream-Contact according to latest discussion
      - Update Source to actual download tarball
-  * debian/rules: cdbs -> dh
+  * debian/rules:
+     - cdbs -> dh
+     - Need to rename /usr/bin/join to /usr/bin/seqan-join to avoid
+       name clash with coreutils
   * debian/seqan-apps.links -> seqan-apps.install: Install applications
     directly to /usr/bin
   * debian/generate_manpages: use help2man to autogenerate manpages

Modified: trunk/packages/seqan/trunk/debian/rules
===================================================================
--- trunk/packages/seqan/trunk/debian/rules	2013-11-24 16:30:34 UTC (rev 15267)
+++ trunk/packages/seqan/trunk/debian/rules	2013-11-24 18:46:29 UTC (rev 15268)
@@ -13,15 +13,12 @@
 	dh_auto_build
 	cd obj-$(DEB_BUILD_GNU_TYPE); make docs
 
-__makebuilddir::
-	# create backups of original *generated_forwards.h files to build twice in a row
-	for header in `find seqan -name "*generated_forwards.h"` ; do \
-	  mkdir -p orig/`dirname $$header` ; \
-	  cp -a $$header orig/$${header} ; \
-	done
-
 override_dh_install:
 	dh_install
+	# /usr/bin/join is part of coreutils package: Avoid name conflict
+	# by renaming it to seqan-join
+	mv $(CURDIR)/debian/seqan-apps/usr/bin/join $(CURDIR)/debian/seqan-apps/usr/bin/seqan-join
+	#
 	# Formerly binaries were installed into usr/lib/sequan/bin/
 	# and only some of them were made available in /usr/bin via dh_link
 	# Since there is no obvious reason for this neither is there any