From 4ea884f73fb9b041ca41f10e87f5abed8295d5d1 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 28 Dec 2018 17:32:07 +0100 Subject: Harmonizing patch filenames. Signed-off-by: Daniel Baumann --- .../0004-Debianize-path-to-exim4-binary.patch | 12 -------- .../0004-debianize-path-to-exim4-binary.patch | 12 ++++++++ debian/patches/0006-Force-usage-of-python3.patch | 17 ----------- debian/patches/0006-force-usage-of-python3.patch | 17 +++++++++++ ...-Skip-debian-files-in-upstream-s-makefile.patch | 35 ---------------------- ...07-skip-debian-files-in-upstream-makefile.patch | 35 ++++++++++++++++++++++ debian/patches/series | 6 ++-- 7 files changed, 67 insertions(+), 67 deletions(-) delete mode 100644 debian/patches/0004-Debianize-path-to-exim4-binary.patch create mode 100644 debian/patches/0004-debianize-path-to-exim4-binary.patch delete mode 100644 debian/patches/0006-Force-usage-of-python3.patch create mode 100644 debian/patches/0006-force-usage-of-python3.patch delete mode 100644 debian/patches/0007-Skip-debian-files-in-upstream-s-makefile.patch create mode 100644 debian/patches/0007-skip-debian-files-in-upstream-makefile.patch diff --git a/debian/patches/0004-Debianize-path-to-exim4-binary.patch b/debian/patches/0004-Debianize-path-to-exim4-binary.patch deleted file mode 100644 index 954c5c7cc..000000000 --- a/debian/patches/0004-Debianize-path-to-exim4-binary.patch +++ /dev/null @@ -1,12 +0,0 @@ -Author: Sven Hartge -Description: Debianize path to exim4 binary - -diff -Naurp netdata.orig/collectors/python.d.plugin/exim/exim.conf netdata/collectors/python.d.plugin/exim/exim.conf ---- netdata.orig/collectors/python.d.plugin/exim/exim.conf -+++ netdata/collectors/python.d.plugin/exim/exim.conf -@@ -90,4 +90,4 @@ update_every: 10 - # AUTO-DETECTION JOBS - - local: -- command: 'exim -bpc' -+ command: '/usr/sbin/exim -bpc' diff --git a/debian/patches/0004-debianize-path-to-exim4-binary.patch b/debian/patches/0004-debianize-path-to-exim4-binary.patch new file mode 100644 index 000000000..954c5c7cc --- /dev/null +++ b/debian/patches/0004-debianize-path-to-exim4-binary.patch @@ -0,0 +1,12 @@ +Author: Sven Hartge +Description: Debianize path to exim4 binary + +diff -Naurp netdata.orig/collectors/python.d.plugin/exim/exim.conf netdata/collectors/python.d.plugin/exim/exim.conf +--- netdata.orig/collectors/python.d.plugin/exim/exim.conf ++++ netdata/collectors/python.d.plugin/exim/exim.conf +@@ -90,4 +90,4 @@ update_every: 10 + # AUTO-DETECTION JOBS + + local: +- command: 'exim -bpc' ++ command: '/usr/sbin/exim -bpc' diff --git a/debian/patches/0006-Force-usage-of-python3.patch b/debian/patches/0006-Force-usage-of-python3.patch deleted file mode 100644 index 04222e795..000000000 --- a/debian/patches/0006-Force-usage-of-python3.patch +++ /dev/null @@ -1,17 +0,0 @@ -Author: Sander Klein -Description: Force usage of python3 - Debian uses Python2 by default. The netdata package installs the - Python3 dependencies. So, in order to work correctly it must use - Python3. - -diff -Naurp netdata.orig/collectors/python.d.plugin/python.d.plugin netdata/collectors/python.d.plugin/python.d.plugin ---- netdata.orig/collectors/python.d.plugin/python.d.plugin -+++ netdata/collectors/python.d.plugin/python.d.plugin -@@ -1,6 +1,4 @@ --#!/usr/bin/env bash --'''':; exec "$(command -v python || command -v python3 || command -v python2 || --echo "ERROR python IS NOT AVAILABLE IN THIS SYSTEM")" "$0" "$@" # ''' -+#!/usr/bin/python3 - - # -*- coding: utf-8 -*- - # Description: diff --git a/debian/patches/0006-force-usage-of-python3.patch b/debian/patches/0006-force-usage-of-python3.patch new file mode 100644 index 000000000..04222e795 --- /dev/null +++ b/debian/patches/0006-force-usage-of-python3.patch @@ -0,0 +1,17 @@ +Author: Sander Klein +Description: Force usage of python3 + Debian uses Python2 by default. The netdata package installs the + Python3 dependencies. So, in order to work correctly it must use + Python3. + +diff -Naurp netdata.orig/collectors/python.d.plugin/python.d.plugin netdata/collectors/python.d.plugin/python.d.plugin +--- netdata.orig/collectors/python.d.plugin/python.d.plugin ++++ netdata/collectors/python.d.plugin/python.d.plugin +@@ -1,6 +1,4 @@ +-#!/usr/bin/env bash +-'''':; exec "$(command -v python || command -v python3 || command -v python2 || +-echo "ERROR python IS NOT AVAILABLE IN THIS SYSTEM")" "$0" "$@" # ''' ++#!/usr/bin/python3 + + # -*- coding: utf-8 -*- + # Description: diff --git a/debian/patches/0007-Skip-debian-files-in-upstream-s-makefile.patch b/debian/patches/0007-Skip-debian-files-in-upstream-s-makefile.patch deleted file mode 100644 index 5040d2007..000000000 --- a/debian/patches/0007-Skip-debian-files-in-upstream-s-makefile.patch +++ /dev/null @@ -1,35 +0,0 @@ -Author: Daniel Baumann -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 -@@ -4,28 +4,9 @@ MAINTAINERCLEANFILES = $(srcdir)/Makefil - - 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 \ -- $(NULL) -- - debian/changelog: - echo "netdata ($(PACKAGE_VERSION)) UNRELEASED; urgency=medium" | \ - tr '_' '~' > $@ diff --git a/debian/patches/0007-skip-debian-files-in-upstream-makefile.patch b/debian/patches/0007-skip-debian-files-in-upstream-makefile.patch new file mode 100644 index 000000000..5040d2007 --- /dev/null +++ b/debian/patches/0007-skip-debian-files-in-upstream-makefile.patch @@ -0,0 +1,35 @@ +Author: Daniel Baumann +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 +@@ -4,28 +4,9 @@ MAINTAINERCLEANFILES = $(srcdir)/Makefil + + 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 \ +- $(NULL) +- + debian/changelog: + echo "netdata ($(PACKAGE_VERSION)) UNRELEASED; urgency=medium" | \ + tr '_' '~' > $@ diff --git a/debian/patches/series b/debian/patches/series index 65526bf80..a8745551e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,7 +1,7 @@ 0001-python-libraries-removed-from-make.patch 0002-remove-file-serve-restrictions-for-symlinks.patch 0003-hide-update-button.patch -0004-Debianize-path-to-exim4-binary.patch +0004-debianize-path-to-exim4-binary.patch 0005-remove-infographic-for-privacy-breach-reasons.patch -0006-Force-usage-of-python3.patch -0007-Skip-debian-files-in-upstream-s-makefile.patch +0006-force-usage-of-python3.patch +0007-skip-debian-files-in-upstream-makefile.patch -- cgit v1.2.3