diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2016-01-07 11:24:51 -0800 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2016-01-07 11:24:51 -0800 |
| commit | 646ef17e557de57c7a8c80ad0bff04b32eb9113e (patch) | |
| tree | 791b0743cbf696009fa3b841b626e32ab50fd509 | |
| parent | 669153eaced64094050861271c82618d142db98d (diff) | |
| download | pandoc-646ef17e557de57c7a8c80ad0bff04b32eb9113e.tar.gz | |
deb pkg generation improvements.
Allow setting DEBPKGVER.
Bump to stack lts-4.0.
Make output verbose.
| -rw-r--r-- | deb/Makefile | 3 | ||||
| -rwxr-xr-x | deb/make_deb.sh (renamed from make_deb.sh) | 2 | ||||
| -rw-r--r-- | deb/stack.yaml | 4 | ||||
| -rw-r--r-- | stack.hsb2hs.yaml | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/deb/Makefile b/deb/Makefile index c947d5d75..cd198ee7b 100644 --- a/deb/Makefile +++ b/deb/Makefile @@ -1,11 +1,12 @@ TREE?=HEAD +DEBPKGVER?=1 VAGRANTBOX?=debian/wheezy64 .PHONY: package clean package: VAGRANTBOX=$(VAGRANTBOX) vagrant up - vagrant ssh -c 'rm -rf pandoc && git clone https://github.com/jgm/pandoc && cd pandoc && git checkout -b work $(TREE) && git submodule update --init && ./make_deb.sh && cp *.deb /vagrant_data/' + vagrant ssh -c 'DEBPKGVER=$(DEBPKGVER) rm -rf pandoc && git clone https://github.com/jgm/pandoc && cd pandoc && git checkout -b work $(TREE) && git submodule update --init && sh -v ./deb/make_deb.sh && cp *.deb /vagrant_data/' vagrant halt clean: diff --git a/make_deb.sh b/deb/make_deb.sh index 25d0295b4..e01acbf45 100755 --- a/make_deb.sh +++ b/deb/make_deb.sh @@ -9,7 +9,7 @@ esac LOCAL=$HOME/.local VERSION=$(grep -e '^Version' pandoc.cabal | awk '{print $2}') -DEBPKGVER=1 +DEBPKGVER=${DEBPKGVER:-1} DEBVER=$VERSION-$DEBPKGVER BASE=pandoc-$DEBVER-$ARCHITECTURE DIST=`pwd`/$BASE diff --git a/deb/stack.yaml b/deb/stack.yaml index 3fd5581f2..3dcf97979 100644 --- a/deb/stack.yaml +++ b/deb/stack.yaml @@ -16,5 +16,5 @@ packages: - 'https://hackage.haskell.org/package/pandoc-citeproc-0.9/pandoc-citeproc-0.9.tar.gz' extra-deps: - 'cmark-0.5.0' -- 'pandoc-types-1.16' -resolver: lts-3.20 +- 'pandoc-types-1.16.0.1' +resolver: lts-4.0 diff --git a/stack.hsb2hs.yaml b/stack.hsb2hs.yaml index 30a3f17e2..7dd7899f9 100644 --- a/stack.hsb2hs.yaml +++ b/stack.hsb2hs.yaml @@ -1,4 +1,4 @@ packages: - 'https://hackage.haskell.org/package/preprocessor-tools-1.0.1/preprocessor-tools-1.0.1.tar.gz' - 'https://hackage.haskell.org/package/hsb2hs-0.3.1/hsb2hs-0.3.1.tar.gz' -resolver: lts-3.20 +resolver: lts-4.0 |