summaryrefslogtreecommitdiffstats
path: root/debian/patches
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--debian/patches/debian/0001-post-merge.patch11
-rw-r--r--debian/patches/series1
2 files changed, 12 insertions, 0 deletions
diff --git a/debian/patches/debian/0001-post-merge.patch b/debian/patches/debian/0001-post-merge.patch
new file mode 100644
index 0000000..0579569
--- /dev/null
+++ b/debian/patches/debian/0001-post-merge.patch
@@ -0,0 +1,11 @@
+Author: David Kunz <david.kunz@dknet.ch>
+Description: Correcting git-hook post-merge.
+
+--- icingaweb2-module-fileshipper.orig/contrib/git-hooks/post-merge
++++ icingaweb2-module-fileshipper/contrib/git-hooks/post-merge
+@@ -1,4 +1,4 @@
+-#/usr/bin/env bash
++#!/bin/sh
+ # Trigger Director config rendering when something changed
+
+ # This is a git hook that will run after `git pull`. In case any file was
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..e81bf43
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+debian/0001-post-merge.patch