[Pkg-emboss-commits] r47 - in emboss-explorer/trunk/debian: . patches

[hanska-guest at alioth.debian.org]

Author: hanska-guest
Date: 2007-05-25 08:17:58 +0000 (Fri, 25 May 2007)
New Revision: 47

Modified:
   emboss-explorer/trunk/debian/control
   emboss-explorer/trunk/debian/emboss-explorer.dirs
   emboss-explorer/trunk/debian/emboss-explorer.install
   emboss-explorer/trunk/debian/patches/04-fix_install.dpatch
Log:
Changing /var/www/emboss to /var/www/emboss-explorer, and
fixing debian/control.



Modified: emboss-explorer/trunk/debian/control
===================================================================
--- emboss-explorer/trunk/debian/control	2007-05-25 07:30:12 UTC (rev 46)
+++ emboss-explorer/trunk/debian/control	2007-05-25 08:17:58 UTC (rev 47)
@@ -4,14 +4,14 @@
 Maintainer: Debian EMBOSS Packaging Team <pkg-emboss-devel at lists.alioth.debian.org>
 Uploaders: David Paleino <d.paleino at gmail.com>
 Build-Depends: debhelper (>= 5)
-Build-Depends-Indep: xsltproc, docbook-xsl, docbook-xml, libparse-recdescent-perl, libmailtools-perl
+Build-Depends-Indep: xsltproc, docbook-xsl, docbook-xml, libparse-recdescent-perl, dpatch
 Standards-Version: 3.7.2
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-emboss/emboss-explorer/trunk/debian
 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-emboss/emboss-explorer/
 
 Package: emboss-explorer
 Architecture: all
-Depends: ${misc:Depends}, ${perl:Depends}, libparse-recdescent-perl, libmailtools-perl, emboss, libemboss-acd-perl, emboss-data
+Depends: ${misc:Depends}, ${perl:Depends}, libmailtools-perl, emboss, libemboss-acd-perl, emboss-data, apache | apache2 | httpd-cgi
 Recommends: emboss-doc
 Description: web-based GUI to EMBOSS
  EMBOSS explorer is a web-based graphical user interface

Modified: emboss-explorer/trunk/debian/emboss-explorer.dirs
===================================================================
--- emboss-explorer/trunk/debian/emboss-explorer.dirs	2007-05-25 07:30:12 UTC (rev 46)
+++ emboss-explorer/trunk/debian/emboss-explorer.dirs	2007-05-25 08:17:58 UTC (rev 47)
@@ -1,5 +1,5 @@
 usr/bin
 usr/lib/cgi-bin
 usr/share/images/emboss-explorer
-var/www/emboss/output
-var/www/emboss/style
+var/www/emboss-explorer/output
+var/www/emboss-explorer/style

Modified: emboss-explorer/trunk/debian/emboss-explorer.install
===================================================================
--- emboss-explorer/trunk/debian/emboss-explorer.install	2007-05-25 07:30:12 UTC (rev 46)
+++ emboss-explorer/trunk/debian/emboss-explorer.install	2007-05-25 08:17:58 UTC (rev 47)
@@ -1,9 +1,9 @@
 usr/share/perl5/EMBOSS/GUI/*
 usr/share/perl5/EMBOSS/GUI.pm
 
-../../html/index.html		var/www/emboss/
+../../html/index.html		var/www/emboss-explorer/
 ../../html/images/*			usr/share/images/emboss-explorer/
-../../html/style/*			var/www/emboss/style/
+../../html/style/*			var/www/emboss-explorer/style/
 ../../cgi/emboss			usr/lib/cgi-bin/
 ../../bin/*					usr/bin/
 ../../emboss-explorer.conf	etc/

Modified: emboss-explorer/trunk/debian/patches/04-fix_install.dpatch
===================================================================
--- emboss-explorer/trunk/debian/patches/04-fix_install.dpatch	2007-05-25 07:30:12 UTC (rev 46)
+++ emboss-explorer/trunk/debian/patches/04-fix_install.dpatch	2007-05-25 08:17:58 UTC (rev 47)
@@ -7,8 +7,8 @@
 
 @DPATCH@
 diff -urNad emboss-explorer~/install emboss-explorer/install
---- emboss-explorer~/install	2007-05-25 08:41:14.000000000 +0200
-+++ emboss-explorer/install	2007-05-25 08:41:42.000000000 +0200
+--- emboss-explorer~/install	2007-05-25 09:27:10.000000000 +0200
++++ emboss-explorer/install	2007-05-25 10:10:53.000000000 +0200
 @@ -1,68 +1,25 @@
  #!/bin/sh
 +BUILD_DIR=./debian/emboss-explorer
@@ -41,7 +41,7 @@
 -# TODO something fancy to guess the web root?
 -prompt "Where should the EMBOSS Explorer HTML files be installed?" /var/www/html/emboss HTML_PATH
 +EMBOSS_PREFIX=/usr
-+HTML_PATH=/var/www/emboss
++HTML_PATH=/var/www/emboss-explorer
  OUTPUT_PATH=$HTML_PATH/output
 -
 -prompt "What is the URL prefix corresponding to the HTML directory above?" /emboss HTML_URL