[Pkg-haskell-commits] darcs: ftphs: New upstream release, dropping patches

[Joachim Breitner]

Wed Aug 21 20:35:09 UTC 2013  Joachim Breitner <mail at joachim-breitner.de>
  * New upstream release, dropping patches

    R ./patches/ghc-7.6-compatibility
    R ./patches/series
    R ./patches/
    M ./changelog -1 +1

Wed Aug 21 20:35:09 UTC 2013  Joachim Breitner <mail at joachim-breitner.de>
  * New upstream release, dropping patches
diff -rN -u old-ftphs/changelog new-ftphs/changelog
--- old-ftphs/changelog	2013-08-21 20:37:34.510542461 +0000
+++ new-ftphs/changelog	2013-08-21 20:37:34.530541109 +0000
@@ -1,6 +1,6 @@
 ftphs (1.0.9.1-1) UNRELEASED; urgency=low
 
-  * New upstream release
+  * New upstream release, dropping patches
 
  -- Joachim Breitner <nomeata at debian.org>  Wed, 21 Aug 2013 22:34:44 +0200
 
diff -rN -u old-ftphs/patches/ghc-7.6-compatibility new-ftphs/patches/ghc-7.6-compatibility
--- old-ftphs/patches/ghc-7.6-compatibility	2013-08-21 20:37:34.510542461 +0000
+++ new-ftphs/patches/ghc-7.6-compatibility	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-Description: Port to work with catch from Control.Exception as found in GHC 7.6
-Author: Iain Lane <iain.lane at canonical.com>
-Forwarded: yes
-
---- ftphs-1.0.8.orig/src/Network/FTP/Server.hs
-+++ ftphs-1.0.8/src/Network/FTP/Server.hs
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE ScopedTypeVariables #-}
- {- arch-tag: FTP server support
- Copyright (C) 2004 John Goerzen <jgoerzen at complete.org>
- 
-@@ -98,7 +99,7 @@ import Text.Printf
- import Data.Char
- import Data.IORef
- import Data.List
--import Control.Exception(finally)
-+import Control.Exception(finally, try, catch, IOException)
- import System.IO
- 
- data DataType = ASCII | Binary
-@@ -168,8 +169,8 @@ trapIOError :: FTPServer -> IO a -> (a -
- trapIOError h testAction remainingAction =
-     do result <- try testAction
-        case result of
--         Left err -> do sendReply h 550 (show err)
--                        return True
-+         Left (err :: IOException) -> do sendReply h 550 (show err)
-+                                         return True
-          Right result -> remainingAction result
- 
- forceLogin :: CommandHandler -> CommandHandler
-@@ -214,7 +215,7 @@ commandLoop h@(FTPServer fh _ _) =
-                                     ("Closing due to error: " ++ (show e))
-                             hClose fh
-                             return False
--        in do continue <- (flip catch) errorhandler 
-+        in do continue <- (flip catch) (\(e :: IOException) -> errorhandler e)
-                (do x <- parseCommand fh
-                    case x of
-                      Left err -> do sendReply h 500 $
diff -rN -u old-ftphs/patches/series new-ftphs/patches/series
--- old-ftphs/patches/series	2013-08-21 20:37:34.510542461 +0000
+++ new-ftphs/patches/series	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-ghc-7.6-compatibility