[med-svn] r8773 - trunk/packages/ensembl/ensembl/trunk/debian

[Andreas Tille]

Author: tille
Date: 2011-12-05 22:10:15 +0000 (Mon, 05 Dec 2011)
New Revision: 8773

Added:
   trunk/packages/ensembl/ensembl/trunk/debian/ensembl-bin.install
   trunk/packages/ensembl/ensembl/trunk/debian/ensembl.install
Removed:
   trunk/packages/ensembl/ensembl/trunk/debian/ensembl-bin.dirs
Modified:
   trunk/packages/ensembl/ensembl/trunk/debian/changelog
   trunk/packages/ensembl/ensembl/trunk/debian/ensembl.dirs
   trunk/packages/ensembl/ensembl/trunk/debian/rules
Log:
Move around files using dh_install instead of manual copying


Modified: trunk/packages/ensembl/ensembl/trunk/debian/changelog
===================================================================
--- trunk/packages/ensembl/ensembl/trunk/debian/changelog	2011-12-05 21:29:26 UTC (rev 8772)
+++ trunk/packages/ensembl/ensembl/trunk/debian/changelog	2011-12-05 22:10:15 UTC (rev 8773)
@@ -18,8 +18,13 @@
   * debian/rules:
     - use short dh with the same resulting package but a few less lintian
       issues
-  * ensembl.dirs: Do not create directories in /var/tmp which are created
-    in postinst anyway
+    - move some cp statements to ensembl(-bin).install
+    - remove some extra license files
+    - fix some permissions
+  * debian/ensembl.dirs:
+    - Do not create directories in /var/tmp which are created in postinst
+      anyway
+    - stripped down to the really needed bits
   * rename debian/prepare_ensembl_source_packages.sh to get-orig-source
     to comply with other packages
 

Deleted: trunk/packages/ensembl/ensembl/trunk/debian/ensembl-bin.dirs
===================================================================
--- trunk/packages/ensembl/ensembl/trunk/debian/ensembl-bin.dirs	2011-12-05 21:29:26 UTC (rev 8772)
+++ trunk/packages/ensembl/ensembl/trunk/debian/ensembl-bin.dirs	2011-12-05 22:10:15 UTC (rev 8773)
@@ -1 +0,0 @@
-usr/bin

Added: trunk/packages/ensembl/ensembl/trunk/debian/ensembl-bin.install
===================================================================
--- trunk/packages/ensembl/ensembl/trunk/debian/ensembl-bin.install	                        (rev 0)
+++ trunk/packages/ensembl/ensembl/trunk/debian/ensembl-bin.install	2011-12-05 22:10:15 UTC (rev 8773)
@@ -0,0 +1 @@
+ensembl-variation/C_code/calc_genotypes	usr/bin

Modified: trunk/packages/ensembl/ensembl/trunk/debian/ensembl.dirs
===================================================================
--- trunk/packages/ensembl/ensembl/trunk/debian/ensembl.dirs	2011-12-05 21:29:26 UTC (rev 8772)
+++ trunk/packages/ensembl/ensembl/trunk/debian/ensembl.dirs	2011-12-05 22:10:15 UTC (rev 8773)
@@ -1,7 +1,2 @@
-etc/default/ensembl.d
-var
-var/log
 var/log/ensembl
-var/cache
-var/cache/ensembl
 var/cache/ensembl/img-cache

Added: trunk/packages/ensembl/ensembl/trunk/debian/ensembl.install
===================================================================
--- trunk/packages/ensembl/ensembl/trunk/debian/ensembl.install	                        (rev 0)
+++ trunk/packages/ensembl/ensembl/trunk/debian/ensembl.install	2011-12-05 22:10:15 UTC (rev 8773)
@@ -0,0 +1,3 @@
+# copying files that are considered too different from the original
+# and/or the original too variable across releases to be patched
+debian/ensembl.overwrites/*.pm	etc/default/ensembl.d/

Modified: trunk/packages/ensembl/ensembl/trunk/debian/rules
===================================================================
--- trunk/packages/ensembl/ensembl/trunk/debian/rules	2011-12-05 21:29:26 UTC (rev 8772)
+++ trunk/packages/ensembl/ensembl/trunk/debian/rules	2011-12-05 22:10:15 UTC (rev 8773)
@@ -84,23 +84,18 @@
 	find debian -name Makefile.PL -o -name "*.tar.gz" | xargs -r rm -f
 	rm -rf debian/libensembl-variation-perl/usr/share/ensembl/ensembl-variation/C_code
 
-	dd="$(DESTDIR)-bin/usr/bin" ; \
-	if [ ! -d "$$$d" ]; then \
-		echo "Creating directory '$$dd'." ; \
-		mkdir -p "$$dd" ; \
-	fi ; \
-	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
-	# and/or the original too variable across releases to be patched
-	if [ ! -d "$(DESTDIR)/etc/default/ensembl.d" ]; then mkdir -p "$(DESTDIR)/etc/default/ensembl.d"; fi
-	cp debian/ensembl.overwrites/Plugins.pm        "$(DESTDIR)/etc/default/ensembl.d/"
-	cp debian/ensembl.overwrites/confSiteDefs.pm   "$(DESTDIR)/etc/default/ensembl.d/"
-	cp debian/ensembl.overwrites/pluginSiteDefs.pm "$(DESTDIR)/etc/default/ensembl.d/"
-	find debian/ensembl -name config.guess -o -name config.sub -o -name configure -o \
-		-name depcomp -o -name install-sh -o -name missing -o -name Makefile.PL | xargs -r rm
+#	find debian/ensembl -name config.guess -o -name config.sub -o -name configure -o \
+#		-name depcomp -o -name install-sh -o -name missing -o -name Makefile.PL | xargs -r rm
 
+override_dh_install:
+	dh_install
+	# do not ship extra license files
+	rm -f debian/libensembl-core-perl/usr/share/ensembl/ensembl/misc-scripts/alternative_splicing/AltSplicingToolkit/COPYING
+	rm -f debian/libensembl-core-perl/usr/share/ensembl/ensembl/LICENSE
+	# fix permissions
+	chmod a+x debian/libensembl-core-perl/usr/share/ensembl/ensembl/misc-scripts/golden_path/pfetch2ensembl
+
 override_dh_auto_clean:
 	dh_auto_clean
 	rm -f ensembl-variation/C_code/calc_genotypes.o ensembl-variation/C_code/calc_genotypes