summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2021-09-26 13:09:49 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2021-09-26 13:09:49 +0000
commit6b3d024a070719185b2cc9398a6e77899f529047 (patch)
tree6da628cba7969ae44058103f580d995c9a9b3e02
parentReleasing debian version 20210908-1. (diff)
downloadopen-infrastructure-service-tools-6b3d024a070719185b2cc9398a6e77899f529047.tar.xz
open-infrastructure-service-tools-6b3d024a070719185b2cc9398a6e77899f529047.zip
Merging upstream version 20210926.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--CHANGELOG.txt7
-rw-r--r--VERSION.txt2
-rw-r--r--git/Makefile4
3 files changed, 10 insertions, 3 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 9d48ed5..8a26178 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,3 +1,10 @@
+2021-09-26 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+
+ * Releasing version 20210926.
+
+ [ Daniel Baumann ]
+ * Correcting wrong directory-name when installing git hooks.
+
2021-09-08 Daniel Baumann <daniel.baumann@open-infrastructure.net>
* Releasing version 20210908.
diff --git a/VERSION.txt b/VERSION.txt
index f1d7f5b..c2d5f99 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-20210908
+20210926
diff --git a/git/Makefile b/git/Makefile
index cbc112e..950ea6d 100644
--- a/git/Makefile
+++ b/git/Makefile
@@ -67,8 +67,8 @@ install: build
mkdir -p $(DESTDIR)/usr/bin
cp -r bin/* $(DESTDIR)/usr/bin
- mkdir -p $(DESTDIR)/usr/share/dehydrated/hooks
- cp -r share/hooks/* $(DESTDIR)/usr/share/dehydrated/hooks
+ mkdir -p $(DESTDIR)/usr/share/git/hooks
+ cp -r share/hooks/* $(DESTDIR)/usr/share/git/hooks
uninstall:
rm -rf $(DESTDIR)/usr/share/git/hooks