[med-svn] r13869 - trunk/packages/mira/trunk/debian

[Andreas Tille]

Author: tille
Date: 2013-06-07 09:10:54 +0000 (Fri, 07 Jun 2013)
New Revision: 13869

Modified:
   trunk/packages/mira/trunk/debian/changelog
   trunk/packages/mira/trunk/debian/rules
Log:
Do not install tools that are deactivated upstream (miraSearchESTSNPs); also fix version number of changelog that was increased by accident


Modified: trunk/packages/mira/trunk/debian/changelog
===================================================================
--- trunk/packages/mira/trunk/debian/changelog	2013-06-07 08:01:16 UTC (rev 13868)
+++ trunk/packages/mira/trunk/debian/changelog	2013-06-07 09:10:54 UTC (rev 13869)
@@ -1,4 +1,4 @@
-mira (3.9.17-2) UNRELEASED; urgency=low
+mira (3.9.17-1) UNRELEASED; urgency=low
 
   [ Thorsten Alteholz ]
   * new upstream version
@@ -22,11 +22,13 @@
   [ Andreas Tille ]
   * delete debian/README.source which is outdated / wrong
   * debian/{mira.1,miradiff.1,miramer.1, scftool.1, convert_project.1,
-    fasta2frag.1, fast[aq]select.1, fastatool.1, fixACE4consed}:
+    fasta2frag.1, fast[aq]select.1, fastatool.1}:
     Wrote manpage for some programs
   * Removed debian/obsolete.mira-assembler.install
   * debian/control: The actual scripts do not contain the .tcl suffix
     in our installation
+  * debian/rules: Currently miraSearchESTSNPs claims to be deactivated
+    so why bothering installing it?
 
  -- Andreas Tille <tille at debian.org>  Fri, 07 Jun 2013 08:34:21 +0200
 

Modified: trunk/packages/mira/trunk/debian/rules
===================================================================
--- trunk/packages/mira/trunk/debian/rules	2013-06-07 08:01:16 UTC (rev 13868)
+++ trunk/packages/mira/trunk/debian/rules	2013-06-07 09:10:54 UTC (rev 13869)
@@ -6,14 +6,16 @@
 #troublesome libbgoogle-perftools-dev, see README.Debian
 export DEB_CFLAGS_MAINT_APPEND=-L$(CURDIR)/lib
 
+pkg=mira-assembler
+
 %:
 	dh $@
 
 override_dh_auto_install :
-	make install DESTDIR=$(CURDIR)/debian/mira-assembler
+	make install DESTDIR=$(CURDIR)/debian/$(pkg)
 	#There is no installation target for the docs
-	mkdir -p $(CURDIR)/debian/tmp/usr/share/doc/mira-assembler
-	cp -r -t $(CURDIR)/debian/tmp/usr/share/doc/mira-assembler doc/docbook/bookfigures doc/docbook/images \
+	mkdir -p $(CURDIR)/debian/tmp/usr/share/doc/$(pkg)
+	cp -r -t $(CURDIR)/debian/tmp/usr/share/doc/$(pkg) doc/docbook/bookfigures doc/docbook/images \
 	    doc/docbook/doccss doc/docbook/DefinitiveGuideToMIRA.html || true
 
 override_dh_auto_test:
@@ -29,9 +31,14 @@
 #Remove unneeded .tcl extensions from scripts
 override_dh_install:
 	dh_install
-	if [ -d debian/mira-assembler ] ; then \
-	  for f in $$(ls debian/mira-assembler/usr/bin/*.tcl) ; do mv "$$f" "$${f%.tcl}"; done \
+	if [ -d debian/$(pkg) ] ; then \
+	  for f in $$(ls debian/$(pkg)/usr/bin/*.tcl) ; do mv "$$f" "$${f%.tcl}"; done \
 	fi
+	if [ -e debian/$(pkg)/usr/bin/miraSearchESTSNPs ] ; then \
+	    if [ "`debian/$(pkg)/usr/bin/miraSearchESTSNPs 2>&1 | tee`" = "De-activated atm, sorry." ] ; then rm -f debian/$(pkg)/usr/bin/miraSearchESTSNPs ; fi \
+	else \
+	    echo "debian/$(pkg)/usr/bin/miraSearchESTSNPs does not exist" ; \
+	fi
 
 #Must clean up the docs before cleaning out config.status
 #Then scrub some junk not picked up by 'make clean'