From a081d0ddea4103c1772378870a005267a7bce332 Mon Sep 17 00:00:00 2001
From: jvoisin
Date: Fri, 13 Oct 2017 15:40:58 +0200
Subject: Improve the doc wrt. the Debian package

- Fix two minor warnings
- Improve the documentation
---
 debian/source/format        |  1 +
 doc/source/download.rst     | 11 ++++++-----
 doc/source/installation.rst |  2 +-
 src/sp_disabled_functions.h |  4 ----
 src/sp_utils.h              |  4 ++++
 5 files changed, 12 insertions(+), 10 deletions(-)
 create mode 100644 debian/source/format

diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..9f8e9b6
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+1.0
\ No newline at end of file
diff --git a/doc/source/download.rst b/doc/source/download.rst
index f9132ac..fa60a99 100644
--- a/doc/source/download.rst
+++ b/doc/source/download.rst
@@ -1,17 +1,18 @@
 Download
 ========
 
-Debian
-------
+Debian and Ubuntu
+-----------------
 
-
-Ubuntu
-------
+We're currently not providing Debian or Ubuntu packages,
+but you can build your own by cloning the source code and typing ``make debian``.
 
 
 Source code
 -----------
 
+We're currently using *github* as public code repository.
+
 ::
 
   git clone https://github.com/nbs-system/snuffleupagus
diff --git a/doc/source/installation.rst b/doc/source/installation.rst
index c7fe55b..7f8c8c8 100644
--- a/doc/source/installation.rst
+++ b/doc/source/installation.rst
@@ -1,7 +1,7 @@
 Installation
 ============
 
-Snuffleupagus is tested against various PHP 7+ versions: XXX
+Snuffleupagus is tested against `various PHP 7+ versions <https://travis-ci.org/nbs-system/snuffleupagus/>`_.
 
 Manual installation
 -------------------
diff --git a/src/sp_disabled_functions.h b/src/sp_disabled_functions.h
index 680eabb..260d430 100644
--- a/src/sp_disabled_functions.h
+++ b/src/sp_disabled_functions.h
@@ -1,10 +1,6 @@
 #ifndef __SP_DISABLE_FUNCTIONS_H
 #define __SP_DISABLE_FUNCTIONS_H
 
-#include "ext/hash/php_hash.h"
-#include "ext/hash/php_hash_sha.h"
-#include "ext/standard/md5.h"
-
 int hook_disabled_functions();
 bool should_disable(zend_execute_data* function_name);
 
diff --git a/src/sp_utils.h b/src/sp_utils.h
index 61a4c53..751b0b1 100644
--- a/src/sp_utils.h
+++ b/src/sp_utils.h
@@ -1,6 +1,10 @@
 #ifndef SP_UTILS_H
 #define SP_UTILS_H
 
+#include "ext/hash/php_hash.h"
+#include "ext/hash/php_hash_sha.h"
+#include "ext/standard/md5.h"
+
 #include "sp_config.h"
 #include "sp_list.h"
 
-- 
cgit v1.3