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

[Andreas Tille]

Author: tille
Date: 2011-12-26 15:18:22 +0000 (Mon, 26 Dec 2011)
New Revision: 9107

Added:
   trunk/packages/ensembl/ensembl/trunk/debian/patches/use_ksh_only_if_needed.patch
Removed:
   trunk/packages/ensembl/ensembl/trunk/debian/docs
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
   trunk/packages/ensembl/ensembl/trunk/debian/patches/series
Log:
Only one package that contains ksh files


Modified: trunk/packages/ensembl/ensembl/trunk/debian/changelog
===================================================================
--- trunk/packages/ensembl/ensembl/trunk/debian/changelog	2011-12-25 23:30:57 UTC (rev 9106)
+++ trunk/packages/ensembl/ensembl/trunk/debian/changelog	2011-12-26 15:18:22 UTC (rev 9107)
@@ -13,6 +13,8 @@
     - ensembl contains scripts explicitly requiring tcsh, so remove
       c-shell alternatives
     - no need for ${shlibs:Depends} in ensembl (arch=all)
+    - libensembl-core-perl Depends: ksh | mksh | pdksh | zsh
+      because this package really contains such scripts
   * debian/prepare_ensembl_source_packages.sh:
     - Make sure the files that should be removed will be really removed
     - Make script way less noisy
@@ -62,6 +64,9 @@
     csh is not tested).  Because csh-considered-harmful we do not like
     to advertise csh for no need at all and the patch is just dropping
     csh references.
+  * debian/patches/use_ksh_only_if_needed.patch: convert last remaining
+    script in ensembl that uses ksh to bash to get rid of useless
+    dependency
 
  -- Andreas Tille <tille at debian.org>  Thu, 15 Dec 2011 19:01:29 +0100
 

Modified: trunk/packages/ensembl/ensembl/trunk/debian/control
===================================================================
--- trunk/packages/ensembl/ensembl/trunk/debian/control	2011-12-25 23:30:57 UTC (rev 9106)
+++ trunk/packages/ensembl/ensembl/trunk/debian/control	2011-12-26 15:18:22 UTC (rev 9107)
@@ -81,7 +81,7 @@
 
 Package: libensembl-core-perl
 Architecture: all
-Depends: ${misc:Depends},bioperl1.2.3|bioperl
+Depends: ${misc:Depends}, ksh | mksh | pdksh | zsh, bioperl1.2.3 | bioperl
 Suggests: tk
 Section: non-free/perl
 Description: core libraries of Ensembl API

Deleted: trunk/packages/ensembl/ensembl/trunk/debian/docs
===================================================================
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:30:57 UTC (rev 9106)
+++ trunk/packages/ensembl/ensembl/trunk/debian/patches/do_not_advertise_csh.patch	2011-12-26 15:18:22 UTC (rev 9107)
@@ -407,7 +407,7 @@
 +++ ensembl-65/utils/integration/deploy.sh
 @@ -1,6 +1,6 @@
 -#! /usr/bin/tcsh
-+#!/usr/bin/sh
++#!/bin/sh
  
 -setenv CVS_RSH ssh
 -source /localsw/ensembl_web/perlset

Modified: trunk/packages/ensembl/ensembl/trunk/debian/patches/series
===================================================================
--- trunk/packages/ensembl/ensembl/trunk/debian/patches/series	2011-12-25 23:30:57 UTC (rev 9106)
+++ trunk/packages/ensembl/ensembl/trunk/debian/patches/series	2011-12-26 15:18:22 UTC (rev 9107)
@@ -8,3 +8,4 @@
 SiteDefs_tmpdir.patch
 fix_usr_bin_env_typo.patch
 do_not_advertise_csh.patch
+use_ksh_only_if_needed.patch

Added: trunk/packages/ensembl/ensembl/trunk/debian/patches/use_ksh_only_if_needed.patch
===================================================================
--- trunk/packages/ensembl/ensembl/trunk/debian/patches/use_ksh_only_if_needed.patch	                        (rev 0)
+++ trunk/packages/ensembl/ensembl/trunk/debian/patches/use_ksh_only_if_needed.patch	2011-12-26 15:18:22 UTC (rev 9107)
@@ -0,0 +1,33 @@
+--- ensembl-65.orig/utils/server_maintenance/cvs_update_web_only.sh
++++ ensembl-65/utils/server_maintenance/cvs_update_web_only.sh
+@@ -1,4 +1,4 @@
+-#!/bin/ksh
++#!/bin/bash
+ 
+ # A simple script to run CVS update on directories used by webteam
+ # (thus avoiding breaking the API mid-release-cycle!)
+@@ -16,8 +16,8 @@
+   : # We're in the right place
+ else
+   # We don't know where we are or where we're supposed to be
+-  print -u2 "Please runt this script from the 'utils' directory"
+-  print -u2 "or from its parent directory"
++  echo "Please runt this script from the 'utils' directory"
++  echo "or from its parent directory"
+   exit 1
+ fi
+ 
+@@ -27,10 +27,10 @@
+   echo "Updating directory $var..."
+   (
+     cd $var
+-    print "********** CVS UPDATE - $var **********"
++    echo "********** CVS UPDATE - $var **********"
+     cvs -q up -dP
+   ) >>$logfile 2>&1
+ done 
+ 
+-print "CVS update complete!"
+-print "Output written to $logfile"
++echo "CVS update complete!"
++echo "Output written to $logfile"