[med-svn] r3132 - trunk/packages/emboss/trunk/debian

Sat Feb 21 07:14:30 UTC 2009

Author: plessy
Date: 2009-02-21 07:14:30 +0000 (Sat, 21 Feb 2009)
New Revision: 3132

Modified:
   trunk/packages/emboss/trunk/debian/changelog
   trunk/packages/emboss/trunk/debian/emboss.dirs
   trunk/packages/emboss/trunk/debian/emboss.install
   trunk/packages/emboss/trunk/debian/rules
Log:
Corrected output of `embossversion --full', and improved build system.

  * debian/rules:
     - Pass --bindir=/usr/lib/emboss directly instead of moving files.
     - Hardcode AJAX_FIXED_ROOT to /usr/share/EMBOSS (Closes: #487539)
  * debian/emboss.dir, debian/emboss.install: simplified after reworking
    the installation of the binaries and their symbolic links.


Modified: trunk/packages/emboss/trunk/debian/changelog
===================================================================

--- trunk/packages/emboss/trunk/debian/changelog	2009-02-19 12:57:17 UTC (rev 3131)
+++ trunk/packages/emboss/trunk/debian/changelog	2009-02-21 07:14:30 UTC (rev 3132)
@@ -7,6 +7,11 @@
   * New upstream patch (patch-1-4), removing unnecessary whitespaces in
     edialign.acd.
   * debian/control uses the official homepage URL as confirmed by Upstream.
+  * debian/rules:
+     - Pass --bindir=/usr/lib/emboss directly instead of moving files.
+     - Hardcode AJAX_FIXED_ROOT to /usr/share/EMBOSS (Closes: #487539)
+  * debian/emboss.dir, debian/emboss.install: simplified after reworking
+    the installation of the binaries and their symbolic links.
 
  -- Charles Plessy <plessy at debian.org>  Sun, 11 Jan 2009 15:09:08 +0900
 

Modified: trunk/packages/emboss/trunk/debian/emboss.dirs
===================================================================
--- trunk/packages/emboss/trunk/debian/emboss.dirs	2009-02-19 12:57:17 UTC (rev 3131)
+++ trunk/packages/emboss/trunk/debian/emboss.dirs	2009-02-21 07:14:30 UTC (rev 3132)
@@ -1,5 +1,4 @@
 usr/bin
 #usr/share/applications
-usr/lib
 etc/emboss/embossrc.d
 usr/share/man/man1

Modified: trunk/packages/emboss/trunk/debian/emboss.install
===================================================================
--- trunk/packages/emboss/trunk/debian/emboss.install	2009-02-19 12:57:17 UTC (rev 3131)
+++ trunk/packages/emboss/trunk/debian/emboss.install	2009-02-21 07:14:30 UTC (rev 3132)
@@ -1,3 +1,2 @@
-debian/emboss_tmp/usr/bin usr
 debian/emboss_tmp/usr/lib usr
 #debian/abiview.desktop usr/share/applications

Modified: trunk/packages/emboss/trunk/debian/rules
===================================================================
--- trunk/packages/emboss/trunk/debian/rules	2009-02-19 12:57:17 UTC (rev 3131)
+++ trunk/packages/emboss/trunk/debian/rules	2009-02-21 07:14:30 UTC (rev 3132)
@@ -5,25 +5,28 @@
 VERSION := $(shell dpkg-parsechangelog | grep Ver | cut -d' ' -f2 | cut -d- -f1)
 RENAMED := cons pscan
 
-EMBOSS-TMP = $(CURDIR)/debian/emboss_tmp
-AJAX = $(CURDIR)/debian/libajax6
-NUCLEUS = $(CURDIR)/debian/libnucleus6
+EMBOSS-TMP  = $(CURDIR)/debian/emboss_tmp
+EMBOSS      = $(CURDIR)/debian/emboss
+EMBOSS-TEST = $(CURDIR)/debian/emboss-test
+AJAX        = $(CURDIR)/debian/libajax6
+NUCLEUS     = $(CURDIR)/debian/libnucleus6
 
 config.status:
 	dh_testdir
 	ln -sf /usr/share/misc/config.sub .
 	ln -sf /usr/share/misc/config.guess .
-	./configure \
-		--prefix=/usr \
-		--with-java=/usr/lib/jvm/java-6-openjdk/include \
-		--with-javaos=/usr/lib/jvm/java-6-openjdk/include/linux \
+	./configure                                                     \
+		--prefix=/usr                                           \
+		--bindir=/usr/lib/emboss                                \
+		--with-java=/usr/lib/jvm/java-6-openjdk/include         \
+		--with-javaos=/usr/lib/jvm/java-6-openjdk/include/linux
 
 include /usr/share/quilt/quilt.make
 
 build: patch build-stamp debian/copyright
 build-stamp: config.status
 	dh_testdir
-	$(MAKE)
+	$(MAKE) AJAX_FIXED_ROOT=\\\"/usr/share/EMBOSS\\\"
 
 # In order to use this rule you must install libemboss-acd-perl, xsltproc, docbook-xml and docbook-xsl
 manpages: debian/manpages/success
@@ -43,14 +46,9 @@
 
 	find jemboss/ -type f -name "*.class" | xargs -r rm -f
 
-	rm -rf ajax/.libs/*
-	rm -rf emboss/.libs/*
-	rm -rf plplot/.libs/*
-	rm -rf nucleus/.libs/*
+	$(RM) debian/emboss_tmp
 
-	rm -rf debian/emboss_tmp
-
-	rm -rf config.status install-stamp
+	$(RM) config.status install-stamp
 	
 	# Temporary fix that may become unecessary in the future.
 	rm -f test/gb/Makefile test/wormpep/Makefile
@@ -69,19 +67,15 @@
 	### Binaries and data go to a temporary dir before being moved to their own package ###
 	$(MAKE) -C emboss install DESTDIR=$(EMBOSS-TMP)
 
-	### Binaries will be in /usr/lib/emboss, and symlinks are provided in /usr/bin. ###
-	if [ ! -d $(EMBOSS-TMP)/usr/lib/emboss ] ; \
-		then mkdir -p $(EMBOSS-TMP)/usr/lib/emboss ; \
-		fi
-	mv $(EMBOSS-TMP)/usr/bin/* $(EMBOSS-TMP)/usr/lib/emboss
-	cd $(EMBOSS-TMP)/usr/lib/emboss/ ; \
-		for i in * ; \
-		do ln -sf ../lib/emboss/$$i ../../bin/$$i ; \
+	# Make symbolic links from /usr/bin to /usr/lib/emboss
+	cd $(EMBOSS)/usr/bin/ ; \
+		for i in $(EMBOSS-TMP)/usr/lib/emboss/* ; \
+		do ln -sf ../lib/emboss/`basename $$i` . ; \
 		done
 
 	### Renaming conflicting binaries (see also in binary-arch) ###
 	for i in $(RENAMED) ; \
-		do mv $(EMBOSS-TMP)/usr/bin/$$i $(EMBOSS-TMP)/usr/bin/em_$$i ; \
+		do mv $(EMBOSS)/usr/bin/$$i $(EMBOSS)/usr/bin/em_$$i ; \
 		done
 
 	### Ajax library: lib and libdevel packages. ###
@@ -104,7 +98,7 @@
 	# Remove this file when the relicenced file becomes part of the upstream tarball.
 	uudecode -o $(CURDIR)/debian/emboss-doc/usr/share/EMBOSS/doc/manuals/EMBOSS_qg.pdf $(CURDIR)/debian/EMBOSS_qg_new.pdf.uu
 
-	$(MAKE) -C jemboss install DESTDIR=$(CURDIR)/debian/jemboss
+	$(MAKE) -C jemboss install DESTDIR=$(CURDIR)/debian/jemboss bindir=/usr/bin
 	# dangling LICEN[CS]E FILE
 	rm $(CURDIR)/debian/jemboss/usr/share/EMBOSS/jemboss/LICENSE
 


