summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2018-08-26 11:09:43 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2018-08-26 11:10:09 +0000
commita92d24c079623873b6f8cc23a9f32d1e5633fb71 (patch)
tree645bdf21fbb71a93e7daf79861c2255cfa688b8b
parentUpdating changelog. (diff)
downloadnetdata-a92d24c079623873b6f8cc23a9f32d1e5633fb71.tar.xz
netdata-a92d24c079623873b6f8cc23a9f32d1e5633fb71.zip
Adding patch to skip debian files in upstream's makefile, thanks to Sander Klein <debian-bugs@roedie.nl>.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/changelog2
-rw-r--r--debian/patches/0009-debian-files-removed-from-make.patch33
-rw-r--r--debian/patches/series1
3 files changed, 36 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index fc4f1b488..483e7d57f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ netdata (1.10.0+dfsg-3) UNRELEASED; urgency=medium
* Updating to standards version 4.2.1.
* Adding patch from Sander Klein <debian-bugs@roedie.nl> to force
python3 (Closes: #906329).
+ * Adding patch to skip debian files in upstream's makefile, thanks to
+ Sander Klein <debian-bugs@roedie.nl>.
-- Daniel Baumann <daniel.baumann@progress-linux.org> Sat, 25 Aug 2018 17:26:10 +0200
diff --git a/debian/patches/0009-debian-files-removed-from-make.patch b/debian/patches/0009-debian-files-removed-from-make.patch
new file mode 100644
index 000000000..10102d78c
--- /dev/null
+++ b/debian/patches/0009-debian-files-removed-from-make.patch
@@ -0,0 +1,33 @@
+Author: Daniel Baumann <daniel.baumann@progress-linux.org>
+Description: Skip debian files in upstream's makefile.
+
+diff -Naurp netdata.orig/contrib/Makefile.am netdata/contrib/Makefile.am
+--- netdata.orig/contrib/Makefile.am
++++ netdata/contrib/Makefile.am
+@@ -2,26 +2,10 @@ MAINTAINERCLEANFILES= $(srcdir)/Makefile
+
+ dist_noinst_DATA = \
+ README.md \
+- debian/copyright \
+- debian/netdata.conf \
+- debian/source/format \
+- debian/control.wheezy \
+- debian/compat \
+- debian/netdata.install \
+- debian/netdata.lintian-overrides \
+- debian/rules \
+- debian/netdata.docs \
+- debian/netdata.default \
+- debian/control \
+- debian/netdata.postinst.in \
+- debian/netdata.service \
+- debian/changelog \
+- debian/netdata.postrm \
+ rhel/build-netdata-rpm.sh \
+ $(NULL)
+
+ dist_noinst_SCRIPTS = \
+- debian/netdata.init \
+ nc-backend.sh \
+ $(NULL)
+
diff --git a/debian/patches/series b/debian/patches/series
index 9928b7bf6..79cfb2045 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@
0006-compile-on-kfreebsd-hurd.patch
0007-python-config-directory.patch
0008-force-python3.patch
+0009-debian-files-removed-from-make.patch