[med-svn] r9713 - in trunk/packages/gmod/gbrowse/trunk/debian: . patches

[olivier sallou]

Author: osallou-guest
Date: 2012-02-19 15:37:17 +0000 (Sun, 19 Feb 2012)
New Revision: 9713

Modified:
   trunk/packages/gmod/gbrowse/trunk/debian/changelog
   trunk/packages/gmod/gbrowse/trunk/debian/control
   trunk/packages/gmod/gbrowse/trunk/debian/patches/debian-packaging-patch
   trunk/packages/gmod/gbrowse/trunk/debian/patches/gbrowse-slave-fix_defaults_path
Log:
update with new upstream release

Modified: trunk/packages/gmod/gbrowse/trunk/debian/changelog
===================================================================
--- trunk/packages/gmod/gbrowse/trunk/debian/changelog	2012-02-19 14:33:10 UTC (rev 9712)
+++ trunk/packages/gmod/gbrowse/trunk/debian/changelog	2012-02-19 15:37:17 UTC (rev 9713)
@@ -1,3 +1,11 @@
+gbrowse (2.47-1) UNRELEASED; urgency=low
+
+  * new upstream release
+  * debian/control: add libbiographics-perl dependency
+  * Waiting for libbiographics-perl package upgrade to 2.26
+
+ -- Olivier Sallou <olivier.sallou at irisa.fr>  Sun, 19 Feb 2012 15:59:53 +0100
+
 gbrowse (2.42~dfsg-1) unstable; urgency=low
 
   * New upstream release

Modified: trunk/packages/gmod/gbrowse/trunk/debian/control
===================================================================
--- trunk/packages/gmod/gbrowse/trunk/debian/control	2012-02-19 14:33:10 UTC (rev 9712)
+++ trunk/packages/gmod/gbrowse/trunk/debian/control	2012-02-19 15:37:17 UTC (rev 9713)
@@ -3,7 +3,7 @@
 Priority: optional
 Build-Depends: bioperl (>= 1.6.901), debhelper (>= 8),
  libbio-graphics-perl (>= 2.09), libcapture-tiny-perl,
- libcgi-session-perl (>= 4.02),
+ libcgi-session-perl (>= 4.02), libbio-graphics-perl (>= 2.26),
  libgd-gd2-perl (>= 2.07) | libgd-gd2-noxpm-perl (>= 2.07), libio-string-perl,
  libjson-perl, libstatistics-descriptive-perl, libwww-perl, libhttp-daemon-perl, perl,
  perl (>= 5.10.0) | libextutils-cbuilder-perl, sqlite3,libdbd-sqlite3-perl, libterm-readkey-perl, libjs-prototype (>=1.7), libjs-scriptaculous (>= 1.9)
@@ -20,7 +20,7 @@
 Architecture: all
 Depends: ${misc:Depends}, ${perl:Depends},
  bioperl (>= 1.6.901), libbio-graphics-perl (>= 2.09),
- libcgi-session-perl (>= 4.02),
+ libcgi-session-perl (>= 4.02), libbio-graphics-perl (>= 2.26),
  libgd-gd2-noxpm-perl (>= 2.07) | libgd-gd2-perl (>= 2.07), libio-string-perl,
  libjson-perl, libstatistics-descriptive-perl, libwww-perl, libhttp-daemon-perl, perl,
  perl (>= 5.10.0) | libextutils-cbuilder-perl, libterm-readkey-perl, sqlite3, libdbd-sqlite3-perl, libjs-prototype (>=1.7), libjs-scriptaculous (>=1.9)

Modified: trunk/packages/gmod/gbrowse/trunk/debian/patches/debian-packaging-patch
===================================================================
--- trunk/packages/gmod/gbrowse/trunk/debian/patches/debian-packaging-patch	2012-02-19 14:33:10 UTC (rev 9712)
+++ trunk/packages/gmod/gbrowse/trunk/debian/patches/debian-packaging-patch	2012-02-19 15:37:17 UTC (rev 9713)
@@ -91,7 +91,7 @@
  </ul>
  
  <p>
-@@ -56,12 +56,11 @@
+@@ -56,13 +56,13 @@
  <li><a href="/gb2/gbrowse/yeast">http://your.host/gb2/gbrowse/yeast</a></li>
  <li><a href="/gb2/gbrowse/yeast_advanced">http://your.host/gb2/gbrowse/yeast_advanced</a></li>
  <li><a href="/gb2/gbrowse/yeast_renderfarm">http://your.host/gb2/gbrowse/yeast_renderfarm</a></li>
@@ -99,13 +99,15 @@
  </ul>
  
  <h3>Accelerated Demos</h3>
--
+ 
 -If you have FastCGI and/or ModPerl installed, you will have access to
+-an accelerated version of gbrowse at these URLs:
 +By default, FastCGI and ModPerl are not set by gbrowse installation,
 +However, if you have FastCGI and/or ModPerl installed, you will have access to
- accelerated versions of gbrowse a these URLs:
++ accelerated versions of gbrowse a these URLs:
  
  <ul>
+   <li>FastCGI
 --- a/install_util/GBrowseInstall.pm
 +++ b/install_util/GBrowseInstall.pm
 @@ -32,6 +32,7 @@
@@ -116,7 +118,7 @@
      );
  my %OK_PROPS = @OK_PROPS;
  
-@@ -419,6 +420,83 @@
+@@ -421,6 +422,83 @@
  END
  }
  
@@ -200,7 +202,7 @@
  sub ACTION_install {
      my $self = shift;
      my $prefix = $self->install_base || $self->prefix || '';
-@@ -748,8 +826,9 @@
+@@ -750,8 +828,9 @@
  sub guess_user_account_db {
      my $self = shift;
      if (eval "require DBD::SQLite; 1") {

Modified: trunk/packages/gmod/gbrowse/trunk/debian/patches/gbrowse-slave-fix_defaults_path
===================================================================
--- trunk/packages/gmod/gbrowse/trunk/debian/patches/gbrowse-slave-fix_defaults_path	2012-02-19 14:33:10 UTC (rev 9712)
+++ trunk/packages/gmod/gbrowse/trunk/debian/patches/gbrowse-slave-fix_defaults_path	2012-02-19 15:37:17 UTC (rev 9713)
@@ -1,10 +1,10 @@
 Subject: fix default path on debian
 Author: Olivier Sallou <olivier.sallou at irisa.fr>
-Description: update path to be debian compliant
-Last-Updated: 18/10/2011
+Description: update path to be debian compliant, add description
+Last-Updated: 19/02/2012
 --- a/etc/init.d/gbrowse-slave
 +++ b/etc/init.d/gbrowse-slave
-@@ -1,6 +1,6 @@
+@@ -1,11 +1,12 @@
  #!/bin/sh
  ### BEGIN INIT INFO
 -# Provides:          gbrowse_slave
@@ -12,7 +12,13 @@
  # Required-Start:    $remote_fs $syslog
  # Required-Stop:     $remote_fs $syslog
  # Default-Start:     2 3 4 5
-@@ -24,8 +24,8 @@
+ # Default-Stop:      0 1 6
+ # Short-Description: Start/Stop the gbrowse_slave rendering server.
++# Description: Enable the GBrowse slave rendering mode
+ ### END INIT INFO
+ 
+ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+@@ -24,8 +25,8 @@
  VERBOSITY=1
  NICE=0