[med-svn] r8166 - trunk/packages/gmod/gbrowse/trunk/debian/patches

[olivier sallou]

Author: osallou-guest
Date: 2011-10-18 14:05:44 +0000 (Tue, 18 Oct 2011)
New Revision: 8166

Modified:
   trunk/packages/gmod/gbrowse/trunk/debian/patches/debian-packaging-patch
Log:
remove fuzz from patch

Modified: trunk/packages/gmod/gbrowse/trunk/debian/patches/debian-packaging-patch
===================================================================
--- trunk/packages/gmod/gbrowse/trunk/debian/patches/debian-packaging-patch	2011-10-18 13:54:48 UTC (rev 8165)
+++ trunk/packages/gmod/gbrowse/trunk/debian/patches/debian-packaging-patch	2011-10-18 14:05:44 UTC (rev 8166)
@@ -40,7 +40,7 @@
 +PRELOAD=/etc/gbrowse/slave_preload.conf
  RUNDIR=/var/run/gbrowse
  LOGDIR=/var/log/gbrowse
- PORT="8101 8102 8103"
+ PREFORK=3
 --- a/bin/gbrowse_metadb_config.pl
 +++ b/bin/gbrowse_metadb_config.pl
 @@ -21,7 +21,10 @@
@@ -70,7 +70,7 @@
 --- a/htdocs/index.html
 +++ b/htdocs/index.html
 @@ -24,7 +24,7 @@
-   <dd><a href="example_scripts">$HTDOCS/example_scripts</a></dd>
+   <dd><a href="example_scripts">/var/www/gbrowse2/example_scripts</a></dd>
  </dl>
  
 -<h2>Example Databases</h2>
@@ -95,7 +95,7 @@
  <ul>
 --- a/install_util/GBrowseInstall.pm
 +++ b/install_util/GBrowseInstall.pm
-@@ -28,6 +28,7 @@
+@@ -32,6 +32,7 @@
  		wwwuser       => 'User account under which Apache daemon runs?',
  		installconf   => 'Automatically update Apache config files to run GBrowse?',
  		installetc    => 'Automatically update system config files to run gbrowse-slave?',
@@ -103,7 +103,7 @@
      );
  my %OK_PROPS = @OK_PROPS;
  
-@@ -403,6 +404,83 @@
+@@ -419,6 +420,83 @@
  END
  }
  
@@ -187,7 +187,7 @@
  sub ACTION_install {
      my $self = shift;
      my $prefix = $self->install_base || $self->prefix || '';
-@@ -717,8 +795,9 @@
+@@ -748,8 +826,9 @@
  sub guess_user_account_db {
      my $self = shift;
      if (eval "require DBD::SQLite; 1") {
@@ -201,7 +201,7 @@
      } else {
 --- a/conf/GBrowse.conf
 +++ b/conf/GBrowse.conf
-@@ -158,9 +158,9 @@
+@@ -161,9 +161,9 @@
  # "user_accounts" is true, then GBrowse
  # will attempt to use its internal user accounts database
  # to authenticate and/or register users.