[med-svn] r9104 - in trunk/packages/ensembl/ensembl/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2011-12-25 23:24:19 +0000 (Sun, 25 Dec 2011)
New Revision: 9104

Modified:
   trunk/packages/ensembl/ensembl/trunk/debian/changelog
   trunk/packages/ensembl/ensembl/trunk/debian/control
   trunk/packages/ensembl/ensembl/trunk/debian/patches/do_not_advertise_csh.patch
Log:
No [t]csh dependency needed any more


Modified: trunk/packages/ensembl/ensembl/trunk/debian/changelog
===================================================================
--- trunk/packages/ensembl/ensembl/trunk/debian/changelog	2011-12-25 23:17:39 UTC (rev 9103)
+++ trunk/packages/ensembl/ensembl/trunk/debian/changelog	2011-12-25 23:24:19 UTC (rev 9104)
@@ -4,7 +4,7 @@
   * debian/control:
     - Fixed Vcs fields
     - Added myself to uploaders
-    - Depends: tcsh|c-shell instead of csh and tcsh
+    - No [t]csh dependency needed any more
     - Do not depend from perl which is installed anyway
     - Depends: jalview (and linked to jalview.jar in ensembl.links)
     - Depends: jemboss (and linked to jalviewApplet.jar in ensembl.links)

Modified: trunk/packages/ensembl/ensembl/trunk/debian/control
===================================================================
--- trunk/packages/ensembl/ensembl/trunk/debian/control	2011-12-25 23:17:39 UTC (rev 9103)
+++ trunk/packages/ensembl/ensembl/trunk/debian/control	2011-12-25 23:24:19 UTC (rev 9104)
@@ -17,7 +17,7 @@
 Package: ensembl
 Architecture: all
 Pre-Depends: debconf
-Depends: ${misc:Depends}, apache2-mpm-prefork, tcsh, expat,
+Depends: ${misc:Depends}, apache2-mpm-prefork, expat,
  libcgi-pm-perl, libcgi-session-perl, libdb-file-lock-perl, libdbd-mysql,
  perl-modules, ensembl-bin (>= ${source:Version}),
  libensembl-core-perl (= ${source:Version}),
@@ -41,7 +41,6 @@
  libole-storage-lite-perl, libparse-recdescent-perl, libspreadsheet-writeexcel-perl,
  libmime-types-perl, libmath-bezier-perl, librtf-writer-perl, libbio-das-lite-perl,
  bioperl1.2.3|bioperl
-Suggests: ksh | mksh | pdksh | zsh
 Section: non-free/science
 Description: basic Ensembl genome browser
  Ensembl is a joint project of the Sanger Center and the European
@@ -83,7 +82,7 @@
 Package: libensembl-core-perl
 Architecture: all
 Depends: ${misc:Depends},bioperl1.2.3|bioperl
-Suggests: ksh | mksh | pdksh | zsh, tk
+Suggests: tk
 Section: non-free/perl
 Description: core libraries of Ensembl API
  The Ensembl project presents the sequence data for the yet

Modified: trunk/packages/ensembl/ensembl/trunk/debian/patches/do_not_advertise_csh.patch
===================================================================
--- trunk/packages/ensembl/ensembl/trunk/debian/patches/do_not_advertise_csh.patch	2011-12-25 23:17:39 UTC (rev 9103)
+++ trunk/packages/ensembl/ensembl/trunk/debian/patches/do_not_advertise_csh.patch	2011-12-25 23:24:19 UTC (rev 9104)
@@ -415,3 +415,29 @@
 +. /localsw/ensembl_web/perlset
  
  /ensemblweb/head/utils/integration/deploy.pl /ensemblweb/head/utils/integration/deploy.yml
+--- ensembl-65.orig/conf/mime.types
++++ ensembl-65/conf/mime.types
+@@ -291,7 +291,6 @@
+ application/x-chess-pgn		pgn
+ application/x-compress
+ application/x-cpio		cpio
+-application/x-csh		csh
+ application/x-director		dcr dir dxr
+ application/x-dvi		dvi
+ application/x-futuresplash	spl
+--- ensembl-65.orig/ensembl/misc-scripts/xref_mapping/docs/xrefs_overview.txt
++++ ensembl-65/ensembl/misc-scripts/xref_mapping/docs/xrefs_overview.txt
+@@ -49,12 +49,7 @@
+ Before running the Xref parser, make sure that the environment
+ variable 'http_proxy' is set to point to the local HTTP proxy to get
+ outside the firewall.  For Sanger, the value of the variable should be
+-"http://cache.internal.sanger.ac.uk:3128", i.e. for tcsh shells you
+-should have
+-
+-    setenv http_proxy http://cache.internal.sanger.ac.uk:3128
+-
+-in your ~/.tcshrc file, while for bash-like shell you should have
++"http://cache.internal.sanger.ac.uk:3128", i.e. for bash-like shell you should have
+ 
+     export http_proxy=http://cache.internal.sanger.ac.uk:3128
+