[med-svn] r14275 - in trunk/packages/mobyle/mobyle/trunk/debian: . patches

[olivier sallou]

Author: osallou-guest
Date: 2013-07-30 14:20:11 +0000 (Tue, 30 Jul 2013)
New Revision: 14275

Modified:
   trunk/packages/mobyle/mobyle/trunk/debian/changelog
   trunk/packages/mobyle/mobyle/trunk/debian/control
   trunk/packages/mobyle/mobyle/trunk/debian/mobyle.conf
   trunk/packages/mobyle/mobyle/trunk/debian/patches/defaultconfig
Log:
new upstream release 1.5.1

Modified: trunk/packages/mobyle/mobyle/trunk/debian/changelog
===================================================================
--- trunk/packages/mobyle/mobyle/trunk/debian/changelog	2013-07-30 12:39:10 UTC (rev 14274)
+++ trunk/packages/mobyle/mobyle/trunk/debian/changelog	2013-07-30 14:20:11 UTC (rev 14275)
@@ -1,3 +1,9 @@
+mobyle (1.5.1+dfsg-1) UNRELEASED; urgency=low
+
+  * New upstream release
+
+ -- Olivier Sallou <osallou at debian.org>  Tue, 30 Jul 2013 16:01:45 +0200
+
 mobyle (1.5.0+dfsg-2) unstable; urgency=low
 
   * Transition to Apache 2.4 (Closes: #669884).

Modified: trunk/packages/mobyle/mobyle/trunk/debian/control
===================================================================
--- trunk/packages/mobyle/mobyle/trunk/debian/control	2013-07-30 12:39:10 UTC (rev 14274)
+++ trunk/packages/mobyle/mobyle/trunk/debian/control	2013-07-30 14:20:11 UTC (rev 14275)
@@ -20,6 +20,7 @@
  libjs-scriptaculous, libjs-jquery, libjs-prototype,
  mobyle-utils,
  jing,
+ python-biopython,
  python-imaging (>= 1.1.5),
  python-lxml (>= 2.2.4),
  python-pygraphviz,

Modified: trunk/packages/mobyle/mobyle/trunk/debian/mobyle.conf
===================================================================
--- trunk/packages/mobyle/mobyle/trunk/debian/mobyle.conf	2013-07-30 12:39:10 UTC (rev 14274)
+++ trunk/packages/mobyle/mobyle/trunk/debian/mobyle.conf	2013-07-30 14:20:11 UTC (rev 14275)
@@ -21,8 +21,7 @@
           Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch
           AllowOverride None
           Options FollowSymLinks
-          Order allow,deny
-          Allow from all
+          Require all granted
           SetEnv MOBYLEHOME /usr/share/mobyle/core
           AddDefaultCharset ISO-8859-1
         </Directory>
@@ -30,8 +29,7 @@
 	<Directory "/usr/share/mobyle/htdocs">
 		Options -Indexes +FollowSymLinks +MultiViews
 		AllowOverride None
-		Order allow,deny
-		allow from all
+		Require all granted
 	</Directory>
 
 

Modified: trunk/packages/mobyle/mobyle/trunk/debian/patches/defaultconfig
===================================================================
--- trunk/packages/mobyle/mobyle/trunk/debian/patches/defaultconfig	2013-07-30 12:39:10 UTC (rev 14274)
+++ trunk/packages/mobyle/mobyle/trunk/debian/patches/defaultconfig	2013-07-30 14:20:11 UTC (rev 14275)
@@ -20,18 +20,24 @@
  
  #########
  #       #
-@@ -96,8 +96,8 @@
+@@ -96,8 +96,14 @@
  from Mobyle.Converter import *
  
  DATA_CONVERTER={
 -      'Sequence': [ squizz_sequence('/path/to/squizz') ] ,
 -      'Alignment': [ squizz_alignment('/path/to/squizz')]
 +      'Sequence': [ squizz_sequence('/usr/bin/squizz') ] ,
-+      'Alignment': [ squizz_alignment('/usr/bin/squizz')]
++      'Alignment': [ squizz_alignment('/usr/bin/squizz'),
++                        fasta_phyml(None),
++                        phylipi_phyml(None),
++                        phylips_phyml(None),
++                        clustal_phyml(None),
++                        nexus_phyml(None),
++                        stockholm_phyml(None)]
                  }
  
  
-@@ -152,7 +152,7 @@
+@@ -152,7 +158,7 @@
  ## each element must be a valid path
  ## the element order is kept to build the final PATH ( the binary path is add before the canonical PATH )