deb pkg generation improvements.

Allow setting DEBPKGVER.
Bump to stack lts-4.0.
Make output verbose.

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:

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

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

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