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

[Steffen Möller]

Author: moeller
Date: 2010-08-28 22:11:34 +0000 (Sat, 28 Aug 2010)
New Revision: 5196

Modified:
   trunk/packages/ensembl/ensembl/57/debian/control
   trunk/packages/ensembl/ensembl/57/debian/ensembl.dirs
   trunk/packages/ensembl/ensembl/57/debian/ensembl.links
   trunk/packages/ensembl/ensembl/57/debian/postinst
   trunk/packages/ensembl/ensembl/57/debian/rules
Log:
Round of updates for the Ensembl package.


Modified: trunk/packages/ensembl/ensembl/57/debian/control
===================================================================
--- trunk/packages/ensembl/ensembl/57/debian/control	2010-08-27 12:28:44 UTC (rev 5195)
+++ trunk/packages/ensembl/ensembl/57/debian/control	2010-08-28 22:11:34 UTC (rev 5196)
@@ -34,3 +34,15 @@
  .
  We will work to try and remove these dependencies and allow Ensembl
  to run on an up-do-date machine.
+
+Package: ensembl-bin
+Architecture: any
+Description: platform-specific files of Ensembl
+ The Ensembl website is mostly implemented in Perl. But just a few
+ bits do appear as binaries. Those are gathered in this package.
+
+Package: ensembl-doc
+Section: doc
+Architecture: all
+Description: tutorials and othe documentation for Ensembl
+ The description will follow once we know what is in there :)

Modified: trunk/packages/ensembl/ensembl/57/debian/ensembl.dirs
===================================================================
--- trunk/packages/ensembl/ensembl/57/debian/ensembl.dirs	2010-08-27 12:28:44 UTC (rev 5195)
+++ trunk/packages/ensembl/ensembl/57/debian/ensembl.dirs	2010-08-28 22:11:34 UTC (rev 5196)
@@ -1,6 +1,6 @@
-usr/share/ensembl
 usr/bin
-var/log/ensembl/logs
+var/log
+usr/share/ensembl/logs
 var/cache/ensembl/img-cache
 var/tmp/ensembl/img-tmp
 var/tmp/ensembl/tmp

Modified: trunk/packages/ensembl/ensembl/57/debian/ensembl.links
===================================================================
--- trunk/packages/ensembl/ensembl/57/debian/ensembl.links	2010-08-27 12:28:44 UTC (rev 5195)
+++ trunk/packages/ensembl/ensembl/57/debian/ensembl.links	2010-08-28 22:11:34 UTC (rev 5196)
@@ -1,4 +1,4 @@
-usr/share/ensembl/logs var/log/ensembl/logs
+usr/share/ensembl/logs var/log/ensembl
 usr/share/ensembl/img-cache var/cache/ensembl/img-cache
 usr/share/ensembl/img-tmp var/tmp/ensembl/img-tmp
 usr/share/ensembl/tmp var/tmp/ensembl/tmp

Modified: trunk/packages/ensembl/ensembl/57/debian/postinst
===================================================================
--- trunk/packages/ensembl/ensembl/57/debian/postinst	2010-08-27 12:28:44 UTC (rev 5195)
+++ trunk/packages/ensembl/ensembl/57/debian/postinst	2010-08-28 22:11:34 UTC (rev 5196)
@@ -20,22 +20,25 @@
 
 case "$1" in
     configure)
-	#a2enmod perl
-	#a2enmod deflate
-	#a2enmod expires
-	#a2enmod headers
+	a2enmod perl
+	a2enmod deflate
+	a2enmod expires
+	a2enmod headers
 	mysql -uroot << EOMYSQL
 drop database if exists ensembl_web_user_db;
 create database ensembl_web_user_db;
 grant all privileges on ensembl_web_user_db.* to ensembl@'%' identified by 'ensembl';
 grant all privileges on ensembl_web_user_db.* to ensembl at localhost identified by 'ensembl';
 EOMYSQL
+	echo "Preparing a series of directories."
 	zcat /usr/share/doc/ensembl/ensembl_web_user_db.sql.gz | mysql -uensembl -pensembl ensembl_web_user_db
-	for d in var/log/ensembl/logs /var/cache/ensembl/img-cache /var/tmp/ensembl/img-tmp /var/tmp/ensembl/tmp
+	for d in var/log/ensembl /var/cache/ensembl/img-cache /var/tmp/ensembl/img-tmp /var/tmp/ensembl/tmp
 	do
-		if [ ! -d "$d" ]; then mkdir -p "$d"; fi
-		chown nobody.nogroup "$d"
-		chmod 755 "$d"
+		if [ ! -d "$d" ]; then
+			mkdir -p "$d"
+			chown nobody.nogroup "$d"
+			chmod 755 "$d"
+		fi
 	done
     ;;
 

Modified: trunk/packages/ensembl/ensembl/57/debian/rules
===================================================================
--- trunk/packages/ensembl/ensembl/57/debian/rules	2010-08-27 12:28:44 UTC (rev 5195)
+++ trunk/packages/ensembl/ensembl/57/debian/rules	2010-08-28 22:11:34 UTC (rev 5196)
@@ -32,7 +32,7 @@
 	dh_testdir
 	dh_testroot
 	dh_prep
-	d=$(DESTDIR)/usr/share/ensembl ; \
+	d="$(DESTDIR)/usr/share/ensembl" ; \
 	if [ ! -d "$$d" ]; then \
 		echo "Creating directory '$$d'." ; \
 		mkdir -p "$$d" ; \
@@ -41,13 +41,23 @@
 		ensembl-draw ensembl-external \
 		ensembl-functgenomics ensembl-variation \
 		htdocs modules perl public-plugins utils \
-	    $$d
-	d=$(DESTDIR)/usr/bin ; \
-	if [ ! -d "$$d" ]; then \
-		echo "Creating directory '$$d'." ; \
-		mkdir -p "$$d" ; \
+	    $$d ; \
+	dd="$(DESTDIR)-bin/usr/bin" ; \
+	if [ ! -d "$$$d" ]; then \
+		echo "Creating directory '$$dd'." ; \
+		mkdir -p "$$dd" ; \
 	fi ; \
-	mv ensembl-variation/C_code/calc_genotypes $$d
+	mv $$d/ensembl-variation/C_code/calc_genotypes $$dd ; \
+	ddd="$(DESTDIR)-doc/usr/share/doc/ensembl" ; \
+	cd $$d; \
+	for dddd in */docs ; \
+	do \
+		ddddd=`dirname $$dddd` ; \
+		dddddd="$$ddd/usr/$$ddddd" ; \
+		echo "moving documentation from $$dddd to $$dddddd" ; \
+		mkdir -p "$$dddddd" ; \
+		mv $$dddd/* $$dddddd/ ; \
+	done
 	touch $@
 
 install-paths: install-copying