summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2017-04-07 12:14:18 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2017-04-07 12:14:18 +0000
commit904039417fe29a55513c8f17bf8d8c034088291e (patch)
tree3cc47581f2edb2f42e47eba7bf7e2fdd93c1f6a4
parentAdding upstream version 20161210. (diff)
downloadopen-infrastructure-service-tools-904039417fe29a55513c8f17bf8d8c034088291e.tar.xz
open-infrastructure-service-tools-904039417fe29a55513c8f17bf8d8c034088291e.zip
Adding upstream version 20170405.upstream/20170405
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--CHANGELOG.txt9
-rw-r--r--Makefile19
-rw-r--r--VERSION.txt2
-rw-r--r--share/man/Makefile2
-rw-r--r--share/man/apache-icons.7.txt2
5 files changed, 26 insertions, 8 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 0a68450..488d4fa 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,3 +1,12 @@
+2017-04-05 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+
+ * Releasing version 20170405.
+
+ [ Daniel Baumann ]
+ * Updating year in copyright information for 2017.
+ * Completing uninstall target in makefile.
+ * Shortening manpage parts in uninstall target in makefile.
+
2016-12-10 Daniel Baumann <daniel.baumann@open-infrastructure.net>
* Releasing version 20161210.
diff --git a/Makefile b/Makefile
index 13144ac..b5a3a47 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
# Makefile
# apache-icons - Alternative icons for Apache autoindex
-# Copyright (C) 2014-2016 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+# Copyright (C) 2014-2017 Daniel Baumann <daniel.baumann@open-infrastructure.net>
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -83,14 +83,23 @@ uninstall:
do \
for FILE in share/man/*.$${SECTION}; \
do \
- if [ -e "$${FILE}" ]; \
- then \
- rm -f $(DESTDIR)/usr/share/man/man$${SECTION}/$$(basename $${FILE}); \
- fi; \
+ rm -f $(DESTDIR)/usr/share/man/man$${SECTION}/$$(basename $${FILE}); \
done; \
rmdir --ignore-fail-on-non-empty --parents $(DESTDIR)/usr/share/man/man$${SECTION} || true; \
done
+ for FILE in share/apache/conf/*; \
+ do \
+ rm -f $(DESTDIR)/etc/apache2/conf-available/$$(basename $${FILE}); \
+ done
+ rmdir --ignore-fail-on-non-empty --parents $(DESTDIR)/etc/apache2/conf-available || true
+
+ for FILE in share/apache/mods/*; \
+ do \
+ rm -f $(DESTDIR)/etc/apache2/mods-available/$$(basename $${FILE}); \
+ done
+ rmdir --ignore-fail-on-non-empty --parents $(DESTDIR)/etc/apache2/mods-available || true
+
rm -rf $(DESTDIR)/usr/share/$(SOFTWARE)/*
rmdir --ignore-fail-on-non-empty --parents $(DESTDIR)/usr/share/$(SOFTWARE) || true
diff --git a/VERSION.txt b/VERSION.txt
index d407b1f..68b5226 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-20161210
+20170405
diff --git a/share/man/Makefile b/share/man/Makefile
index 43f6286..aff079f 100644
--- a/share/man/Makefile
+++ b/share/man/Makefile
@@ -1,7 +1,7 @@
# Makefile
# apache-icons - Alternative icons for Apache autoindex
-# Copyright (C) 2014-2016 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+# Copyright (C) 2014-2017 Daniel Baumann <daniel.baumann@open-infrastructure.net>
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/share/man/apache-icons.7.txt b/share/man/apache-icons.7.txt
index 178ba4a..164b257 100644
--- a/share/man/apache-icons.7.txt
+++ b/share/man/apache-icons.7.txt
@@ -1,5 +1,5 @@
// apache-icons - Alternative icons for Apache autoindex
-// Copyright (C) 2014-2016 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+// Copyright (C) 2014-2017 Daniel Baumann <daniel.baumann@open-infrastructure.net>
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by