fdo-trash 0.0.0.1 → 0.0.0.2

raw patch · 3 files changed

+33/−6 lines, 3 filesdep ~DiffPVP ok

version bump matches the API change (PVP)

Dependency ranges changed: Diff

API changes (from Hackage documentation)

Files

• Freedesktop/Trash.hs +4/−4
• LICENSE +26/−0
• fdo-trash.cabal +3/−2

@@ -26,7 +26,7 @@ import Data.Time(getCurrentTimeZone,parseTime,localTimeToUTC,UTCTime,formatTime,utcToLocalTime,FormatTime) import Data.Either(partitionEithers) import Control.Monad(when)-import Data.Algorithm.Diff(getDiff,DI(..))+import Data.Algorithm.Diff(getDiff,Diff(..)) import Data.List(sort) import System.Posix.Files(fileSize,getSymbolicLinkStatus,isRegularFile,isDirectory,rename,removeLink,fileExist) #if MIN_VERSION_base(4,6,0)@@ -101,13 +101,13 @@          diff   = getDiff iFiles dFiles     files <- fmap catMaybes $ mapM (genTrashFile iPath fPath timeZone) (diffBth diff)     return (files, (diffFst diff, map dropExtension $ diffSnd diff))-    where diffFst ((F,l):xs) = l : diffFst xs+    where diffFst ((First l):xs) = l : diffFst xs           diffFst []         = []           diffFst (_:xs)     = diffFst xs-          diffSnd ((S,l):xs) = dropExtension l : diffSnd xs+          diffSnd ((Second l):xs) = dropExtension l : diffSnd xs           diffSnd []         = []           diffSnd (_:xs)     = diffSnd xs-          diffBth ((B,l):xs) = dropExtension l : diffBth xs+          diffBth ((Both l _):xs) = dropExtension l : diffBth xs           diffBth []         = []           diffBth (_:xs)     = diffBth xs 

@@ -0,0 +1,26 @@+Copyright (c) 2012, Emil Karlson+All rights reserved.++Redistribution and use in source and binary forms, with or without+modification, are permitted provided that the following conditions are met:++1. Redistributions of source code must retain the above copyright notice,+   this list of conditions and the following disclaimer.+2. Redistributions in binary form must reproduce the above copyright+   notice, this list of conditions and the following disclaimer in the+   documentation and/or other materials provided with the distribution.+3. Neither the name of the author nor the names of its+   contributors may be used to endorse or promote products derived from+   this software without specific prior written permission.++THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE+POSSIBILITY OF SUCH DAMAGE.

@@ -1,7 +1,8 @@ name:            fdo-trash-version:         0.0.0.1+version:         0.0.0.2 copyright:       (c) 2012 Emil Karlson license:         BSD3+license-file:    LICENSE author:          Emil Karlson <jekarlson@gmail.com> maintainer:      Emil Karlson <jekarlson@gmail.com> category:        Desktop@@ -31,7 +32,7 @@   Main-is:       fdo-trash.hs   Build-Depends: base >= 3 && < 5,                  fdo-trash,-                 Diff,+                 Diff >= 0.2,                  parsec,                  old-locale,                  directory,