[med-svn] r6502 - trunk/packages/gbrowse/trunk/debian/patches

[Charles Plessy]

Author: plessy
Date: 2011-04-10 09:13:35 +0000 (Sun, 10 Apr 2011)
New Revision: 6502

Modified:
   trunk/packages/gbrowse/trunk/debian/patches/debian-packaging-patch
Log:
Patch refreshed with ?\226?\128?\156quilt refresh?\226?\128?\157.

This changes nothing, but will make the next commit more readable.


Modified: trunk/packages/gbrowse/trunk/debian/patches/debian-packaging-patch
===================================================================
--- trunk/packages/gbrowse/trunk/debian/patches/debian-packaging-patch	2011-04-09 18:56:56 UTC (rev 6501)
+++ trunk/packages/gbrowse/trunk/debian/patches/debian-packaging-patch	2011-04-10 09:13:35 UTC (rev 6502)
@@ -1,6 +1,8 @@
 Patch to fit debian packaging - Olivier Sallou - February 2011
---- a/install_util/GBrowseInstall.pm
-+++ b/install_util/GBrowseInstall.pm
+Index: gbrowse-2.26~dfsg.orig/install_util/GBrowseInstall.pm
+===================================================================
+--- gbrowse-2.26~dfsg.orig.orig/install_util/GBrowseInstall.pm	2011-04-10 18:12:23.000000000 +0900
++++ gbrowse-2.26~dfsg.orig/install_util/GBrowseInstall.pm	2011-04-10 18:12:26.000000000 +0900
 @@ -403,6 +403,85 @@
  END
  }
@@ -87,8 +89,10 @@
  sub ACTION_install {
      my $self = shift;
      my $prefix = $self->install_base || $self->prefix || '';
---- a/etc/init.d/gbrowse-slave
-+++ b/etc/init.d/gbrowse-slave
+Index: gbrowse-2.26~dfsg.orig/etc/init.d/gbrowse-slave
+===================================================================
+--- gbrowse-2.26~dfsg.orig.orig/etc/init.d/gbrowse-slave	2011-04-10 18:12:23.000000000 +0900
++++ gbrowse-2.26~dfsg.orig/etc/init.d/gbrowse-slave	2011-04-10 18:12:26.000000000 +0900
 @@ -1,10 +1,10 @@
  #!/bin/sh
  ### BEGIN INIT INFO
@@ -104,23 +108,27 @@
  # Short-Description: Start/Stop the gbrowse_slave rendering server.
  ### END INIT INFO
  
---- a/etc/default/gbrowse-slave
-+++ b/etc/default/gbrowse-slave
+Index: gbrowse-2.26~dfsg.orig/etc/default/gbrowse-slave
+===================================================================
+--- gbrowse-2.26~dfsg.orig.orig/etc/default/gbrowse-slave	2011-04-10 18:12:23.000000000 +0900
++++ gbrowse-2.26~dfsg.orig/etc/default/gbrowse-slave	2011-04-10 18:12:26.000000000 +0900
 @@ -2,9 +2,9 @@
  
  export PERL5LIB=$PERL5LIB
  
+-DAEMON=$INSTALLSCRIPT/gbrowse_slave
+-USER=$WWWUSER
+-PRELOAD=$CONF/slave_preload.conf
 +DAEMON=/usr/bin/gbrowse_slave
 +USER=www-data
 +PRELOAD=/etc/gbrowse/slave_preload.conf
--DAEMON=$INSTALLSCRIPT/gbrowse_slave
--USER=$WWWUSER
--PRELOAD=$CONF/slave_preload.conf
  RUNDIR=/var/run/gbrowse
  LOGDIR=/var/log/gbrowse
  PORT="8101 8102 8103"
---- a/bin/gbrowse_metadb_config.pl
-+++ b/bin/gbrowse_metadb_config.pl
+Index: gbrowse-2.26~dfsg.orig/bin/gbrowse_metadb_config.pl
+===================================================================
+--- gbrowse-2.26~dfsg.orig.orig/bin/gbrowse_metadb_config.pl	2011-04-10 18:12:23.000000000 +0900
++++ gbrowse-2.26~dfsg.orig/bin/gbrowse_metadb_config.pl	2011-04-10 18:12:26.000000000 +0900
 @@ -21,7 +21,10 @@
  my @argv = @ARGV;
  
@@ -145,8 +153,10 @@
  fix_sqlite_permissions() if $type =~ /sqlite/i;
  
  $database->disconnect;
---- a/htdocs/index.html
-+++ b/htdocs/index.html
+Index: gbrowse-2.26~dfsg.orig/htdocs/index.html
+===================================================================
+--- gbrowse-2.26~dfsg.orig.orig/htdocs/index.html	2011-04-10 18:12:23.000000000 +0900
++++ gbrowse-2.26~dfsg.orig/htdocs/index.html	2011-04-10 18:12:26.000000000 +0900
 @@ -24,7 +24,7 @@
    <dd><a href="example_scripts">$HTDOCS/example_scripts</a></dd>
  </dl>