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

[Olivier Sallou]

Author: osallou
Date: 2013-02-18 11:10:10 +0000 (Mon, 18 Feb 2013)
New Revision: 13032

Modified:
   trunk/packages/mobyle/mobyle/trunk/debian/changelog
   trunk/packages/mobyle/mobyle/trunk/debian/control
   trunk/packages/mobyle/mobyle/trunk/debian/patches/change_mobylehome
   trunk/packages/mobyle/mobyle/trunk/debian/patches/defaultconfig
Log:
update for new upstream release

Modified: trunk/packages/mobyle/mobyle/trunk/debian/changelog
===================================================================
--- trunk/packages/mobyle/mobyle/trunk/debian/changelog	2013-02-18 10:48:51 UTC (rev 13031)
+++ trunk/packages/mobyle/mobyle/trunk/debian/changelog	2013-02-18 11:10:10 UTC (rev 13032)
@@ -1,3 +1,9 @@
+mobyle (1.5+dfsg-1) UNRELEASED; urgency=low
+
+  * New upstream release
+
+ -- Olivier Sallou <osallou at debian.org>  Tue, 04 Sep 2012 13:38:32 +0200
+
 mobyle (1.0.7+dfsg-1) unstable; urgency=low
 
   [ Olivier Sallou ]

Modified: trunk/packages/mobyle/mobyle/trunk/debian/control
===================================================================
--- trunk/packages/mobyle/mobyle/trunk/debian/control	2013-02-18 10:48:51 UTC (rev 13031)
+++ trunk/packages/mobyle/mobyle/trunk/debian/control	2013-02-18 11:10:10 UTC (rev 13032)
@@ -5,7 +5,7 @@
 DM-Upload-Allowed: yes
 Uploaders: Olivier Sallou <osallou at debian.org>
 Build-Depends: debhelper (>= 8.9.7), python (>= 2.5), python-simpletal (>=4.1), python-simplejson (>= 1.7.1), python-imaging (>= 1.1.5), python-lxml (>= 2.2.4)
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
 Homepage: https://projets.pasteur.fr/projects/show/mobyle
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/mobyle/mobyle/trunk/
 Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/mobyle/mobyle/trunk/
@@ -16,10 +16,9 @@
 # see INSTALL
  python-simpletal (<< 5.0~), python-support (>= 0.90), python-pygraphviz,
  python-simplejson (>= 1.7.1), python-imaging (>= 1.1.5),
- python-lxml (>= 2.2.4), squizz, libjs-scriptaculous, libjs-jquery, libjs-prototype, mobyle-utils, jing, ttf-bitstream-vera
+ python-lxml (>= 2.2.4), squizz (>=0.99b+dfsg), libjs-scriptaculous, libjs-jquery, libjs-prototype, mobyle-utils, jing, ttf-bitstream-vera
 Suggests: python-openid (>= 2.2.4), python-dnspython (>= 1.5.0)
-Recommends: mobyle-programs (>= 4.0)
-Breaks: mobyle-programs (<< 4.0-1)
+Recommends: mobyle-programs (>= 5.1)
 Description: Web portal that provides web forms for command-line software
  Mobyle is a framework and web portal specifically aimed at the integration of 
  bioinformatics software and databanks. It generates a web interface from an xml

Modified: trunk/packages/mobyle/mobyle/trunk/debian/patches/change_mobylehome
===================================================================
--- trunk/packages/mobyle/mobyle/trunk/debian/patches/change_mobylehome	2013-02-18 10:48:51 UTC (rev 13031)
+++ trunk/packages/mobyle/mobyle/trunk/debian/patches/change_mobylehome	2013-02-18 11:10:10 UTC (rev 13032)
@@ -3,15 +3,15 @@
 Last-Update: 2011-08-09
 --- a/setup.py
 +++ b/setup.py
-@@ -123,9 +123,9 @@
-     l = f.readline()
-     if not l: break
-     if mob and l == 'MOBYLEHOME = None\n':
--      l = l.replace('None', "'"+mob+"'", 1)
-+      l = l.replace('None', "'debian/mobyle/usr/share/mobyle/core'", 1)
-     if htm and l == 'MOBYLEHTDOCS = None\n':
--      l = l.replace('None', "'"+htm+"'", 1)
-+      l = l.replace('None', "'debian/mobyle/usr/share/mobyle/htdocs'", 1)
-     g.write(l)
-   g.close()
-   f.close()
+@@ -147,9 +147,9 @@
+         if not l: 
+             break
+         if mob and l == 'MOBYLEHOME = None\n':
+-            l = l.replace('None', "'"+mob+"'", 1)
++            l = l.replace('None', "'debian/mobyle/usr/share/mobyle/core'", 1)
+         if htm and l == 'MOBYLEHTDOCS = None\n':
+-            l = l.replace('None', "'"+htm+"'", 1)
++            l = l.replace('None', "'debian/mobyle/usr/share/mobyle/htdocs'", 1)
+         g.write(l)
+     g.close()
+     f.close()

Modified: trunk/packages/mobyle/mobyle/trunk/debian/patches/defaultconfig
===================================================================
--- trunk/packages/mobyle/mobyle/trunk/debian/patches/defaultconfig	2013-02-18 10:48:51 UTC (rev 13031)
+++ trunk/packages/mobyle/mobyle/trunk/debian/patches/defaultconfig	2013-02-18 11:10:10 UTC (rev 13032)
@@ -3,10 +3,10 @@
 Last-Update: 2011-08-09
 --- a/Example/Local/Config/Config.template.py
 +++ b/Example/Local/Config/Config.template.py
-@@ -10,13 +10,13 @@
- 
- 
+@@ -12,13 +12,13 @@
  # the root url of mobyle 
+ # warning: do NOT include the port number if it is 80, it is useless
+ # and creates problems on the server
 -ROOT_URL = "http://mydomain.fr:port"
 +ROOT_URL = "http://localhost"
  
@@ -20,7 +20,7 @@
  
  #########
  #       #
-@@ -94,8 +94,8 @@
+@@ -96,8 +96,8 @@
  from Mobyle.Converter import *
  
  DATA_CONVERTER={
@@ -31,7 +31,7 @@
                  }
  
  
-@@ -150,7 +150,7 @@
+@@ -152,7 +152,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 )