summaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2018-12-28 14:42:52 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2018-12-28 14:42:52 +0000
commit12b9efaebb6d008437af4a72a98d05c4319fc825 (patch)
tree70876046e52ae898dd7327424f2c27fde1a5d45f /contrib
parentReleasing debian version 1.11.0+dfsg-1~exp1. (diff)
downloadnetdata-12b9efaebb6d008437af4a72a98d05c4319fc825.tar.xz
netdata-12b9efaebb6d008437af4a72a98d05c4319fc825.zip
Merging upstream version 1.11.1+dfsg
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'contrib')
-rw-r--r--contrib/debian/changelog4
-rw-r--r--contrib/debian/netdata.docs2
-rwxr-xr-xcontrib/debian/rules18
3 files changed, 11 insertions, 13 deletions
diff --git a/contrib/debian/changelog b/contrib/debian/changelog
index 730844070..ee5e82ebd 100644
--- a/contrib/debian/changelog
+++ b/contrib/debian/changelog
@@ -1,3 +1,3 @@
-netdata (1.11.0~rolling) UNRELEASED; urgency=medium
+netdata (1.11.1~rolling) UNRELEASED; urgency=medium
* Latest release
- -- Netdata Team <> Fri, 02 Nov 2018 14:25:18 +0000
+ -- Netdata Team <> Thu, 22 Nov 2018 20:33:40 +0000
diff --git a/contrib/debian/netdata.docs b/contrib/debian/netdata.docs
index 56631abf1..1b763b1ba 100644
--- a/contrib/debian/netdata.docs
+++ b/contrib/debian/netdata.docs
@@ -1 +1 @@
-ChangeLog
+CHANGELOG.md
diff --git a/contrib/debian/rules b/contrib/debian/rules
index ec4ec4182..c19323960 100755
--- a/contrib/debian/rules
+++ b/contrib/debian/rules
@@ -54,16 +54,14 @@ override_dh_install: debian/netdata.postinst
override_dh_installdocs:
dh_installdocs
- # Docs should not be under /usr/lib
- #
- mv $(TOP)/usr/lib/$(DEB_HOST_MULTIARCH)/netdata/plugins.d/README.md \
- $(TOP)/usr/share/doc/netdata/README.plugins.md
- mv $(TOP)/usr/lib/$(DEB_HOST_MULTIARCH)/netdata/charts.d/README.md \
- $(TOP)/usr/share/doc/netdata/README.charts.md
-
- # This doc is currently empty, so no point installing it.
- #
- rm $(TOP)/usr/lib/$(DEB_HOST_MULTIARCH)/netdata/node.d/README.md
+ find . \
+ -name README.md \
+ -not -path './.travis/*' \
+ -not -path './debian/*' \
+ -exec cp \
+ --parents \
+ --target $(TOP)/usr/share/doc/netdata/ \
+ {} \;
override_dh_fixperms:
dh_fixperms