From e1824aad4b7705d1f6733548bc9bd57163173811 Mon Sep 17 00:00:00 2001
From: Emmanuel Papin <manupap01@gmail.com>
Date: Mon, 12 Jan 2015 20:52:14 +0100
Subject: [PATCH 1/3] Fix a conflict when merging upstream master

---
 distros/debian8/patches/series | 1 +
 1 file changed, 1 insertion(+)

diff --git a/distros/debian8/patches/series b/distros/debian8/patches/series
index e69de29bb..50378e9c2 100644
--- a/distros/debian8/patches/series
+++ b/distros/debian8/patches/series
@@ -0,0 +1 @@
+02_service-file-name.diff

From f05dc5e2a3f89fe5d20c8befd5067901baeb666c Mon Sep 17 00:00:00 2001
From: Emmanuel Papin <manupap01@gmail.com>
Date: Mon, 12 Jan 2015 20:56:14 +0100
Subject: [PATCH 2/3] Rename debian patch

---
 .../{02_service-file-name.diff => 01_service-file-name.diff}    | 0
 distros/debian8/patches/series                                  | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename distros/debian8/patches/{02_service-file-name.diff => 01_service-file-name.diff} (100%)

diff --git a/distros/debian8/patches/02_service-file-name.diff b/distros/debian8/patches/01_service-file-name.diff
similarity index 100%
rename from distros/debian8/patches/02_service-file-name.diff
rename to distros/debian8/patches/01_service-file-name.diff
diff --git a/distros/debian8/patches/series b/distros/debian8/patches/series
index 50378e9c2..2e4111e41 100644
--- a/distros/debian8/patches/series
+++ b/distros/debian8/patches/series
@@ -1 +1 @@
-02_service-file-name.diff
+01_service-file-name.diff

From 47ef5c999ff05bca54e2699421c05ff63f9188c8 Mon Sep 17 00:00:00 2001
From: Emmanuel Papin <manupap01@gmail.com>
Date: Mon, 12 Jan 2015 22:22:40 +0100
Subject: [PATCH 3/3] Add dependency to apache2 for zoneminder-core package

---
 distros/debian8/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/distros/debian8/control b/distros/debian8/control
index 7c33fc8e6..455ec5e90 100644
--- a/distros/debian8/control
+++ b/distros/debian8/control
@@ -62,7 +62,7 @@ Depends: libzoneminder-perl (= ${source:Version}),
  libdbi-perl, libmodule-load-conditional-perl, libmime-lite-perl,
  libmime-tools-perl, libnet-sftp-foreign-perl, libphp-serialization-perl,
  debconf, ffmpeg | libav-tools, rsyslog | system-log-daemon, netpbm, zip,
- policykit-1
+ policykit-1, apache2
 Description: Core binaries and perl scripts for ZoneMinder
  ZoneMinder is a video camera security and surveillance solution.
  .