@@ -184,20 +184,11 @@ Source-repository head
184184 type: git
185185 location: git://github.com/jgm/pandoc.git
186186
187−Flag executable
188− Description: Build the pandoc executable.
189− Default: True
190−Flag library
191− Description: Build the pandoc library.
192− Default: True
193187Flag blaze_html_0_5
194188 Description: Use blaze-html 0.5 and blaze-markup 0.5
195189 Default: True
196190
197191Library
198− -- Note: the following is duplicated in all stanzas.
199− -- It needs to be duplicated because of the library & executable flags.
200− -- BEGIN DUPLICATED SECTION
201192 Build-Depends: base >= 4.2 && <5,
202193 syb >= 0.1 && < 0.4,
203194 containers >= 0.1 && < 0.6,
@@ -251,7 +242,6 @@ Library
251242 RelaxedPolyRec, DeriveDataTypeable, TypeSynonymInstances,
252243 FlexibleInstances
253244 Hs-Source-Dirs: src
254− -- END DUPLICATED SECTION
255245
256246 Exposed-Modules: Text.Pandoc,
257247 Text.Pandoc.Options,
@@ -290,91 +280,56 @@ Library
290280 Text.Pandoc.PDF,
291281 Text.Pandoc.UTF8,
292282 Text.Pandoc.Templates,
283+ Text.Pandoc.XML,
284+ Text.Pandoc.Biblio,
293285 Text.Pandoc.SelfContained
294− Other-Modules: Text.Pandoc.XML,
295− Text.Pandoc.MIME,
286+ Other-Modules: Text.Pandoc.MIME,
296287 Text.Pandoc.UUID,
297288 Text.Pandoc.ImageSize,
298289 Text.Pandoc.Slides,
299− Text.Pandoc.Biblio,
300290 Paths_pandoc
301291
302− if flag(library)
303− Buildable: True
304− else
305− Buildable: False
292+ Buildable: True
306293
307294Executable pandoc
308− -- Note: the following is duplicated in all stanzas.
309− -- It needs to be duplicated because of the library & executable flags.
310− -- BEGIN DUPLICATED SECTION
311− Build-Depends: base >= 4.2 && <5,
312− syb >= 0.1 && < 0.4,
313− containers >= 0.1 && < 0.6,
314− parsec >= 3.1 && < 3.2,
315− mtl >= 1.1 && < 2.2,
316− network >= 2 && < 2.5,
317− filepath >= 1.1 && < 1.4,
318− process >= 1 && < 1.2,
295+ Build-Depends: pandoc,
296+ base >= 4.2 && <5,
319297 directory >= 1 && < 1.3,
320− bytestring >= 0.9 && < 1.0,
298+ filepath >= 1.1 && < 1.4,
299+ network >= 2 && < 2.5,
321300 text >= 0.11 && < 0.12,
322− zip-archive >= 0.1.1.7 && < 0.2,
323− old-locale >= 1 && < 1.1,
324− time >= 1.2 && < 1.5,
325− HTTP >= 4000.0.5 && < 4000.3,
326− texmath >= 0.6.0.2 && < 0.7,
327− xml >= 1.3.12 && < 1.4,
328− random >= 1 && < 1.1,
301+ bytestring >= 0.9 && < 1.0,
329302 extensible-exceptions >= 0.1 && < 0.2,
330− citeproc-hs >= 0.3.4 && < 0.4,
331− pandoc-types >= 1.10 && < 1.11,
332− json >= 0.4 && < 0.8,
333− tagsoup >= 0.12.5 && < 0.13,
334− base64-bytestring >= 0.1 && < 1.1,
335− zlib >= 0.5 && < 0.6,
336303 highlighting-kate >= 0.5.1 && < 0.6,
337− data-default >= 0.4 && < 0.6,
338− temporary >= 1.1 && < 1.2
339− if flag(blaze_html_0_5)
340− build-depends:
341− blaze-html >= 0.5 && < 0.6,
342− blaze-markup >= 0.5.1 && < 0.6
343− else
344− build-depends:
345− blaze-html >= 0.4.3.0 && < 0.5
304+ HTTP >= 4000.0.5 && < 4000.3,
305+ citeproc-hs >= 0.3.6 && < 0.4
346306 if impl(ghc >= 7.0.1)
347307 Ghc-Options: -O2 -rtsopts -Wall -fno-warn-unused-do-bind -dno-debug-output
348308 else
349309 if impl(ghc >= 6.12)
350− Ghc-Options: -O2 -Wall -fno-warn-unused-do-bind -dno-debug-output
310+ Ghc-Options: -O2 -Wall -fno-warn-unused-do-bind -dno-debug-output
351311 else
352− Ghc-Options: -O2 -Wall
312+ Ghc-Options: -O2 -Wall
353313 if impl(ghc >= 7.0.1)
354314 Ghc-Prof-Options: -auto-all -caf-all -rtsopts
355315 else
356316 Ghc-Prof-Options: -auto-all -caf-all
357317 Default-Language: Haskell98
358318 Default-Extensions: CPP
359− Other-Extensions: PatternGuards, OverloadedStrings,
360− ScopedTypeVariables, GeneralizedNewtypeDeriving,
361− RelaxedPolyRec, DeriveDataTypeable, TypeSynonymInstances,
362− FlexibleInstances
363− Hs-Source-Dirs: src
364− -- END DUPLICATED SECTION
365−
366− Main-Is: pandoc.hs
367− if flag(executable)
368− Buildable: True
369− else
370− Buildable: False
319+ Other-Extensions: PatternGuards, OverloadedStrings,
320+ ScopedTypeVariables, GeneralizedNewtypeDeriving,
321+ RelaxedPolyRec, DeriveDataTypeable, TypeSynonymInstances,
322+ FlexibleInstances
323+ Hs-Source-Dirs: .
324+ Main-Is: pandoc.hs
325+ Buildable: True
371326
372327-- NOTE: A trick in Setup.hs makes sure this won't be installed:
373328Executable make-pandoc-man-pages
374− Main-Is: make-pandoc-man-pages.hs
329+ Main-Is: make-pandoc-man-pages.hs
375330 Hs-Source-Dirs: man
376− Build-Depends: base >= 4.2 && < 5,
377− pandoc,
331+ Build-Depends: pandoc,
332+ base >= 4.2 && < 5,
378333 directory >= 1 && < 1.3,
379334 filepath >= 1.1 && < 1.4,
380335 old-time >= 1.1 && < 1.2,
@@ -386,47 +341,47 @@ Test-Suite test-pandoc
386341 Type: exitcode-stdio-1.0
387342 Main-Is: test-pandoc.hs
388343 Hs-Source-Dirs: tests
389− Build-Depends: base >= 4.2 && < 5,
390− syb >= 0.1 && < 0.4,
391− pandoc,
392− pandoc-types >= 1.10 && < 1.11,
393− bytestring >= 0.9 && < 1.0,
394− text >= 0.11 && < 0.12,
395− directory >= 1 && < 1.3,
396− filepath >= 1.1 && < 1.4,
397− process >= 1 && < 1.2,
398− Diff,
399− test-framework >= 0.3 && < 0.7,
400− test-framework-hunit >= 0.2 && < 0.3,
401− test-framework-quickcheck2 >= 0.2.9 && < 0.3,
402− QuickCheck >= 2.4 && < 2.6,
403− HUnit >= 1.2 && < 1.3,
404− template-haskell >= 2.4 && < 2.9,
405− containers >= 0.1 && < 0.6,
406− ansi-terminal == 0.5.*
407− Other-Modules: Tests.Old
408− Tests.Helpers
409− Tests.Arbitrary
410− Tests.Shared
411− Tests.Readers.LaTeX
412− Tests.Readers.Markdown
413− Tests.Readers.RST
414− Tests.Writers.Native
415− Tests.Writers.ConTeXt
416− Tests.Writers.HTML
417− Tests.Writers.Markdown
418− Tests.Writers.LaTeX
344+ Build-Depends: base >= 4.2 && < 5,
345+ syb >= 0.1 && < 0.4,
346+ pandoc,
347+ pandoc-types >= 1.10 && < 1.11,
348+ bytestring >= 0.9 && < 1.0,
349+ text >= 0.11 && < 0.12,
350+ directory >= 1 && < 1.3,
351+ filepath >= 1.1 && < 1.4,
352+ process >= 1 && < 1.2,
353+ Diff,
354+ test-framework >= 0.3 && < 0.7,
355+ test-framework-hunit >= 0.2 && < 0.3,
356+ test-framework-quickcheck2 >= 0.2.9 && < 0.3,
357+ QuickCheck >= 2.4 && < 2.6,
358+ HUnit >= 1.2 && < 1.3,
359+ template-haskell >= 2.4 && < 2.9,
360+ containers >= 0.1 && < 0.6,
361+ ansi-terminal == 0.5.*
362+ Other-Modules: Tests.Old
363+ Tests.Helpers
364+ Tests.Arbitrary
365+ Tests.Shared
366+ Tests.Readers.LaTeX
367+ Tests.Readers.Markdown
368+ Tests.Readers.RST
369+ Tests.Writers.Native
370+ Tests.Writers.ConTeXt
371+ Tests.Writers.HTML
372+ Tests.Writers.Markdown
373+ Tests.Writers.LaTeX
419374 if impl(ghc >= 7.0.1)
420− Ghc-Options: -O2 -rtsopts -Wall -fno-warn-unused-do-bind -dno-debug-output
375+ Ghc-Options: -O2 -rtsopts -Wall -fno-warn-unused-do-bind -dno-debug-output
421376 else
422377 if impl(ghc >= 6.12)
423− Ghc-Options: -O2 -Wall -fno-warn-unused-do-bind -dno-debug-output
378+ Ghc-Options: -O2 -Wall -fno-warn-unused-do-bind -dno-debug-output
424379 else
425− Ghc-Options: -O2 -Wall
380+ Ghc-Options: -O2 -Wall
426381 if impl(ghc >= 7)
427− cpp-options: -D_LIT=lit
382+ cpp-options: -D_LIT=lit
428383 else
429− cpp-options: -D_LIT=$lit
384+ cpp-options: -D_LIT=$lit
430385 Default-Language: Haskell98
431386 Default-Extensions: CPP, TemplateHaskell, QuasiQuotes
432387
@@ -434,11 +389,11 @@ benchmark benchmark-pandoc
434389 Type: exitcode-stdio-1.0
435390 Main-Is: benchmark-pandoc.hs
436391 Hs-Source-Dirs: benchmark
437− Build-Depends: base >= 4.2 && < 5,
438− syb >= 0.1 && < 0.4,
439− pandoc,
440− criterion >= 0.5 && < 0.7,
441− json >= 0.4 && < 0.8
392+ Build-Depends: pandoc,
393+ base >= 4.2 && < 5,
394+ syb >= 0.1 && < 0.4,
395+ criterion >= 0.5 && < 0.7,
396+ json >= 0.4 && < 0.8
442397 if impl(ghc >= 7.0.1)
443398 Ghc-Options: -O2 -rtsopts -Wall -fno-warn-unused-do-bind -dno-debug-output
444399 else