From 132fc96cf61bda94a178890087141740906843c4 Mon Sep 17 00:00:00 2001 From: ianwookim Date: Tue, 27 Dec 2011 12:04:01 +0000 Subject: [PATCH] make xournal-convert compatible with hackage versions. --- lib/Application/XournalConvert/Job.hs | 6 +++--- xournal-convert.cabal | 27 +++++++++++++++++---------- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/lib/Application/XournalConvert/Job.hs b/lib/Application/XournalConvert/Job.hs index 14fcafd..9b9e5a2 100644 --- a/lib/Application/XournalConvert/Job.hs +++ b/lib/Application/XournalConvert/Job.hs @@ -3,12 +3,12 @@ module Application.XournalConvert.Job where import Data.List -import Graphics.Xournal.Render +import Graphics.Xournal.Render.Simple import Graphics.Rendering.Cairo -import Text.Xournal.Type +import Data.Xournal.Simple import Text.Xournal.Parse -import Text.Xournal.Predefined +import Data.Xournal.Predefined import Text.StringTemplate import Text.StringTemplate.Helpers diff --git a/xournal-convert.cabal b/xournal-convert.cabal index 5e6fc1c..b4dd159 100644 --- a/xournal-convert.cabal +++ b/xournal-convert.cabal @@ -1,7 +1,7 @@ Name: xournal-convert -Version: 0.0 -Synopsis: -Description: +Version: 0.0.999 +Synopsis: convert utility for xoj files +Description: convert xoj files into various formats License: BSD3 License-file: LICENSE Author: Ian-Woo Kim @@ -18,19 +18,26 @@ Executable xournal-convert ghc-options: -Wall -O2 -threaded -funbox-strict-fields -fno-warn-unused-do-bind ghc-prof-options: -caf-all -auto-all Build-Depends: - base>4, mtl>2, directory, filepath, - cmdargs, xournal-convert + base == 4.*, + cmdargs >= 0.7 && < 0.10, + xournal-convert Library hs-source-dirs: lib ghc-options: -Wall -O2 -threaded -funbox-strict-fields -fno-warn-unused-do-bind ghc-prof-options: -caf-all -auto-all Build-Depends: - base>4, mtl>2, directory, filepath, - cmdargs, - HStringTemplateHelpersIW, HStringTemplate, - xournal-parser, xournal-render, - cairo>=0.12.0 + base == 4.*, + mtl == 2.*, + directory == 1.1.*, + filepath == 1.2.*, + cmdargs >= 0.7 && < 0.10, + HStringTemplateHelpersIW, + HStringTemplate, + xournal-types == 0.2.*, + xournal-parser == 0.3.*, + xournal-render == 0.4.*, + cairo == 0.12.* Exposed-Modules: Application.XournalConvert.ProgType Application.XournalConvert.Job