[Pkg-haskell-commits] darcs: bluetile: Remove patch included upstream

[Joachim Breitner]

Sat Jul 31 14:36:24 UTC 2010  Joachim Breitner <mail at joachim-breitner.de>
  * Remove patch included upstream
  Ignore-this: 683d8a8f04c955ab1ddb283c9e33c07b

    R ./patches/fix-bluetilerc-reference.patch
    M ./patches/series -1

Sat Jul 31 14:36:24 UTC 2010  Joachim Breitner <mail at joachim-breitner.de>
  * Remove patch included upstream
  Ignore-this: 683d8a8f04c955ab1ddb283c9e33c07b
diff -rN -u old-bluetile/patches/fix-bluetilerc-reference.patch new-bluetile/patches/fix-bluetilerc-reference.patch
--- old-bluetile/patches/fix-bluetilerc-reference.patch	2010-07-31 14:42:40.848274942 +0000
+++ new-bluetile/patches/fix-bluetilerc-reference.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,37 +0,0 @@
-Index: bluetile-0.5/Setup.lhs
-===================================================================
---- bluetile-0.5.orig/Setup.lhs	2010-07-26 19:47:58.000000000 +0200
-+++ bluetile-0.5/Setup.lhs	2010-07-26 19:47:58.000000000 +0200
-@@ -15,13 +15,14 @@
- > myPostCopy _ copyflags pkgdesc lbi = do
- >   let dirs = absoluteInstallDirs pkgdesc lbi (fromFlag $ copyDest copyflags)
- >   libExecHook dirs
-->   insertPath dirs
-+>   let dirs' = absoluteInstallDirs pkgdesc lbi NoCopyDest
-+>   insertPath dirs dirs'
- >
- > myPostInst :: Args -> InstallFlags -> PackageDescription -> LocalBuildInfo -> IO ()
- > myPostInst _ _ pkgdesc lbi = do
- >   let dirs = absoluteInstallDirs pkgdesc lbi NoCopyDest
- >   libExecHook dirs
-->   insertPath dirs
-+>   insertPath dirs dirs
- >
- > -- hook to move helper binaries to the libexec directory
- > libExecHook :: InstallDirs String -> IO ()
-@@ -33,11 +34,10 @@
- >     renameFile (bdir </> binary) (lexecdir </> binary)
- >
- > -- hook to insert path to system wide configuration
--> insertPath :: InstallDirs String -> IO ()
--> insertPath dirs = do
-->   let ddir = datadir dirs
-->   let userConfigTemplate = ddir </> "etc" </> "bluetilerc_user_template"
-->   let pathToSystemConfig = ddir </> "etc" </> "bluetilerc"
-+> insertPath :: InstallDirs String -> InstallDirs String -> IO ()
-+> insertPath dirs dirs' = do
-+>   let userConfigTemplate = datadir dirs </> "etc" </> "bluetilerc_user_template"
-+>   let pathToSystemConfig = datadir dirs' </> "etc" </> "bluetilerc"
- >   contents <- readFileStrict userConfigTemplate
- >   let contentsPatched = subRegex (mkRegex "__PATH_TO_BLUETILERC__") contents pathToSystemConfig
- >   writeFile userConfigTemplate contentsPatched
diff -rN -u old-bluetile/patches/series new-bluetile/patches/series
--- old-bluetile/patches/series	2010-07-31 14:42:40.848274942 +0000
+++ new-bluetile/patches/series	2010-07-31 14:42:40.852275157 +0000
@@ -1,3 +1,2 @@
 debianize-README.patch
-fix-bluetilerc-reference.patch
 use-x-terminal-emulator.patch