From 05cea4685799b833b86765addad01a75cba63f95 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Sun, 7 Feb 2021 14:47:42 +0100
Subject: Harmonizing patch numbering.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 debian/patches/debian/0011-remove-signin.patch     | 22 ++++++++++++++
 .../patches/debian/0012-remove-googlefonts.patch   | 15 ++++++++++
 debian/patches/debian/0012-remove-signin.patch     | 22 --------------
 .../patches/debian/0013-remove-googlefonts.patch   | 15 ----------
 .../debian/0013-remove-googletagmanager.patch      | 35 ++++++++++++++++++++++
 .../debian/0014-remove-googletagmanager.patch      | 35 ----------------------
 debian/patches/series                              |  6 ++--
 7 files changed, 75 insertions(+), 75 deletions(-)
 create mode 100644 debian/patches/debian/0011-remove-signin.patch
 create mode 100644 debian/patches/debian/0012-remove-googlefonts.patch
 delete mode 100644 debian/patches/debian/0012-remove-signin.patch
 delete mode 100644 debian/patches/debian/0013-remove-googlefonts.patch
 create mode 100644 debian/patches/debian/0013-remove-googletagmanager.patch
 delete mode 100644 debian/patches/debian/0014-remove-googletagmanager.patch

(limited to 'debian')

