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

[Charles Plessy]

Author: plessy
Date: 2011-04-09 11:46:36 +0000 (Sat, 09 Apr 2011)
New Revision: 6495

Removed:
   trunk/packages/gbrowse/trunk/debian/gbrowse-slave
Modified:
   trunk/packages/gbrowse/trunk/debian/patches/debian-packaging-patch
   trunk/packages/gbrowse/trunk/debian/rules
Log:
Modify etc/default/gbrowse-slave through a patch, to be consistent with /etc/init.d/gbrowse-slave.

Also, the execution bit does not need to be set.


Deleted: trunk/packages/gbrowse/trunk/debian/gbrowse-slave
===================================================================
--- trunk/packages/gbrowse/trunk/debian/gbrowse-slave	2011-04-09 11:27:10 UTC (rev 6494)
+++ trunk/packages/gbrowse/trunk/debian/gbrowse-slave	2011-04-09 11:46:36 UTC (rev 6495)
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-export PERL5LIB=$PERL5LIB
-
-DAEMON=/usr/bin/gbrowse_slave
-USER=www-data
-PRELOAD=/etc/gbrowse/slave_preload.conf
-RUNDIR=/var/run/gbrowse
-LOGDIR=/var/log/gbrowse
-PORT="8101 8102 8103"
-VERBOSITY=3
-NICE=0

Modified: trunk/packages/gbrowse/trunk/debian/patches/debian-packaging-patch
===================================================================
--- trunk/packages/gbrowse/trunk/debian/patches/debian-packaging-patch	2011-04-09 11:27:10 UTC (rev 6494)
+++ trunk/packages/gbrowse/trunk/debian/patches/debian-packaging-patch	2011-04-09 11:46:36 UTC (rev 6495)
@@ -104,6 +104,21 @@
  # Short-Description: Start/Stop the gbrowse_slave rendering server.
  ### END INIT INFO
  
+--- a/etc/default/gbrowse-slave
++++ b/etc/default/gbrowse-slave
+@@ -2,9 +2,9 @@
+ 
+ export PERL5LIB=$PERL5LIB
+ 
++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
 @@ -21,7 +21,10 @@

Modified: trunk/packages/gbrowse/trunk/debian/rules
===================================================================
--- trunk/packages/gbrowse/trunk/debian/rules	2011-04-09 11:27:10 UTC (rev 6494)
+++ trunk/packages/gbrowse/trunk/debian/rules	2011-04-09 11:46:36 UTC (rev 6495)
@@ -22,7 +22,6 @@
 	./Build   apache_conf > debian/gbrowse/etc/gbrowse/apache2.conf
 	perl Build.PL $(GBROWSE_BUILD_OPTIONS) --installetc=y
 	./Build  --install_base=debian/gbrowse install_slave
-	cp debian/gbrowse-slave debian/gbrowse/etc/default/
 	mv debian/gbrowse/lib/perl5/*/* debian/gbrowse/usr/share/perl5/
 	# Remove arch dependant data
 	mv debian/gbrowse/usr/share/perl5/auto/Bio/Graphics/Browser2/CAlign/* debian/gbrowse-calign/usr/lib/perl5/auto/Bio/Graphics/Browser2/CAlign/
@@ -36,7 +35,6 @@
 	rm -f debian/gbrowse/usr/share/gbrowse/htdocs/js/scriptaculous.js
 	chmod 644 debian/gbrowse/etc/gbrowse/MobyServices/text_xml_renderer.pm
 	chmod 644 debian/gbrowse/etc/gbrowse/synteny/oryza.synconf.disabled
-	chmod 755 debian/gbrowse/etc/default/gbrowse-slave
 	#Rename pl scripts in bin
 	rename 's/\.pl//' debian/gbrowse/bin/*.pl
 	mv debian/gbrowse/bin debian/gbrowse/usr/bin