git.iko.soy/typeable/pandoc
on master help sign in
More improvements to debpkg target.

The generated deb has been confirmed to install and run on a fresh ubuntu/trusty64 vagrant box.

commite60efdd98f6fefd69cb2c02395ac8a0fa7b0dfdf authorJohn MacFarlane <jgm@berkeley.edu> dateWed 17 Dec 2014, 16:38 (12 years ago) parentb1a9b1a
2 files changed+13−5
deb/control.in+1−1 make_deb.sh+12−4
deb/control.in+1−1
@@ -2,7 +2,7 @@ Package: pandoc
22Version: VERSION
33Section: text
44Priority: optional
5−Architecture: all
5+Architecture: ARCHITECTURE
66Depends: libc6 (>= 2.11), libgmp10, zlib1g (>= 1:1.1.4)
77Maintainer: John MacFarlane <jgm@berkeley.edu>
88Description: general markup converter
make_deb.sh+12−4
@@ -1,17 +1,24 @@
11#!/bin/bash -e
22
3+MACHINE=$(uname -m)
4+if [ "$MACHINE" = "x86_64" ]; then
5+ ARCHITECTURE=amd64
6+elif [ "$MACHINE" = "i686" ]; then
7+ ARCHICTECTURE=i386
8+elif [ "$MACHINE" = "i386" ]; then
9+ ARCHICTECTURE=i386
10+fi
11+
312SANDBOX=`pwd`/.cabal-sandbox
413VERSION=$(grep -e '^Version' pandoc.cabal | awk '{print $2}')
514DEBPKGVER=1
615DEBVER=$VERSION-$DEBPKGVER
7−BASE=pandoc-$DEBVER
16+BASE=pandoc-$DEBVER-$ARCHITECTURE
817DIST=`pwd`/$BASE
918MANDIR=`pwd`/man
1019DEST=$DIST/usr/local
1120ME=$(whoami)
1221
13−echo "DEBVER = $DEBVER"
14−
1522# echo Removing old files...
1623rm -rf $DIST
1724
@@ -45,7 +52,8 @@ install $PANDOC_CITEPROC_PATH/LICENSE $DEST/share/doc/pandoc-citeproc/LICENSE
4552rm -rf make_binary_package.tmp.$$
4653
4754mkdir $DIST/DEBIAN
48−perl -pe "s/VERSION/$DEBVER/" deb/control.in > $DIST/DEBIAN/control
55+perl -pe "s/VERSION/$DEBVER/" deb/control.in | \
56+ perl -pe "s/ARCHITECTURE/$ARCHITECTURE/" > $DIST/DEBIAN/control
4957
5058dpkg-deb --build $DIST
5159rm -rf $DIST