[med-svn] r5409 - trunk/packages/ensembl/ensembl/57/debian

[Steffen Möller]

Author: moeller
Date: 2010-11-02 22:14:26 +0000 (Tue, 02 Nov 2010)
New Revision: 5409

Added:
   trunk/packages/ensembl/ensembl/57/debian/adjust_chmod.sh
Removed:
   trunk/packages/ensembl/ensembl/57/debian/adjust_shebang_chmod.sh
Modified:
   trunk/packages/ensembl/ensembl/57/debian/rules
Log:
Fixed (hopefully) a bunch of lintian warnings.


Copied: trunk/packages/ensembl/ensembl/57/debian/adjust_chmod.sh (from rev 5408, trunk/packages/ensembl/ensembl/57/debian/adjust_shebang_chmod.sh)
===================================================================
--- trunk/packages/ensembl/ensembl/57/debian/adjust_chmod.sh	                        (rev 0)
+++ trunk/packages/ensembl/ensembl/57/debian/adjust_chmod.sh	2010-11-02 22:14:26 UTC (rev 5409)
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+for i in "$@"
+do
+	if head -n 1 $i | grep -q '^#!'; then 
+		chmod 755 "$i"
+	fi
+done

Deleted: trunk/packages/ensembl/ensembl/57/debian/adjust_shebang_chmod.sh
===================================================================
--- trunk/packages/ensembl/ensembl/57/debian/adjust_shebang_chmod.sh	2010-11-01 10:16:25 UTC (rev 5408)
+++ trunk/packages/ensembl/ensembl/57/debian/adjust_shebang_chmod.sh	2010-11-02 22:14:26 UTC (rev 5409)
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-for i in "$@"
-do
-	if head -n 1 $i | grep -q '^#!'; then 
-		chmod 755 "$i"
-	fi
-done

Modified: trunk/packages/ensembl/ensembl/57/debian/rules
===================================================================
--- trunk/packages/ensembl/ensembl/57/debian/rules	2010-11-01 10:16:25 UTC (rev 5408)
+++ trunk/packages/ensembl/ensembl/57/debian/rules	2010-11-02 22:14:26 UTC (rev 5409)
@@ -16,34 +16,33 @@
 	# nothing to be configured
 	touch configure-stamp
 
-build: build-arch
-	# for compatibility with regular debian/rules files
+build: build-indep-stamp build-arch
+build-arch: ensembl-variation/C_code/calc_genotypes
+ensembl-variation/C_code/calc_genotypes:
+	$(MAKE) -C ensembl-variation/C_code calc_genotypes
 
 build-indep: build-indep-stamp
 build-indep-stamp:
 	# nothing to build for the Perl packages or the database
 	# well, those bits should already have been fixed in the source tree, but, who knows...
-	find debian -name CVS -a -type d | xargs -r rm -r
-	find debian -name "*.pm" -o -name "*.png" -o -name "*.gif" -o -name README \
+	find . -name CVS -a -type d | xargs -r rm -r
+	find . -name "*.pm" -o -name "*.png" -o -name "*.gif" -o -name README \
                  -o -name "*.sql" -o -name "*.pdf" -o -name "*.html" | xargs -r chmod 644
-	find debian -name "*.pl" -o -name "*.t" | xargs -r chmod 755
+	find . -name "*.pl" -o -name "*.t" | xargs -r chmod 755
 
 	# First round of updates
-	find debian -name "*.pl" -o -name "*.sh" -o -name "*.t"  | xargs -r debian/adjust_shebang_line.sh
+	find . -name "*.pl" -o -name "*.sh" -o -name "*.t"  | xargs -r debian/adjust_shebang_line.sh
 
 	#d=$(DESTDIR)/usr/share/ensembl
 	echo "Adjusting path to Perl wherever it may be found" ; \
-	egrep -rl "^#!/.*/perl" debian | xargs -r sed -i '1s%^#!\s*/(usr|localsw)/.*/perl%#!/usr/bin/perl%' ; \
+	egrep -rl "^#!\s*/.*/perl" . | xargs -r sed -i '1s%^#!\s*/\(usr\|localsw\)/.*/perl%#!/usr/bin/perl%' ; \
 	echo "Adjusting path to Bash wherever it may be found" ; \
-	egrep -rl "^#!/.*/bash" debian | xargs -r sed -i '1s%^#!\s*/(usr|localsw)/.*/bash%#!/bin/bash%' ; \
+	egrep -rl "^#!\s*/.*/bash" . | xargs -r sed -i '1s%^#!\s*/\(usr\|localsw\)/.*/bash%#!/bin/bash%' ; \
 
 	# First round of updates
-	find debian -name "*.pl" -o -name "*.sh" -o -name "*.t" | xargs -r debian/adjust_shebang_chmod.sh
+	find . -name "*.pl" -o -name "*.sh" -o -name "*.t" | xargs -r debian/adjust_chmod.sh
 
 
-build-arch: ensembl-variation/C_code/calc_genotypes
-ensembl-variation/C_code/calc_genotypes:
-	$(MAKE) -C ensembl-variation/C_code calc_genotypes
 
 install-arch: build-arch
 	dh_testdir
@@ -54,7 +53,7 @@
 		echo "Creating directory '$$dd'." ; \
 		mkdir -p "$$dd" ; \
 	fi ; \
-	mv ensembl-variation/C_code/calc_genotypes $$dd
+	cp ensembl-variation/C_code/calc_genotypes $$dd
 
 install-indep: build-indep install-indep-copying
 	# copying files that are considered too different from the original