From e60efdd98f6fefd69cb2c02395ac8a0fa7b0dfdf Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Wed, 17 Dec 2014 16:38:11 -0800
Subject: More improvements to debpkg target.

The generated deb has been confirmed to install and run
on a fresh ubuntu/trusty64 vagrant box.
---
 deb/control.in |  2 +-
 make_deb.sh    | 16 ++++++++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/deb/control.in b/deb/control.in
index 85136edf8..2c430f2f9 100644
--- a/deb/control.in
+++ b/deb/control.in
@@ -2,7 +2,7 @@ Package: pandoc
 Version: VERSION
 Section: text
 Priority: optional
-Architecture: all
+Architecture: ARCHITECTURE
 Depends: libc6 (>= 2.11), libgmp10, zlib1g (>= 1:1.1.4)
 Maintainer: John MacFarlane <jgm@berkeley.edu>
 Description: general markup converter
diff --git a/make_deb.sh b/make_deb.sh
index 0883c911e..fcf82accc 100755
--- a/make_deb.sh
+++ b/make_deb.sh
@@ -1,17 +1,24 @@
 #!/bin/bash -e
 
+MACHINE=$(uname -m)
+if [ "$MACHINE" = "x86_64" ]; then
+  ARCHITECTURE=amd64
+elif [ "$MACHINE" = "i686" ]; then
+  ARCHICTECTURE=i386
+elif [ "$MACHINE" = "i386" ]; then
+  ARCHICTECTURE=i386
+fi
+
 SANDBOX=`pwd`/.cabal-sandbox
 VERSION=$(grep -e '^Version' pandoc.cabal | awk '{print $2}')
 DEBPKGVER=1
 DEBVER=$VERSION-$DEBPKGVER
-BASE=pandoc-$DEBVER
+BASE=pandoc-$DEBVER-$ARCHITECTURE
 DIST=`pwd`/$BASE
 MANDIR=`pwd`/man
 DEST=$DIST/usr/local
 ME=$(whoami)
 
-echo "DEBVER = $DEBVER"
-
 # echo Removing old files...
 rm -rf $DIST
 
@@ -45,7 +52,8 @@ install $PANDOC_CITEPROC_PATH/LICENSE $DEST/share/doc/pandoc-citeproc/LICENSE
 rm -rf make_binary_package.tmp.$$
 
 mkdir $DIST/DEBIAN
-perl -pe "s/VERSION/$DEBVER/" deb/control.in > $DIST/DEBIAN/control
+perl -pe "s/VERSION/$DEBVER/" deb/control.in | \
+  perl -pe "s/ARCHITECTURE/$ARCHITECTURE/" > $DIST/DEBIAN/control
 
 dpkg-deb --build $DIST
 rm -rf $DIST
-- 
cgit v1.2.3