[med-svn] r5201 - trunk/packages/ensembl/ensembl/57/debian/patches

[Richard Holland]

Author: holland-guest
Date: 2010-08-30 08:44:51 +0000 (Mon, 30 Aug 2010)
New Revision: 5201

Removed:
   trunk/packages/ensembl/ensembl/57/debian/patches/SiteDefs_ENSEMBL_BLOCK.patch
   trunk/packages/ensembl/ensembl/57/debian/patches/apache_mods.patch
Modified:
   trunk/packages/ensembl/ensembl/57/debian/patches/series
   trunk/packages/ensembl/ensembl/57/debian/patches/sitedefs_pm.patch
Log:
Refined and optimised patches for Ensembl web module.


Deleted: trunk/packages/ensembl/ensembl/57/debian/patches/SiteDefs_ENSEMBL_BLOCK.patch
===================================================================
--- trunk/packages/ensembl/ensembl/57/debian/patches/SiteDefs_ENSEMBL_BLOCK.patch	2010-08-29 22:46:57 UTC (rev 5200)
+++ trunk/packages/ensembl/ensembl/57/debian/patches/SiteDefs_ENSEMBL_BLOCK.patch	2010-08-30 08:44:51 UTC (rev 5201)
@@ -1,21 +0,0 @@
-Index: ensembl-57/public-plugins/mirror/conf/SiteDefs.pm
-===================================================================
---- ensembl-57.orig/public-plugins/mirror/conf/SiteDefs.pm	2010-08-26 23:30:46.445647758 +0200
-+++ ensembl-57/public-plugins/mirror/conf/SiteDefs.pm	2010-08-26 23:31:28.364623343 +0200
-@@ -19,11 +19,11 @@
- #  $SiteDefs::ENSEMBL_TMP_DIR_BLAST          = $SiteDefs::ENSEMBL_SERVERROOT."/blastqueue";
- #  $SiteDefs::ENSEMBL_BLASTSCRIPT            = $SiteDefs::ENSEMBL_SERVERROOT."/utils/runblast.pl";
- 
--#  $SiteDefs::ENSEMBL_USERDB_NAME            = 'ensembl_web_user_db';
--#  $SiteDefs::ENSEMBL_USERDB_USER            = 'ensembl';
--#  $SiteDefs::ENSEMBL_USERDB_HOST            = 'localhost';
--#  $SiteDefs::ENSEMBL_USERDB_PORT            =  3306;
--#  $SiteDefs::ENSEMBL_USERDB_PASS            = 'ensembl';
-+$SiteDefs::ENSEMBL_USERDB_NAME            = 'ensembl_web_user_db';
-+$SiteDefs::ENSEMBL_USERDB_USER            = 'ensembl';
-+$SiteDefs::ENSEMBL_USERDB_HOST            = 'localhost';
-+$SiteDefs::ENSEMBL_USERDB_PORT            =  3306;
-+$SiteDefs::ENSEMBL_USERDB_PASS            = 'ensembl';
- 
- $SiteDefs::ENSEMBL_LOGINS                 = 0; ## Change to 1 to turn user logins on
- }

Deleted: trunk/packages/ensembl/ensembl/57/debian/patches/apache_mods.patch
===================================================================
--- trunk/packages/ensembl/ensembl/57/debian/patches/apache_mods.patch	2010-08-29 22:46:57 UTC (rev 5200)
+++ trunk/packages/ensembl/ensembl/57/debian/patches/apache_mods.patch	2010-08-30 08:44:51 UTC (rev 5201)
@@ -1,25 +0,0 @@
-Index: ensembl-57/conf/httpd.conf
-===================================================================
---- ensembl-57.orig/conf/httpd.conf	2010-08-20 19:49:53.037579151 +0200
-+++ ensembl-57/conf/httpd.conf	2010-08-20 19:53:32.678574718 +0200
-@@ -15,16 +15,16 @@
- # Load the required apache modules (unless built-into httpd)
- # The .so files can be built with apxs if missing
- <IfModule !perl_module>
--LoadModule perl_module modules/mod_perl.so
-+LoadModule perl_module /usr/lib/apache2/modules/mod_perl.so
- </IfModule>
- <IfModule !deflate_module>
--LoadModule deflate_module modules/mod_deflate.so
-+LoadModule deflate_module /usr/lib/apache2/modules/mod_deflate.so
- </IfModule>
- <IfModule !headers_module>
--LoadModule headers_module modules/mod_headers.so
-+LoadModule headers_module /usr/lib/apache2/modules/mod_headers.so
- </IfModule>
- <IfModule !expires_module>
--LoadModule expires_module modules/mod_expires.so
-+LoadModule expires_module /usr/lib/apache2/modules/mod_expires.so
- </IfModule>
- #
- ####

Modified: trunk/packages/ensembl/ensembl/57/debian/patches/series
===================================================================
--- trunk/packages/ensembl/ensembl/57/debian/patches/series	2010-08-29 22:46:57 UTC (rev 5200)
+++ trunk/packages/ensembl/ensembl/57/debian/patches/series	2010-08-30 08:44:51 UTC (rev 5201)
@@ -1,5 +1,4 @@
 calc_genotypes_config.patch
-apache_mods.patch
 species_list.patch
 sitedefs_pm.patch
 defaults_ini.patch
@@ -8,4 +7,3 @@
 sessiondbconn.patch
 MULTI.ini.notforrelease57.patch
 httpd.patch
-SiteDefs_ENSEMBL_BLOCK.patch

Modified: trunk/packages/ensembl/ensembl/57/debian/patches/sitedefs_pm.patch
===================================================================
--- trunk/packages/ensembl/ensembl/57/debian/patches/sitedefs_pm.patch	2010-08-29 22:46:57 UTC (rev 5200)
+++ trunk/packages/ensembl/ensembl/57/debian/patches/sitedefs_pm.patch	2010-08-30 08:44:51 UTC (rev 5201)
@@ -24,11 +24,11 @@
 +#  $SiteDefs::ENSEMBL_TMP_DIR_BLAST          = $SiteDefs::ENSEMBL_SERVERROOT."/blastqueue";
 +#  $SiteDefs::ENSEMBL_BLASTSCRIPT            = $SiteDefs::ENSEMBL_SERVERROOT."/utils/runblast.pl";
 +
-+#  $SiteDefs::ENSEMBL_USERDB_NAME            = 'ensembl_web_user_db';
-+#  $SiteDefs::ENSEMBL_USERDB_USER            = 'ensembl';
-+#  $SiteDefs::ENSEMBL_USERDB_HOST            = 'localhost';
-+#  $SiteDefs::ENSEMBL_USERDB_PORT            =  3306;
-+#  $SiteDefs::ENSEMBL_USERDB_PASS            = 'ensembl';
++$SiteDefs::ENSEMBL_USERDB_NAME            = 'ensembl_web_user_db';
++$SiteDefs::ENSEMBL_USERDB_USER            = 'ensembl';
++$SiteDefs::ENSEMBL_USERDB_HOST            = 'localhost';
++$SiteDefs::ENSEMBL_USERDB_PORT            =  3306;
++$SiteDefs::ENSEMBL_USERDB_PASS            = 'ensembl';
 +
 +$SiteDefs::ENSEMBL_LOGINS                 = 0; ## Change to 1 to turn user logins on
 +}