Removed unneeded deb directory.
We now use static-linux to create the deb.
This commit is contained in:
John MacFarlane
parent
a96105551b
commit
e98b9f6796
7 changed files with 1 additions and 222 deletions
2
Makefile
2
Makefile
|
|
@ -32,7 +32,7 @@ dist: man/pandoc.1
|
|||
stack setup && stack test && cd .. && rm -rf "pandoc-${version}"
|
||||
|
||||
debpkg: man/pandoc.1
|
||||
make -C deb
|
||||
make -C static-linux
|
||||
|
||||
macospkg: man/pandoc.1
|
||||
./macos/make_macos_package.sh
|
||||
|
|
|
|||
|
|
@ -1,26 +0,0 @@
|
|||
-----BEGIN CERTIFICATE-----
|
||||
MIIEYzCCA0ugAwIBAgILBAAAAAABRE7wPiAwDQYJKoZIhvcNAQELBQAwVzELMAkG
|
||||
A1UEBhMCQkUxGTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExEDAOBgNVBAsTB1Jv
|
||||
b3QgQ0ExGzAZBgNVBAMTEkdsb2JhbFNpZ24gUm9vdCBDQTAeFw0xNDAyMjAxMDAw
|
||||
MDBaFw0yNDAyMjAxMDAwMDBaMGAxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9i
|
||||
YWxTaWduIG52LXNhMTYwNAYDVQQDEy1HbG9iYWxTaWduIERvbWFpbiBWYWxpZGF0
|
||||
aW9uIENBIC0gU0hBMjU2IC0gRzIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
|
||||
AoIBAQCp3cwOs+IyOd1JIqgTaZOHiOEM7nF9vZCHll1Z8syz0lhXV/lG72wm2DZC
|
||||
jn4wsy+aPlN7H262okxFHzzTFZMcie089Ffeyr3sBppqKqAZUn9R0XQ5CJ+r69eG
|
||||
ExWXrjbDVGYOWvKgc4Ux47JkFGr/paKOJLu9hVIVonnu8LXuPbj0fYC82ZA1ZbgX
|
||||
qa2zmJ+gfn1u+z+tfMIbWTaW2jcyS0tdNQJjjtunz2LuzC7Ujcm9PGqRcqIip3It
|
||||
INH6yjfaGJjmFiRxJUvE5XuJUgkC/VkrBG7KB4HUs9ra2+PMgKhWBwZ8lgg3nds4
|
||||
tmI0kWIHdAE42HIw4uuQcSZiwFfzAgMBAAGjggElMIIBITAOBgNVHQ8BAf8EBAMC
|
||||
AQYwEgYDVR0TAQH/BAgwBgEB/wIBADAdBgNVHQ4EFgQU6k581IAt5RWBhiaMgm3A
|
||||
mKTPlw8wRwYDVR0gBEAwPjA8BgRVHSAAMDQwMgYIKwYBBQUHAgEWJmh0dHBzOi8v
|
||||
d3d3Lmdsb2JhbHNpZ24uY29tL3JlcG9zaXRvcnkvMDMGA1UdHwQsMCowKKAmoCSG
|
||||
Imh0dHA6Ly9jcmwuZ2xvYmFsc2lnbi5uZXQvcm9vdC5jcmwwPQYIKwYBBQUHAQEE
|
||||
MTAvMC0GCCsGAQUFBzABhiFodHRwOi8vb2NzcC5nbG9iYWxzaWduLmNvbS9yb290
|
||||
cjEwHwYDVR0jBBgwFoAUYHtmGkUNl8qJUC99BM00qP/8/UswDQYJKoZIhvcNAQEL
|
||||
BQADggEBANdFnqDc4ONhWgt9d4QXLWVagpqNoycqhffJ7+mG/dRHzQFSlsVDvTex
|
||||
4bjyqdKKEYRxkRWJ3AKdC8tsM4U0KJ4gsrGX3G0LEME8zV/qXdeYMcU0mVwAYVXE
|
||||
GwJbxeOJyLS4bx448lYm6UHvPc2smU9ZSlctS32ux4j71pg79eXw6ImJuYsDy1oj
|
||||
H6T9uOr7Lp2uanMJvPzVoLVEgqtEkS5QLlfBQ9iRBIvpES5ftD953x77PzAAi1Pj
|
||||
tywdO02L3ORkHQRYM68bVeerDL8wBHTk8w4vMDmNSwSMHnVmZkngvkA0x1xaUZK6
|
||||
EjxS1QSCVS1npd+3lXzuP8MIugS+wEY=
|
||||
-----END CERTIFICATE-----
|
||||
14
deb/Makefile
14
deb/Makefile
|
|
@ -1,14 +0,0 @@
|
|||
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) && DEBPKGVER=$(DEBPKGVER) sh -ev ./deb/make_deb.sh && cp *.deb /vagrant_data/'
|
||||
vagrant halt
|
||||
|
||||
clean:
|
||||
vagrant destroy
|
||||
-rm pandoc pandoc-citeproc
|
||||
75
deb/Vagrantfile
vendored
75
deb/Vagrantfile
vendored
|
|
@ -1,75 +0,0 @@
|
|||
# -*- mode: ruby -*-
|
||||
# vi: set ft=ruby :
|
||||
|
||||
# All Vagrant configuration is done below. The "2" in Vagrant.configure
|
||||
# configures the configuration version (we support older styles for
|
||||
# backwards compatibility). Please don't change it unless you know what
|
||||
# you're doing.
|
||||
Vagrant.configure(2) do |config|
|
||||
# The most common configuration options are documented and commented below.
|
||||
# For a complete reference, please see the online documentation at
|
||||
# https://docs.vagrantup.com.
|
||||
|
||||
# Every Vagrant development environment requires a box. You can search for
|
||||
# boxes at https://atlas.hashicorp.com/search.
|
||||
config.vm.box = ENV['VAGRANTBOX'] || "ubuntu/precise64"
|
||||
|
||||
# Disable automatic box update checking. If you disable this, then
|
||||
# boxes will only be checked for updates when the user runs
|
||||
# `vagrant box outdated`. This is not recommended.
|
||||
# config.vm.box_check_update = false
|
||||
|
||||
# Create a forwarded port mapping which allows access to a specific port
|
||||
# within the machine from a port on the host machine. In the example below,
|
||||
# accessing "localhost:8080" will access port 80 on the guest machine.
|
||||
# config.vm.network "forwarded_port", guest: 80, host: 8080
|
||||
|
||||
# Create a private network, which allows host-only access to the machine
|
||||
# using a specific IP.
|
||||
# config.vm.network "private_network", ip: "192.168.33.10"
|
||||
|
||||
# Create a public network, which generally matched to bridged network.
|
||||
# Bridged networks make the machine appear as another physical device on
|
||||
# your network.
|
||||
# config.vm.network "public_network"
|
||||
|
||||
# Share an additional folder to the guest VM. The first argument is
|
||||
# the path on the host to the actual folder. The second argument is
|
||||
# the path on the guest to mount the folder. And the optional third
|
||||
# argument is a set of non-required options.
|
||||
config.vm.synced_folder "..", "/vagrant_data"
|
||||
|
||||
# Provider-specific configuration so you can fine-tune various
|
||||
# backing providers for Vagrant. These expose provider-specific options.
|
||||
# Example for VirtualBox:
|
||||
#
|
||||
config.vm.provider "virtualbox" do |vb|
|
||||
# Display the VirtualBox GUI when booting the machine
|
||||
# vb.gui = true
|
||||
|
||||
# Customize the amount of memory on the VM:
|
||||
vb.memory = "2048"
|
||||
end
|
||||
#
|
||||
# View the documentation for the provider you are using for more
|
||||
# information on available options.
|
||||
|
||||
# Define a Vagrant Push strategy for pushing to Atlas. Other push strategies
|
||||
# such as FTP and Heroku are also available. See the documentation at
|
||||
# https://docs.vagrantup.com/v2/push/atlas.html for more information.
|
||||
# config.push.define "atlas" do |push|
|
||||
# push.app = "YOUR_ATLAS_USERNAME/YOUR_APPLICATION_NAME"
|
||||
# end
|
||||
|
||||
# Enable provisioning with a shell script. Additional provisioners such as
|
||||
# Puppet, Chef, Ansible, Salt, and Docker are also available. Please see the
|
||||
# documentation for more information about their specific syntax and use.
|
||||
config.vm.provision "shell", inline: <<-SHELL
|
||||
wget -q https://s3.amazonaws.com/download.fpcomplete.com/debian/fpco.key
|
||||
sudo apt-key add fpco.key
|
||||
echo 'deb http://download.fpcomplete.com/ubuntu/precise stable main'|sudo tee /etc/apt/sources.list.d/fpco.list
|
||||
sudo apt-get update
|
||||
sudo apt-get install -y stack build-essential debhelper dh-make curl
|
||||
sudo cp /vagrant_data/deb/*.pem /etc/ssl/certs/
|
||||
SHELL
|
||||
end
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
Package: pandoc
|
||||
Version: VERSION
|
||||
Section: text
|
||||
Priority: optional
|
||||
Architecture: ARCHITECTURE
|
||||
Installed-Size: INSTALLED_SIZE
|
||||
Depends: libc6 (>= 2.13), 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
|
||||
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, Twiki 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, Muse, and several kinds of HTML/javascript
|
||||
slide shows (S5, Slidy, Slideous, DZSlides, reveal.js).
|
||||
|
|
@ -1,30 +0,0 @@
|
|||
-----BEGIN CERTIFICATE-----
|
||||
MIIFMjCCBBqgAwIBAgISESGwJtbMWHI+x6Mmm0FEK3WqMA0GCSqGSIb3DQEBCwUA
|
||||
MGAxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTYwNAYD
|
||||
VQQDEy1HbG9iYWxTaWduIERvbWFpbiBWYWxpZGF0aW9uIENBIC0gU0hBMjU2IC0g
|
||||
RzIwHhcNMTUxMTExMjE0NjUzWhcNMTYxMjE1MDYyODEwWjA7MSEwHwYDVQQLExhE
|
||||
b21haW4gQ29udHJvbCBWYWxpZGF0ZWQxFjAUBgNVBAMMDSouaGFza2VsbC5vcmcw
|
||||
ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDNixwKSAJbYPGflK3nO/hH
|
||||
CxigkOiKQr9q47aY9S8l0vU9ISC0eiuKkFD42ia5GzeqyBsGF4HoSF0MtBivShJz
|
||||
oxt6xFtmagKRX6VB3Qo41+36IKnqmvWE5CAoNIyoy9+ZgfKQKOaIjQzFd4edYxfa
|
||||
AQgEypRjod/BjY4NlAOILXa1L7cNQp29QkouODU5oW9mT/TWh3gNIO7cjqq+GHxh
|
||||
7/itRt7I6CJOPhEZa3UaA27yNbDsJK8dxGXeGqkUVqdoff98zO4LygyNxwIguWbD
|
||||
ektP8472N9tR4G2e/f3tnWPFzmSFIUYQPQQZsWbMi5lBVAL1IX3kgO8qgyJOQeWN
|
||||
AgMBAAGjggIJMIICBTAOBgNVHQ8BAf8EBAMCBaAwSQYDVR0gBEIwQDA+BgZngQwB
|
||||
AgEwNDAyBggrBgEFBQcCARYmaHR0cHM6Ly93d3cuZ2xvYmFsc2lnbi5jb20vcmVw
|
||||
b3NpdG9yeS8wYgYDVR0RBFswWYINKi5oYXNrZWxsLm9yZ4IYYXV0b2Rpc2NvdmVy
|
||||
Lmhhc2tlbGwub3JnghBtYWlsLmhhc2tlbGwub3Jngg9vd2EuaGFza2VsbC5vcmeC
|
||||
C2hhc2tlbGwub3JnMAkGA1UdEwQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
|
||||
AQUFBwMCMEMGA1UdHwQ8MDowOKA2oDSGMmh0dHA6Ly9jcmwuZ2xvYmFsc2lnbi5j
|
||||
b20vZ3MvZ3Nkb21haW52YWxzaGEyZzIuY3JsMIGUBggrBgEFBQcBAQSBhzCBhDBH
|
||||
BggrBgEFBQcwAoY7aHR0cDovL3NlY3VyZS5nbG9iYWxzaWduLmNvbS9jYWNlcnQv
|
||||
Z3Nkb21haW52YWxzaGEyZzJyMS5jcnQwOQYIKwYBBQUHMAGGLWh0dHA6Ly9vY3Nw
|
||||
Mi5nbG9iYWxzaWduLmNvbS9nc2RvbWFpbnZhbHNoYTJnMjAdBgNVHQ4EFgQUsWoN
|
||||
IkHc+WhdtDwGB4pRHYZu+x4wHwYDVR0jBBgwFoAU6k581IAt5RWBhiaMgm3AmKTP
|
||||
lw8wDQYJKoZIhvcNAQELBQADggEBADrupN5ncMzXJLUxtIkhZKJUOQByrkVqmlvO
|
||||
me3tsAQn2YccC1YPE7wlkMttV8h8JN3/CWlvcSwfncXPzDF4lV7tuunapmAJLTxz
|
||||
Iz4tCIMzKVaGaivxYe9dml9LtiicsAOo29ZGE4E+mTHXR0EBjylKn4RS5f6XLawC
|
||||
wvdzYEH6nw6XbD6PlvYjZekIcky1lZ99cqsBoYiht0PQEcj8LWcBW79o1UWYEaXv
|
||||
q8b47QhFYMQ+IKwfIo3PSWjotIBw35lnrfKlrWvqyRA5t+ollH+6X1vdYOibupts
|
||||
rUdXZCfeWcwhFiJVOrq7kxpQLNZsPq8nm55Ao2tRGsrDMwsuZhc=
|
||||
-----END CERTIFICATE-----
|
||||
|
|
@ -1,56 +0,0 @@
|
|||
MACHINE=$(uname -m)
|
||||
case "$MACHINE" in
|
||||
x86_64) ARCHITECTURE=amd64;;
|
||||
i686) ARCHITECTURE=i386;;
|
||||
i386) ARCHITECTURE=i386;;
|
||||
esac
|
||||
|
||||
LOCAL=$HOME/.local
|
||||
VERSION=$(grep -e '^Version' pandoc.cabal | awk '{print $2}')
|
||||
DEBPKGVER=${DEBPKGVER:-1}
|
||||
DEBVER=$VERSION-$DEBPKGVER
|
||||
BASE=pandoc-$DEBVER-$ARCHITECTURE
|
||||
DIST=`pwd`/$BASE
|
||||
DEST=$DIST/usr
|
||||
ME=$(whoami)
|
||||
COPYRIGHT=$DEST/share/doc/pandoc/copyright
|
||||
|
||||
PATH=$LOCAL/bin:$PATH
|
||||
|
||||
mkdir -p $LOCAL/bin
|
||||
mkdir -p $DEST/bin
|
||||
mkdir -p $DEST/share/man/man1
|
||||
mkdir -p $DEST/share/doc/pandoc
|
||||
|
||||
stack install --install-ghc --stack-yaml stack.pkg.yaml --local-bin-path $LOCAL/bin hsb2hs
|
||||
stack install --install-ghc --stack-yaml stack.pkg.yaml --local-bin-path $LOCAL/bin pandoc pandoc-citeproc
|
||||
|
||||
make man/pandoc.1
|
||||
# get pandoc-citeproc man page:
|
||||
PANDOC_CITEPROC_VERSION=`pandoc-citeproc --version | awk '{print $2;}'`
|
||||
curl https://raw.githubusercontent.com/jgm/pandoc-citeproc/${PANDOC_CITEPROC_VERSION}/man/man1/pandoc-citeproc.1 > $DEST/share/man/man1/pandoc-citeproc.1
|
||||
|
||||
|
||||
mkdir -p $DEST/share/doc/pandoc-citeproc
|
||||
find $DIST -type d | xargs chmod 755
|
||||
strip $LOCAL/bin/pandoc
|
||||
strip $LOCAL/bin/pandoc-citeproc
|
||||
cp $LOCAL/bin/pandoc $DEST/bin/
|
||||
cp $LOCAL/bin/pandoc-citeproc $DEST/bin/
|
||||
cp man/pandoc.1 $DEST/share/man/man1/pandoc.1
|
||||
gzip -9 $DEST/share/man/man1/pandoc.1
|
||||
gzip -9 $DEST/share/man/man1/pandoc-citeproc.1
|
||||
cp COPYRIGHT $COPYRIGHT
|
||||
echo "" >> $COPYRIGHT
|
||||
echo "pandoc-citeproc" >> $COPYRIGHT
|
||||
curl https://raw.githubusercontent.com/jgm/pandoc-citeproc/${PANDOC_CITEPROC_VERSION}/LICENSE >> $COPYRIGHT
|
||||
|
||||
INSTALLED_SIZE=$(du -B 1024 -s $DEST | awk '{print $1}')
|
||||
mkdir $DIST/DEBIAN
|
||||
perl -pe "s/VERSION/$DEBVER/" deb/control.in | \
|
||||
perl -pe "s/ARCHITECTURE/$ARCHITECTURE/" | \
|
||||
perl -pe "s/INSTALLED_SIZE/$INSTALLED_SIZE/" \
|
||||
> $DIST/DEBIAN/control
|
||||
|
||||
fakeroot dpkg-deb --build $DIST
|
||||
rm -rf $DIST
|
||||
Loading…
Reference in a new issue