[Pkg-haskell-commits] darcs: bluetile: Fix bluetilerc reference and use x-terminal-emulator

[Joachim Breitner]

Mon Jul 26 17:55:41 UTC 2010  Joachim Breitner <mail at joachim-breitner.de>
  * Fix bluetilerc reference and use x-terminal-emulator
  Ignore-this: 409eff7305d2c3eb733cb883c06ff0b0

    A ./patches/fix-bluetilerc-reference.patch
    M ./patches/series +2
    A ./patches/use-x-terminal-emulator.patch

Mon Jul 26 17:55:41 UTC 2010  Joachim Breitner <mail at joachim-breitner.de>
  * Fix bluetilerc reference and use x-terminal-emulator
  Ignore-this: 409eff7305d2c3eb733cb883c06ff0b0
diff -rN -u old-bluetile/patches/fix-bluetilerc-reference.patch new-bluetile/patches/fix-bluetilerc-reference.patch
--- old-bluetile/patches/fix-bluetilerc-reference.patch	1970-01-01 00:00:00.000000000 +0000
+++ new-bluetile/patches/fix-bluetilerc-reference.patch	2010-07-26 17:55:54.643648267 +0000
@@ -0,0 +1,37 @@
+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-26 17:55:54.639648054 +0000
+++ new-bluetile/patches/series	2010-07-26 17:55:54.643648267 +0000
@@ -1 +1,3 @@
 debianize-README.patch
+fix-bluetilerc-reference.patch
+use-x-terminal-emulator.patch
diff -rN -u old-bluetile/patches/use-x-terminal-emulator.patch new-bluetile/patches/use-x-terminal-emulator.patch
--- old-bluetile/patches/use-x-terminal-emulator.patch	1970-01-01 00:00:00.000000000 +0000
+++ new-bluetile/patches/use-x-terminal-emulator.patch	2010-07-26 17:55:54.643648267 +0000
@@ -0,0 +1,13 @@
+Index: bluetile-0.5/etc/bluetilerc
+===================================================================
+--- bluetile-0.5.orig/etc/bluetilerc	2010-07-26 19:49:35.000000000 +0200
++++ bluetile-0.5/etc/bluetilerc	2010-07-26 19:52:17.000000000 +0200
+@@ -8,7 +8,7 @@
+ 
+ # global options (Mod4 is usually the logo key)
+ default_modifier: Mod4
+-terminal: gnome-terminal
++terminal: x-terminal-emulator
+ start_dock: true
+ 
+ # launching and killing programs