[osmium-tool] 68/97: Tweak travis build, update README.

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to tag v1.0.0
in repository osmium-tool.

commit bedcb4c6459a9f3e13ab30aefa6ef05ac93293f5
Author: Jochen Topf <jochen at topf.org>
Date:   Thu Jan 29 16:38:56 2015 +0100

    Tweak travis build, update README.
---
 .travis.yml |  3 +--
 README.md   | 23 +++++++++++++----------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f117c9f..fcfcdc1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,9 +20,8 @@ install:
  - sudo rm /usr/bin/cpp
  - sudo ln -s /usr/bin/cpp-4.8 /usr/bin/cpp
  # upgrade libosmium dependencies
- - sudo apt-get install --yes make libboost-dev libboost-program-options-dev libprotobuf-dev protobuf-compiler libcrypto++-dev
+ - sudo apt-get install --yes make libboost-dev libboost-program-options-dev libprotobuf-dev protobuf-compiler libcrypto++-dev pandoc
  - cd ..
- - git clone https://github.com/osmcode/osm-testdata.git
  - git clone https://github.com/osmcode/libosmium.git
  # OSMPBF is too old, install from git
  #- sudo apt-get install --yes libosmpbf-dev
diff --git a/README.md b/README.md
index a5e4cf8..f77019f 100644
--- a/README.md
+++ b/README.md
@@ -9,8 +9,8 @@ library.
 
 ## Prerequisites
 
-You need a C++11 compliant compiler. GCC 4.8 and clang 3.2 are known to work.
-You also need the following libraries:
+You need a C++11 compliant compiler. GCC 4.8 and later as well as clang 3.4 and
+later are known to work. You also need the following libraries:
 
     Osmium Library
         http://osmcode.org/libosmium
@@ -41,7 +41,7 @@ You also need the following libraries:
         Debian/Ubuntu: libexpat1-dev
         openSUSE: libexpat-devel
 
-    libcrypto++ (for checksumming)
+    libcrypto++ (optional, for checksumming)
         http://www.cryptopp.com/
         Debian/Ubuntu: libcrypto++-dev
 
@@ -49,6 +49,10 @@ You also need the following libraries:
         http://www.cmake.org/
         Debian/Ubuntu: cmake
 
+    Pandoc (optional, do build documentation)
+        http://johnmacfarlane.net/pandoc/
+        Debian/Ubuntu: pandoc
+
 
 ## Building
 
@@ -58,15 +62,14 @@ Results will be in the `build` directory.
 
 Or you can go the long route explicitly calling CMake as follows:
 
-```
-mkdir build
-cd build
-cmake ..
-make
-```
+    mkdir build
+    cd build
+    cmake ..
+    make
 
 To set the build type call cmake with `-DCMAKE_BUILD_TYPE=type`. Possible
-values are empty, Debug, Release, RelWithDebInfo and MinSizeRel.
+values are empty, Debug, Release, RelWithDebInfo, MinSizeRel, and Dev. The
+defaults is RelWithDebInfo.
 
 
 ## Documentation

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osmium-tool.git