6f9f790 · typeable/pandoc

deb/Makefile+1

compare with master

unifiedsplit

@@ -11,3 +11,4 @@ package:

11

12clean:

13 vagrant destroy

14+ -rm pandoc pandoc-citeproc

deb/make_deb.sh+5−5

@@ -21,7 +21,7 @@ PATH=$LOCAL/bin:$PATH

21

22which hsb2hs || stack install --install-ghc --stack-yaml stack.hsb2hs.yaml

23

24−stack install --install-ghc --stack-yaml deb/stack.yaml

24+stack install --install-ghc --stack-yaml deb/stack.yaml --local-bin-path deb pandoc pandoc-citeproc

25

26make man/pandoc.1

27# get pandoc-citeproc man page:

@@ -31,16 +31,16 @@ mkdir $TEMPDIR

31curl ${PANDOC_CITEPROC_TARBALL} | tar xzC $TEMPDIR

32PANDOC_CITEPROC_PATH=$TEMPDIR/pandoc-citeproc-${PANDOC_CITEPROC_VERSION}

33

34−strip $LOCAL/bin/pandoc

34+strip deb/pandoc

35−strip $LOCAL/bin/pandoc-citeproc

35+strip deb/pandoc-citeproc

36mkdir -p $DEST/bin

37mkdir -p $DEST/share/man/man1

38mkdir -p $DEST/share/doc/pandoc

39

40mkdir -p $DEST/share/doc/pandoc-citeproc

41find $DIST -type d | xargs chmod 755

42−cp $LOCAL/bin/pandoc $DEST/bin/

42+cp deb/pandoc $DEST/bin/

43−cp $LOCAL/bin/pandoc-citeproc $DEST/bin/

43+cp deb/pandoc-citeproc $DEST/bin/

44cp man/pandoc.1 $DEST/share/man/man1/pandoc.1

45gzip -9 $DEST/share/man/man1/pandoc.1

46cp ${PANDOC_CITEPROC_PATH}/man/man1/pandoc-citeproc.1 $DEST/share/man/man1/

deb/stack.yaml+4−5

@@ -13,9 +13,8 @@ flags:

13 debug: false

14packages:

15- '..'

16−- 'https://hackage.haskell.org/package/pandoc-citeproc-0.9.1.1/pandoc-citeproc-0.9.1.1.tar.gz'

17extra-deps:

16extra-deps:

18−- 'aeson-0.11.1.1'

17+- data-default-0.6.0

19−- 'texmath-0.8.5'

18+- data-default-instances-base-0.1.0

20−- 'highlighting-kate-0.6.2'

19+- pandoc-citeproc-0.9.1.1

21−resolver: lts-5.8

20+resolver: lts-6.1