haskell-hoogle: New upstream version 4.2.26

6 files changed, 13 insertions, 23 deletions

diff --git a/p/haskell-hoogle/debian/changelog b/p/haskell-hoogle/debian/changelog
index e26f84a2c..db8eb7490 100644
--- a/p/haskell-hoogle/debian/changelog
+++ b/p/haskell-hoogle/debian/changelog
@@ -1,3 +1,13 @@
+haskell-hoogle (4.2.26-1) UNRELEASED; urgency=medium
+
+  * New upstream release
+  * Drop fix-extract-tarball patch. It's already merged.
+  * Refresh add-local-loction-database.patch
+  * Fix apache2-reverse-dependency-uses-obsolete-directory
+  * Bump Standards-Version to 3.9.5 without any changes
+
+ -- Raúl Benencia <rul@kalgan.cc>  Thu, 13 Mar 2014 13:15:08 -0300
+
 haskell-hoogle (4.2.23-3) unstable; urgency=low
 
   * Brown paper bag bug in update-hoogle
diff --git a/p/haskell-hoogle/debian/control b/p/haskell-hoogle/debian/control
index 3253808ce..786063b44 100644
--- a/p/haskell-hoogle/debian/control
+++ b/p/haskell-hoogle/debian/control
@@ -56,7 +56,7 @@ Build-Depends-Indep: ghc-doc
                      , libghc-uniplate-doc
                      , libghc-wai-doc
                      , libghc-warp-doc
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 Homepage: http://www.haskell.org/hoogle/
 Vcs-Darcs: http://darcs.debian.org/pkg-haskell/haskell-hoogle
 Vcs-Browser: http://darcs.debian.org/cgi-bin/darcsweb.cgi?r=pkg-haskell/haskell-hoogle
diff --git a/p/haskell-hoogle/debian/hoogle.install b/p/haskell-hoogle/debian/hoogle.install
index 9c5747d2e..53a47137c 100644
--- a/p/haskell-hoogle/debian/hoogle.install
+++ b/p/haskell-hoogle/debian/hoogle.install
@@ -1,5 +1,5 @@
 debian/tmp-inst-*/usr/bin/* /usr/bin/
 debian/tmp-inst-*/usr/share/hoogle/* /usr/share/hoogle/
-debian/files_hoogle/hoogle.conf /etc/apache2/conf.d/
+debian/files_hoogle/hoogle.conf /etc/apache2/conf-available/
 debian/files_hoogle/keyword.txt /usr/share/hoogle/predownload/
 debian/files_hoogle/hoogle.png /usr/share/hoogle/resources/
diff --git a/p/haskell-hoogle/debian/patches/add-local-loction-database.patch b/p/haskell-hoogle/debian/patches/add-local-loction-database.patch
index 259539cb3..87e5da3a6 100644
--- a/p/haskell-hoogle/debian/patches/add-local-loction-database.patch
+++ b/p/haskell-hoogle/debian/patches/add-local-loction-database.patch
@@ -30,7 +30,7 @@
  data_ = Data
 --- a/src/Console/All.hs
 +++ b/src/Console/All.hs
-@@ -40,12 +40,15 @@
+@@ -39,12 +39,15 @@
 
  action (Log files) = logFiles files
 
diff --git a/p/haskell-hoogle/debian/patches/fix-extract-tarball.patch b/p/haskell-hoogle/debian/patches/fix-extract-tarball.patch
deleted file mode 100644
index a2fc0e595..000000000
--- a/p/haskell-hoogle/debian/patches/fix-extract-tarball.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Ask if a tarball exists before trying to extract its contents
- When a contents of the tarball are already present in the filesystem,
- hoogle will not download it again. In this case, the tarball must not be
- extracted because it does not exists.
-Bug: https://github.com/ndmitchell/hoogle/pull/35
-Author: Raúl Benencia <rul@kalgan.cc>
---- a/src/Recipe/Download.hs
-+++ b/src/Recipe/Download.hs
-@@ -47,8 +47,8 @@
-                 , (inputs <.> "txt", inputs <.> "tar.gz", "http://old.hackage.haskell.org/packages/archive/00-hoogle.tar.gz")
-                 ]
-     withDownloader opt downloader items
--    extractTarball cabals
--    extractTarball inputs
-+    doesFileExist (cabals <.> "tar.gz") >>= \b -> when b $ extractTarball cabals
-+    doesFileExist (inputs <.> "tar.gz") >>= \b -> when b $ extractTarball inputs
-
-
- check :: String -> IO (Maybe FilePath)
diff --git a/p/haskell-hoogle/debian/patches/series b/p/haskell-hoogle/debian/patches/series
index ef65a65c0..e0e0a8247 100644
--- a/p/haskell-hoogle/debian/patches/series
+++ b/p/haskell-hoogle/debian/patches/series
@@ -1,2 +1 @@
 add-local-loction-database.patch
-fix-extract-tarball.patch