diff --git a/debian/patches/debian/0011-remove-signin.patch b/debian/patches/debian/0011-remove-signin.patch
new file mode 100644
index 000000000..ff402371a
--- /dev/null
+++ b/debian/patches/debian/0011-remove-signin.patch
@@ -0,0 +1,22 @@
+Author: Daniel Baumann <daniel.baumann@progress-linux.org>
+Description: Removing 'Sign In' infobar on the bottom of the screen (Closes: #930504).
+
+diff -Naurp netdata.orig/web/gui/index.html netdata/web/gui/index.html
+--- netdata.orig/web/gui/index.html
++++ netdata/web/gui/index.html
+@@ -114,6 +114,7 @@
+         <div id="navbar-highlight-content" class="navbar-highlight-content"></div>
+     </div>
+ 
++<!--
+     <div id="sign-in-banner" style="display: none">
+         <div class="container">
+             Like what you see? 
+@@ -124,6 +125,7 @@
+             </div>
+         </div>
+     </div>
++-->
+     
+     <div id="masthead" style="display: none;">
+         <div class="container">
diff --git a/debian/patches/debian/0012-remove-googlefonts.patch b/debian/patches/debian/0012-remove-googlefonts.patch
new file mode 100644
index 000000000..a9f43f2db
--- /dev/null
+++ b/debian/patches/debian/0012-remove-googlefonts.patch
@@ -0,0 +1,15 @@
+Author: Daniel Baumann <daniel.baumann@progress-linux.org>
+Subject: Remove Google Fonts for privacy reasons.
+
+diff -Naurp netdata.orig/web/gui/console.html netdata/web/gui/console.html
+--- netdata.orig/web/gui/console.html
++++ netdata/web/gui/console.html
+@@ -11,7 +11,7 @@
+     <meta name="apple-mobile-web-app-capable" content="yes" />
+     <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
+     <link rel="icon" href="data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAP9JREFUeNpiYBgFo+A/w34gpiZ8DzWzAYgNiHGAA5UdgA73g+2gcyhgg/0DGQoweB6IBQYyFCCOGOBQwBMd/xnW09ERDtgcoEBHB+zHFQrz6egIBUasocDAcJ9OxWAhE4YQI8MDILmATg7wZ8QRDfQKhQf4Cie6pAVGPA4AhQKo0BCgZRAw4ZSBpIWJNI6CD4wEKikBaFqgVSgcYMIrzcjwgcahcIGRiPYCLUPBkNhWUwP9akVcoQBpatG4MsLviAIqWj6f3Absfdq2igg7IIEKDVQKEzN5ofAenJCp1I8gJRTug5tfkGIdR1FDniMI+QZUjF8Amn5htOdHCAAEGACE6B0cS6mrEwAAAABJRU5ErkJggg==" />
+-    <link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons" />
++    <!-- <link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons" /> -->
+     <!-- Google Tag Manager -->
+     <script>(function (w, d, s, l, i) {
+             w[l] = w[l] || []; w[l].push({
diff --git a/debian/patches/debian/0012-remove-signin.patch b/debian/patches/debian/0012-remove-signin.patch
deleted file mode 100644
index ff402371a..000000000
--- a/debian/patches/debian/0012-remove-signin.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Author: Daniel Baumann <daniel.baumann@progress-linux.org>
-Description: Removing 'Sign In' infobar on the bottom of the screen (Closes: #930504).
-
-diff -Naurp netdata.orig/web/gui/index.html netdata/web/gui/index.html
---- netdata.orig/web/gui/index.html
-+++ netdata/web/gui/index.html
-@@ -114,6 +114,7 @@
-         <div id="navbar-highlight-content" class="navbar-highlight-content"></div>
-     </div>
- 
-+<!--
-     <div id="sign-in-banner" style="display: none">
-         <div class="container">
-             Like what you see? 
-@@ -124,6 +125,7 @@
-             </div>
-         </div>
-     </div>
-+-->
-     
-     <div id="masthead" style="display: none;">
-         <div class="container">
diff --git a/debian/patches/debian/0013-remove-googlefonts.patch b/debian/patches/debian/0013-remove-googlefonts.patch
deleted file mode 100644
index a9f43f2db..000000000
--- a/debian/patches/debian/0013-remove-googlefonts.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Author: Daniel Baumann <daniel.baumann@progress-linux.org>
-Subject: Remove Google Fonts for privacy reasons.
-
-diff -Naurp netdata.orig/web/gui/console.html netdata/web/gui/console.html
---- netdata.orig/web/gui/console.html
-+++ netdata/web/gui/console.html
-@@ -11,7 +11,7 @@
-     <meta name="apple-mobile-web-app-capable" content="yes" />
-     <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
-     <link rel="icon" href="data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAP9JREFUeNpiYBgFo+A/w34gpiZ8DzWzAYgNiHGAA5UdgA73g+2gcyhgg/0DGQoweB6IBQYyFCCOGOBQwBMd/xnW09ERDtgcoEBHB+zHFQrz6egIBUasocDAcJ9OxWAhE4YQI8MDILmATg7wZ8QRDfQKhQf4Cie6pAVGPA4AhQKo0BCgZRAw4ZSBpIWJNI6CD4wEKikBaFqgVSgcYMIrzcjwgcahcIGRiPYCLUPBkNhWUwP9akVcoQBpatG4MsLviAIqWj6f3Absfdq2igg7IIEKDVQKEzN5ofAenJCp1I8gJRTug5tfkGIdR1FDniMI+QZUjF8Amn5htOdHCAAEGACE6B0cS6mrEwAAAABJRU5ErkJggg==" />
--    <link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons" />
-+    <!-- <link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons" /> -->
-     <!-- Google Tag Manager -->
-     <script>(function (w, d, s, l, i) {
-             w[l] = w[l] || []; w[l].push({
diff --git a/debian/patches/debian/0013-remove-googletagmanager.patch b/debian/patches/debian/0013-remove-googletagmanager.patch
new file mode 100644
index 000000000..77a6b0d31
--- /dev/null
+++ b/debian/patches/debian/0013-remove-googletagmanager.patch
@@ -0,0 +1,35 @@
+Author: Daniel Baumann <daniel.baumann@progress-linux.org>
+Subject: Remove Google Tag Manager for privacy reasons.
+
+diff -Naurp netdata.orig/web/gui/console.html netdata/web/gui/console.html
+--- netdata.orig/web/gui/console.html
++++ netdata/web/gui/console.html
+@@ -13,6 +13,7 @@
+     <link rel="icon" href="data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAP9JREFUeNpiYBgFo+A/w34gpiZ8DzWzAYgNiHGAA5UdgA73g+2gcyhgg/0DGQoweB6IBQYyFCCOGOBQwBMd/xnW09ERDtgcoEBHB+zHFQrz6egIBUasocDAcJ9OxWAhE4YQI8MDILmATg7wZ8QRDfQKhQf4Cie6pAVGPA4AhQKo0BCgZRAw4ZSBpIWJNI6CD4wEKikBaFqgVSgcYMIrzcjwgcahcIGRiPYCLUPBkNhWUwP9akVcoQBpatG4MsLviAIqWj6f3Absfdq2igg7IIEKDVQKEzN5ofAenJCp1I8gJRTug5tfkGIdR1FDniMI+QZUjF8Amn5htOdHCAAEGACE6B0cS6mrEwAAAABJRU5ErkJggg==" />
+     <!-- <link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons" /> -->
+     <!-- Google Tag Manager -->
++    <!--
+     <script>(function (w, d, s, l, i) {
+             w[l] = w[l] || []; w[l].push({
+                 'gtm.start':
+@@ -23,6 +24,7 @@
+         })(window, document, 'script', 'dataLayer', 'GTM-N6CBMJD');
+         window.dataLayer = window.dataLayer || [];
+     </script>
++    -->
+     <!-- End Google Tag Manager -->
+     <script>
+         function loadJSFile(filename) {
+@@ -48,10 +50,12 @@
+ 
+ <body class="mdc-theme--background mdc-typography">
+     <!-- Google Tag Manager (noscript) -->
++    <!--
+     <noscript>
+         <iframe src="https://www.googletagmanager.com/ns.html?id=GTM-N6CBMJD" height="0" width="0"
+             style="display:none;visibility:hidden"></iframe>
+     </noscript>
++    -->
+     <!-- End Google Tag Manager (noscript) -->
+     <main id="app" class="console-app" data-host="agent"></main>
+     <script>
diff --git a/debian/patches/debian/0014-remove-googletagmanager.patch b/debian/patches/debian/0014-remove-googletagmanager.patch
deleted file mode 100644
index 77a6b0d31..000000000
--- a/debian/patches/debian/0014-remove-googletagmanager.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Author: Daniel Baumann <daniel.baumann@progress-linux.org>
-Subject: Remove Google Tag Manager for privacy reasons.
-
-diff -Naurp netdata.orig/web/gui/console.html netdata/web/gui/console.html
---- netdata.orig/web/gui/console.html
-+++ netdata/web/gui/console.html
-@@ -13,6 +13,7 @@
-     <link rel="icon" href="data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAP9JREFUeNpiYBgFo+A/w34gpiZ8DzWzAYgNiHGAA5UdgA73g+2gcyhgg/0DGQoweB6IBQYyFCCOGOBQwBMd/xnW09ERDtgcoEBHB+zHFQrz6egIBUasocDAcJ9OxWAhE4YQI8MDILmATg7wZ8QRDfQKhQf4Cie6pAVGPA4AhQKo0BCgZRAw4ZSBpIWJNI6CD4wEKikBaFqgVSgcYMIrzcjwgcahcIGRiPYCLUPBkNhWUwP9akVcoQBpatG4MsLviAIqWj6f3Absfdq2igg7IIEKDVQKEzN5ofAenJCp1I8gJRTug5tfkGIdR1FDniMI+QZUjF8Amn5htOdHCAAEGACE6B0cS6mrEwAAAABJRU5ErkJggg==" />
-     <!-- <link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons" /> -->
-     <!-- Google Tag Manager -->
-+    <!--
-     <script>(function (w, d, s, l, i) {
-             w[l] = w[l] || []; w[l].push({
-                 'gtm.start':
-@@ -23,6 +24,7 @@
-         })(window, document, 'script', 'dataLayer', 'GTM-N6CBMJD');
-         window.dataLayer = window.dataLayer || [];
-     </script>
-+    -->
-     <!-- End Google Tag Manager -->
-     <script>
-         function loadJSFile(filename) {
-@@ -48,10 +50,12 @@
- 
- <body class="mdc-theme--background mdc-typography">
-     <!-- Google Tag Manager (noscript) -->
-+    <!--
-     <noscript>
-         <iframe src="https://www.googletagmanager.com/ns.html?id=GTM-N6CBMJD" height="0" width="0"
-             style="display:none;visibility:hidden"></iframe>
-     </noscript>
-+    -->
-     <!-- End Google Tag Manager (noscript) -->
-     <main id="app" class="console-app" data-host="agent"></main>
-     <script>
diff --git a/debian/patches/series b/debian/patches/series
index 62a9e4a02..55595ed23 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,7 +8,7 @@ debian/0007-remove-contrib-files.patch
 debian/0008-remove-update-button.patch
 debian/0009-remove-social-media-buttons.patch
 debian/0010-remove-googleanalytics.patch
-debian/0012-remove-signin.patch
-debian/0013-remove-googlefonts.patch
-debian/0014-remove-googletagmanager.patch
+debian/0011-remove-signin.patch
+debian/0012-remove-googlefonts.patch
+debian/0013-remove-googletagmanager.patch
 upstream/0001-allow-symlinks.patch
-- 
cgit v1.2.3