summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2014-12-17 13:53:38 -0800
committerJohn MacFarlane <jgm@berkeley.edu>2014-12-17 13:53:38 -0800
commitb1a9b1a696a48fcd21133fef451db2fd28efb1c5 (patch)
tree55efc1f6fad07d2bd17bed5d5c67066ab8a1b88d
parent8dfc372278d26c551e2a7374b7223c7e07c8270b (diff)
Improved make_deb.sh.
-rw-r--r--deb/control.in2
-rwxr-xr-xmake_deb.sh14
2 files changed, 11 insertions, 5 deletions
diff --git a/deb/control.in b/deb/control.in
index 26962220f..85136edf8 100644
--- a/deb/control.in
+++ b/deb/control.in
@@ -3,7 +3,7 @@ Version: VERSION
Section: text
Priority: optional
Architecture: all
-Depends:
+Depends: libc6 (>= 2.11), libgmp10, zlib1g (>= 1:1.1.4)
Maintainer: John MacFarlane <jgm@berkeley.edu>
Description: general markup converter
Pandoc is a Haskell library for converting from one markup
diff --git a/make_deb.sh b/make_deb.sh
index dfbdd3a0c..0883c911e 100755
--- a/make_deb.sh
+++ b/make_deb.sh
@@ -2,13 +2,16 @@
SANDBOX=`pwd`/.cabal-sandbox
VERSION=$(grep -e '^Version' pandoc.cabal | awk '{print $2}')
-DEBPKGVER=?1
-BASE=pandoc-$VERSION-$DEBPKGVER
+DEBPKGVER=1
+DEBVER=$VERSION-$DEBPKGVER
+BASE=pandoc-$DEBVER
DIST=`pwd`/$BASE
MANDIR=`pwd`/man
DEST=$DIST/usr/local
ME=$(whoami)
+echo "DEBVER = $DEBVER"
+
# echo Removing old files...
rm -rf $DIST
@@ -16,6 +19,8 @@ cabal sandbox init
echo Updating database
cabal update
+export PATH=`pwd`/.cabal-sandbox/bin:$PATH
+which hsb2hs || cabal install hsb2hs
echo Building pandoc...
cabal clean
cabal install --reinstall --flags="embed_data_files make-pandoc-man-pages" . pandoc-citeproc
@@ -37,9 +42,10 @@ install $MANDIR/man5/pandoc_markdown.5 $DEST/share/man/man5/
install $PANDOC_CITEPROC_PATH/man/man1/pandoc-citeproc.1 $DEST/share/man/man1/
install COPYING $DEST/share/doc/pandoc/COPYING
install $PANDOC_CITEPROC_PATH/LICENSE $DEST/share/doc/pandoc-citeproc/LICENSE
-rm -rf $PANDOC_CITEPROC_PATH
+rm -rf make_binary_package.tmp.$$
mkdir $DIST/DEBIAN
-perl -pe 's/VERSION/${VERSION}-${DEBPKGVER}/' deb/control.in > $DIST/DEBIAN/control
+perl -pe "s/VERSION/$DEBVER/" deb/control.in > $DIST/DEBIAN/control
dpkg-deb --build $DIST
+rm -rf $DIST