[med-svn] r17438 - in trunk/packages/gmod/gbrowse/trunk/debian: . patches
Olivier Sallou
osallou at moszumanska.debian.org
Thu Jul 10 05:34:00 UTC 2014
Author: osallou
Date: 2014-07-10 05:33:59 +0000 (Thu, 10 Jul 2014)
New Revision: 17438
Added:
trunk/packages/gmod/gbrowse/trunk/debian/gbrowse.conf
trunk/packages/gmod/gbrowse/trunk/debian/patches/source_init_functions
Removed:
trunk/packages/gmod/gbrowse/trunk/debian/gbrowse_apache2.conf
Modified:
trunk/packages/gmod/gbrowse/trunk/debian/changelog
trunk/packages/gmod/gbrowse/trunk/debian/control
trunk/packages/gmod/gbrowse/trunk/debian/gbrowse.apache2
trunk/packages/gmod/gbrowse/trunk/debian/patches/series
Log:
follow policy rules and rmeove lintian warnings
Modified: trunk/packages/gmod/gbrowse/trunk/debian/changelog
===================================================================
--- trunk/packages/gmod/gbrowse/trunk/debian/changelog 2014-07-09 13:54:34 UTC (rev 17437)
+++ trunk/packages/gmod/gbrowse/trunk/debian/changelog 2014-07-10 05:33:59 UTC (rev 17438)
@@ -11,8 +11,13 @@
* Normalised debian/copyright and debian/control with config-model-edit.
* Conforms to Policy version 3.9.5.
- -- gregor herrmann <gregoa at debian.org> Mon, 30 Jun 2014 23:07:52 +0200
+ [ Olivier Sallou ]
+ * Community upload
+ * d/patches/source_init_functions: follow Policy 3.9.5
+ * d/control: add missing build deps
+ -- Olivier Sallou <osallou at debian.org> Mon, 30 Jun 2014 23:07:52 +0200
+
gbrowse (2.54+dfsg-2) unstable; urgency=low
* Transition to apache 2.4 (Closes: #669830).
Modified: trunk/packages/gmod/gbrowse/trunk/debian/control
===================================================================
--- trunk/packages/gmod/gbrowse/trunk/debian/control 2014-07-09 13:54:34 UTC (rev 17437)
+++ trunk/packages/gmod/gbrowse/trunk/debian/control 2014-07-10 05:33:59 UTC (rev 17438)
@@ -8,6 +8,7 @@
Build-Depends: bioperl (>= 1.6.901),
debhelper (>= 9),
dh-apache2,
+ apache2-dev,
libbio-graphics-perl (>= 2.31),
libcapture-tiny-perl,
libcgi-session-perl,
Modified: trunk/packages/gmod/gbrowse/trunk/debian/gbrowse.apache2
===================================================================
--- trunk/packages/gmod/gbrowse/trunk/debian/gbrowse.apache2 2014-07-09 13:54:34 UTC (rev 17437)
+++ trunk/packages/gmod/gbrowse/trunk/debian/gbrowse.apache2 2014-07-10 05:33:59 UTC (rev 17438)
@@ -1 +1 @@
-conf debian/gbrowse_apache2.conf
+conf debian/gbrowse.conf
Copied: trunk/packages/gmod/gbrowse/trunk/debian/gbrowse.conf (from rev 17437, trunk/packages/gmod/gbrowse/trunk/debian/gbrowse_apache2.conf)
===================================================================
--- trunk/packages/gmod/gbrowse/trunk/debian/gbrowse.conf (rev 0)
+++ trunk/packages/gmod/gbrowse/trunk/debian/gbrowse.conf 2014-07-10 05:33:59 UTC (rev 17438)
@@ -0,0 +1,62 @@
+Alias "/gbrowse2/i/" "/var/cache/gbrowse/images/"
+Alias "/gbrowse2" "/usr/share/gbrowse/htdocs"
+ScriptAlias "/gb2" "/usr/lib/cgi-bin/gbrowse"
+
+<Directory "/usr/share/gbrowse/htdocs">
+ AllowOverride Options
+ Options -Indexes -MultiViews +FollowSymLinks
+ Require all granted
+</Directory>
+
+<Directory "/usr/share/gbrowse/htdocs/tutorial">
+ Options +Indexes
+</Directory>
+
+<Directory "/var/cache/gbrowse/images/">
+ Require all granted
+</Directory>
+
+<Directory "/var/lib/gbrowse/databases">
+ Require all granted
+</Directory>
+
+<Directory "/usr/lib/cgi-bin/gbrowse">
+
+ Options ExecCGI
+ SetEnv GBROWSE_CONF "/etc/gbrowse"
+</Directory>
+
+<IfModule mod_fcgid.c>
+ Alias /fgb2 "/usr/lib/cgi-bin/gbrowse"
+ <Location /fgb2>
+ SetHandler fcgid-script
+ </Location>
+ FcgidInitialEnv GBROWSE_CONF /etc/gbrowse
+ # these directives prevent idle/busy timeouts and may need to be
+ # adjusted up or down
+ FcgidMinProcessesPerClass 6
+ FcgidIOTimeout 600
+ FcgidBusyTimeout 600
+
+</IfModule>
+
+<IfModule mod_fastcgi.c>
+ Alias /fgb2 "/usr/lib/cgi-bin/gbrowse"
+ <Location /fgb2>
+ SetHandler fastcgi-script
+ </Location>
+ # Note: you may need to increase -idle-timeout if file uploads are timing out and returning server
+ # errors.
+ FastCgiConfig -idle-timeout 600 -maxClassProcesses 20 -initial-env GBROWSE_CONF=/etc/gbrowse
+</IfModule>
+
+# Use of mod_perl is no longer supported. Use at your own risk.
+<IfModule mod_perl.c>
+ Alias /mgb2 "/usr/lib/cgi-bin/gbrowse"
+
+ <Location /mgb2>
+ SetHandler perl-script
+ PerlResponseHandler ModPerl::Registry
+ PerlOptions +ParseHeaders
+ </Location>
+</IfModule>
Deleted: trunk/packages/gmod/gbrowse/trunk/debian/gbrowse_apache2.conf
===================================================================
--- trunk/packages/gmod/gbrowse/trunk/debian/gbrowse_apache2.conf 2014-07-09 13:54:34 UTC (rev 17437)
+++ trunk/packages/gmod/gbrowse/trunk/debian/gbrowse_apache2.conf 2014-07-10 05:33:59 UTC (rev 17438)
@@ -1,62 +0,0 @@
-Alias "/gbrowse2/i/" "/var/cache/gbrowse/images/"
-Alias "/gbrowse2" "/usr/share/gbrowse/htdocs"
-ScriptAlias "/gb2" "/usr/lib/cgi-bin/gbrowse"
-
-<Directory "/usr/share/gbrowse/htdocs">
- AllowOverride Options
- Options -Indexes -MultiViews +FollowSymLinks
- Require all granted
-</Directory>
-
-<Directory "/usr/share/gbrowse/htdocs/tutorial">
- Options +Indexes
-</Directory>
-
-<Directory "/var/cache/gbrowse/images/">
- Require all granted
-</Directory>
-
-<Directory "/var/lib/gbrowse/databases">
- Require all granted
-</Directory>
-
-<Directory "/usr/lib/cgi-bin/gbrowse">
-
- Options ExecCGI
- SetEnv GBROWSE_CONF "/etc/gbrowse"
-</Directory>
-
-<IfModule mod_fcgid.c>
- Alias /fgb2 "/usr/lib/cgi-bin/gbrowse"
- <Location /fgb2>
- SetHandler fcgid-script
- </Location>
- FcgidInitialEnv GBROWSE_CONF /etc/gbrowse
- # these directives prevent idle/busy timeouts and may need to be
- # adjusted up or down
- FcgidMinProcessesPerClass 6
- FcgidIOTimeout 600
- FcgidBusyTimeout 600
-
-</IfModule>
-
-<IfModule mod_fastcgi.c>
- Alias /fgb2 "/usr/lib/cgi-bin/gbrowse"
- <Location /fgb2>
- SetHandler fastcgi-script
- </Location>
- # Note: you may need to increase -idle-timeout if file uploads are timing out and returning server
- # errors.
- FastCgiConfig -idle-timeout 600 -maxClassProcesses 20 -initial-env GBROWSE_CONF=/etc/gbrowse
-</IfModule>
-
-# Use of mod_perl is no longer supported. Use at your own risk.
-<IfModule mod_perl.c>
- Alias /mgb2 "/usr/lib/cgi-bin/gbrowse"
-
- <Location /mgb2>
- SetHandler perl-script
- PerlResponseHandler ModPerl::Registry
- PerlOptions +ParseHeaders
- </Location>
-</IfModule>
Modified: trunk/packages/gmod/gbrowse/trunk/debian/patches/series
===================================================================
--- trunk/packages/gmod/gbrowse/trunk/debian/patches/series 2014-07-09 13:54:34 UTC (rev 17437)
+++ trunk/packages/gmod/gbrowse/trunk/debian/patches/series 2014-07-10 05:33:59 UTC (rev 17438)
@@ -4,3 +4,4 @@
fix_pop_url
skipRenderFarmTest_UpstreamBug12
skip_check_installed_test.patch
+source_init_functions
Added: trunk/packages/gmod/gbrowse/trunk/debian/patches/source_init_functions
===================================================================
--- trunk/packages/gmod/gbrowse/trunk/debian/patches/source_init_functions (rev 0)
+++ trunk/packages/gmod/gbrowse/trunk/debian/patches/source_init_functions 2014-07-10 05:33:59 UTC (rev 17438)
@@ -0,0 +1,16 @@
+Subject: init.d script does not source init functions
+Description: Follow Debian policy to add init-functions
+Author: Olivier Sallou <osallou at debian.org>
+Last-Updated: 2014-07-10
+Forwarded: no
+--- a/etc/init.d/gbrowse-slave
++++ b/etc/init.d/gbrowse-slave
+@@ -25,6 +25,8 @@
+ VERBOSITY=1
+ NICE=0
+
++. /lib/lsb/init-functions
++
+ if [ -f /etc/default/gbrowse-slave ]; then
+ . /etc/default/gbrowse-slave
+ fi
More information about the debian-med-commit
mailing list