[DHG_packages] 09/15: hoogle: Remove CGI settings

[Ilias Tsitsimpis]

This is an automated email from the git hooks/post-receive script.

iliastsi-guest pushed a commit to branch master
in repository DHG_packages.

commit d00b1608db15bad0ab11a03d25593c8b6458e6b2
Author: Ilias Tsitsimpis <i.tsitsimpis at gmail.com>
Date:   Fri Oct 28 19:20:49 2016 +0300

    hoogle: Remove CGI settings
    
    Hoogle 4 was a CGI binary, served through Apache, while Hoogle 5
    is a Haskell Warp server.
    Document the above change in d/NEWS.
    
    Closes: #773781
---
 p/haskell-hoogle/debian/changelog                |  4 ++++
 p/haskell-hoogle/debian/control                  |  6 +-----
 p/haskell-hoogle/debian/files_hoogle/hoogle.conf | 11 -----------
 p/haskell-hoogle/debian/hoogle.NEWS              |  8 ++++++++
 p/haskell-hoogle/debian/hoogle.dirs              |  2 --
 p/haskell-hoogle/debian/hoogle.install           |  1 -
 p/haskell-hoogle/debian/hoogle.links             |  1 -
 7 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/p/haskell-hoogle/debian/changelog b/p/haskell-hoogle/debian/changelog
index 1159254..04f46c3 100644
--- a/p/haskell-hoogle/debian/changelog
+++ b/p/haskell-hoogle/debian/changelog
@@ -17,6 +17,10 @@ haskell-hoogle (5.0.1-3) UNRELEASED; urgency=medium
     at the same database. Debian uses this in the update-hoogle command.
   * Rewrite `update-hoogle' script to work with the latest version.
   * Patch hoogle to use the Debian database by default.
+  * Remove CGI settings (Closes: #773781).
+    Hoogle 4 was a CGI binary, served through Apache, while Hoogle 5
+    is a Haskell Warp server.
+    Document the above change in d/NEWS.
 
  -- Ilias Tsitsimpis <i.tsitsimpis at gmail.com>  Fri, 28 Oct 2016 13:02:02 +0300
 
diff --git a/p/haskell-hoogle/debian/control b/p/haskell-hoogle/debian/control
index 1d25da3..eb48686 100644
--- a/p/haskell-hoogle/debian/control
+++ b/p/haskell-hoogle/debian/control
@@ -167,13 +167,9 @@ Depends:
  ${haskell:Depends},
  ${misc:Depends},
  ${shlibs:Depends},
-Suggests:
- apache2 | httpd,
 Description: Haskell API Search for Debian system
  Hoogle is a Haskell API search engine, which allows you to
  search many standard Haskell libraries by either function name,
  or by approximate type signature.
  .
- This package contains the hoogle command and cgi settings.
- If you have a webserver installed, you can access the hoogle web interface at
- http://localhost/cgi-bin/hoogle.
+ This package contains the hoogle command.
diff --git a/p/haskell-hoogle/debian/files_hoogle/hoogle.conf b/p/haskell-hoogle/debian/files_hoogle/hoogle.conf
deleted file mode 100644
index 67f9dab..0000000
--- a/p/haskell-hoogle/debian/files_hoogle/hoogle.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-# Apache config for hoogle
-
-# Disable execution of hoogle from remote hosts
-<Location /cgi-bin/hoogle>
-    order deny,allow
-    deny from all
-    allow from localhost 127.0.0.1
-    # allow from .your_domain.com
-</Location>
-
-# End hoogle config
diff --git a/p/haskell-hoogle/debian/hoogle.NEWS b/p/haskell-hoogle/debian/hoogle.NEWS
new file mode 100644
index 0000000..7cc2f54
--- /dev/null
+++ b/p/haskell-hoogle/debian/hoogle.NEWS
@@ -0,0 +1,8 @@
+haskell-hoogle (5.0.1-3) UNRELEASED; urgency=medium
+
+  Hoogle 5 is no longer a CGI binary, served through Apache. Instead,
+  it implements its own HTTP server using the Haskell Warp library.
+
+  For more information, see `hoogle server --help`.
+
+ -- Ilias Tsitsimpis <i.tsitsimpis at gmail.com>  Fri, 28 Oct 2016 19:15:02 +0300
diff --git a/p/haskell-hoogle/debian/hoogle.dirs b/p/haskell-hoogle/debian/hoogle.dirs
index 491e680..e425229 100644
--- a/p/haskell-hoogle/debian/hoogle.dirs
+++ b/p/haskell-hoogle/debian/hoogle.dirs
@@ -1,5 +1,3 @@
 usr/bin
 usr/sbin
-usr/share/hoogle/tool
 var/lib/hoogle/databases
-var/www
diff --git a/p/haskell-hoogle/debian/hoogle.install b/p/haskell-hoogle/debian/hoogle.install
index 3aeb522..f9123b1 100644
--- a/p/haskell-hoogle/debian/hoogle.install
+++ b/p/haskell-hoogle/debian/hoogle.install
@@ -1,3 +1,2 @@
-debian/files_hoogle/hoogle.conf /etc/apache2/conf-available/
 debian/tmp-inst-*/usr/bin/* /usr/bin/
 debian/tmp-inst-*/usr/share/hoogle/* /usr/share/hoogle/
diff --git a/p/haskell-hoogle/debian/hoogle.links b/p/haskell-hoogle/debian/hoogle.links
index 81423c3..255fba3 100644
--- a/p/haskell-hoogle/debian/hoogle.links
+++ b/p/haskell-hoogle/debian/hoogle.links
@@ -1,3 +1,2 @@
-usr/bin/hoogle usr/lib/cgi-bin/hoogle
 usr/share/javascript/jquery/jquery.min.js usr/share/hoogle/resources/jquery.js
 var/lib/hoogle/databases usr/share/hoogle/databases

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/DHG_packages.git