From b9666110671e5663f164e79dfdebb10123a3c56d Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Wed, 17 Dec 2014 00:16:59 -0800
Subject: Changed make_binary_package -> make_deb.

Added deb/control.in.
---
 deb/control.in         | 19 +++++++++++++++++++
 make_binary_package.sh | 49 -------------------------------------------------
 make_deb.sh            | 45 +++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 64 insertions(+), 49 deletions(-)
 create mode 100644 deb/control.in
 delete mode 100755 make_binary_package.sh
 create mode 100755 make_deb.sh

diff --git a/deb/control.in b/deb/control.in
new file mode 100644
index 000000000..26962220f
--- /dev/null
+++ b/deb/control.in
@@ -0,0 +1,19 @@
+Package: pandoc
+Version: VERSION
+Section: text
+Priority: optional
+Architecture: all
+Depends:
+Maintainer: John MacFarlane <jgm@berkeley.edu>
+Description: general markup converter
+  Pandoc is a Haskell library for converting from one markup
+  format to another, and a command-line tool that uses
+  this library. It can read markdown and (subsets of) HTML,
+  reStructuredText, LaTeX, DocBook, MediaWiki markup, Haddock
+  markup, OPML, Emacs Org-Mode, txt2tags and Textile, and it can write
+  markdown, reStructuredText, HTML, LaTeX, ConTeXt, Docbook,
+  OPML, OpenDocument, ODT, Word docx, RTF, MediaWiki, DokuWiki,
+  Textile, groff man pages, plain text, Emacs Org-Mode, AsciiDoc,
+  Haddock markup, EPUB (v2 and v3), FictionBook2,
+  InDesign ICML, and several kinds of HTML/javascript
+  slide shows (S5, Slidy, Slideous, DZSlides, reveal.js).
diff --git a/make_binary_package.sh b/make_binary_package.sh
deleted file mode 100755
index c2b051232..000000000
--- a/make_binary_package.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash -e
-
-SANDBOX=`pwd`/.cabal-sandbox
-VERSION=$(grep -e '^Version' pandoc.cabal | awk '{print $2}')
-BASE=pandoc-$VERSION-$(uname -s)-$(uname -m)
-DIST=`pwd`/$BASE
-MANDIR=`pwd`/man
-DEST=$DIST
-ME=$(whoami)
-
-# echo Removing old files...
-rm -rf $DIST
-
-cabal sandbox init
-echo Updating database
-cabal update
-
-echo Building pandoc...
-cabal clean
-cabal install --reinstall --flags="embed_data_files make-pandoc-man-pages" . pandoc-citeproc
-
-make man
-# get pandoc-citeproc man page:
-PANDOC_CITEPROC_PATH=`cabal unpack -d make_binary_package.tmp.$$ pandoc-citeproc | awk '{print $3;}'`
-strip $SANDBOX/bin/pandoc
-strip $SANDBOX/bin/pandoc-citeproc
-install -d $DEST/bin
-install -d $DEST/share/man/man1
-install -d $DEST/share/man/man5
-install -d $DEST/share/doc/pandoc
-install -d $DEST/share/doc/pandoc-citeproc
-install $SANDBOX/bin/pandoc $DEST/bin/
-install $SANDBOX/bin/pandoc-citeproc $DEST/bin/
-install $MANDIR/man1/pandoc.1 $DEST/share/man/man1/
-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
-
-echo Creating tarball...
-# remove old package first
-rm -rf $BASE.tar.gz
-
-tar cvzf $BASE.tar.gz $BASE
-# cleanup
-rm -r $DIST
-echo "Created $BASE.tar.gz"
diff --git a/make_deb.sh b/make_deb.sh
new file mode 100755
index 000000000..589e7cad4
--- /dev/null
+++ b/make_deb.sh
@@ -0,0 +1,45 @@
+#!/bin/bash -e
+
+SANDBOX=`pwd`/.cabal-sandbox
+VERSION=$(grep -e '^Version' pandoc.cabal | awk '{print $2}')
+DEBPKGVER ?= 1
+BASE=pandoc-$VERSION-$DEBPKGVER
+DIST=`pwd`/$BASE
+MANDIR=`pwd`/man
+DEST=$DIST/usr/local
+ME=$(whoami)
+
+# echo Removing old files...
+rm -rf $DIST
+
+cabal sandbox init
+echo Updating database
+cabal update
+
+echo Building pandoc...
+cabal clean
+cabal install --reinstall --flags="embed_data_files make-pandoc-man-pages" . pandoc-citeproc
+
+make man
+# get pandoc-citeproc man page:
+PANDOC_CITEPROC_PATH=`cabal unpack -d make_binary_package.tmp.$$ pandoc-citeproc | awk '{print $3;}'`
+strip $SANDBOX/bin/pandoc
+strip $SANDBOX/bin/pandoc-citeproc
+install -d $DEST/bin
+install -d $DEST/share/man/man1
+install -d $DEST/share/man/man5
+install -d $DEST/share/doc/pandoc
+install -d $DEST/share/doc/pandoc-citeproc
+install $SANDBOX/bin/pandoc $DEST/bin/
+install $SANDBOX/bin/pandoc-citeproc $DEST/bin/
+install $MANDIR/man1/pandoc.1 $DEST/share/man/man1/
+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
+
+mkdir $DIST/DEBIAN
+perl -pe 's/VERSION/${VERSION}-${DEBPKGVER}/' deb/control.in > $DIST/DEBIAN/control
+
+dpkg-deb --build $DIST
-- 
cgit v1.2.3