From 4388dc03505821e4bc84e047ed86c15ecd3437f6 Mon Sep 17 00:00:00 2001
From: Alex Kirhenshtein <alk@netxms.org>
Date: Mon, 10 May 2021 14:53:47 +0300
Subject: [PATCH] Temporary patch removed

---
 patches/01_nxreportd.patch | 32 --------------------------------
 patches/series             |  1 -
 2 files changed, 33 deletions(-)
 delete mode 100644 patches/01_nxreportd.patch

diff --git a/patches/01_nxreportd.patch b/patches/01_nxreportd.patch
deleted file mode 100644
index 08e2fc7..0000000
--- a/patches/01_nxreportd.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-commit 2672a0f30c3cbd5ad8a28761dcd837498353d7e5
-Author: Alex Kirhenshtein <alk@netxms.org>
-Date:   Wed May 5 19:53:12 2021 +0300
-
-    nxreportd wrapper now works correctly with Debian's multiarch
-
-diff --git a/src/server/nxreportd/nxreportd.in b/src/server/nxreportd/nxreportd.in
-index d7eaac3095..c7ff0c9672 100644
---- a/src/server/nxreportd/nxreportd.in
-+++ b/src/server/nxreportd/nxreportd.in
-@@ -16,6 +16,11 @@ else
- fi
- 
- ###############################################################################
-+NXREPORTD_JAR_FILE=~PKGLIBDIR~/java/nxreportd-~PACKAGE_VERSION~.jar
-+if [ ! -r $NXREPORTD_JAR_FILE ]; then
-+	NXREPORTD_JAR_FILE=$NETXMS_HOME/lib/netxms/java/nxreportd-~PACKAGE_VERSION~.jar
-+fi
-+
- show_usage_and_exit() {
- 	cat <<END
- NetXMS Reporting Server
-@@ -93,7 +98,7 @@ if [ -z $JAVA ]; then
- fi
- 
- if [ "x$DAEMON" = "xyes" ]; then
--	nohup $JAVA $JAVA_OPTIONS -jar $NETXMS_HOME/lib/netxms/java/nxreportd-~PACKAGE_VERSION~.jar >/dev/null 2>/dev/null &
-+	nohup $JAVA $JAVA_OPTIONS -jar $NXREPORTD_JAR_FILE >/dev/null 2>/dev/null &
- else
--	$JAVA $JAVA_OPTIONS -jar $NETXMS_HOME/lib/netxms/java/nxreportd-~PACKAGE_VERSION~.jar
-+	$JAVA $JAVA_OPTIONS -jar $NXREPORTD_JAR_FILE
- fi
diff --git a/patches/series b/patches/series
index f69f485..e69de29 100644
--- a/patches/series
+++ b/patches/series
@@ -1 +0,0 @@
-01_nxreportd.patch